diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn index 016fd443fb267a76fcd15d7ed4737758f57e239c..acf1c11ad8ccb067bf1a20355ed31b4afadb3250 100644 --- a/LibOneM2M/OneM2M_TypesAndValues.ttcn +++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn @@ -34,6 +34,7 @@ module OneM2M_TypesAndValues { const XSD.String c_defaultNodeResourceName := "MyNodeResource"; const XSD.String c_defaultNodeID := "MyNodeId"; const XSD.String c_defaultRequestResourceName := "MyRequestResource"; + const XSD.String c_dynamicAuthorizationConsultationName := "MyDynamicAuthorizationConsultation"; const XSD.String c_defaultStatsConfigResourceName := "MyStatsConfigResource"; const XSD.String c_defaultStatsCollectResourceName := "MyStatsCollectResource"; const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource"; diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn index 583e9db2c2966e857b65c13becd5440c37bfd6d6..c367217fa1b4fe14f1ea99d857f085b781ef0a1e 100644 --- a/OneM2M_Testcases_CSE_Release_3.ttcn +++ b/OneM2M_Testcases_CSE_Release_3.ttcn @@ -10550,14 +10550,15 @@ module OneM2M_Testcases_CSE_Release_3 { v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); v_ae1.done; - //v_ae1.start(f_CSE_DAU_NOT_004()); - //v_ae1.done; + v_ae1.start(f_CSE_DAU_NOT_004()); + v_ae1.done; } - /*function f_CSE_DAU_NOT_004() runs on AeSimu { + function f_CSE_DAU_NOT_004() runs on AeSimu { // Local variables var integer v_aeIndex := -1; var integer v_containerIndex := -1; + var integer v_dynamicAuthorizationIndex := -1; // Test control @@ -10568,12 +10569,12 @@ module OneM2M_Testcases_CSE_Release_3 { // Preamble v_aeIndex := f_cse_preamble_registerAe(); - var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultation - + var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(null, false); //dynamicAuthorizationEnable set to FALSE + v_dynamicAuthorizationIndex := f_cse_createResource(int34, v_createRequest1, v_aeIndex); var template RequestPrimitive v_createRequest2 := m_createContainerBase; - v_createRequest.primitiveContent.container.dynamicAuthorizationConsultationIDs := {"unknown_dac_id"}; - v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex); + v_createRequest2.primitiveContent.container.dynamicAuthorizationConsultationIDs := {f_getOriginator(v_dynamicAuthorizationIndex)}; // XSD.AnyURI + v_containerIndex := f_cse_createResource(int3, v_createRequest2, v_aeIndex); // Test Body mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))))); @@ -10604,7 +10605,7 @@ module OneM2M_Testcases_CSE_Release_3 { f_cf01Down(); }//end f_CSE_DAU_NOT_004 - */ + /** * @desc Check that the IUT correctly processes a Notify response received in response to a Notify request that started Dynamic Authorization.