diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 29153affeed7f66a1a56707d385220da8c36f75b..72e344d34ea909807aa927e13330f5c6cc8c8bd7 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -64,8 +64,8 @@ module OneM2M_Functions { v_binding_in := "WSCK"; } - vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; - vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] }; activate(a_default()); vc_aeSimu := activate(a_cse_cf01()); @@ -122,8 +122,8 @@ module OneM2M_Functions { v_binding_in := "WSCK"; } - vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] }; - vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; //Initialze the IUT @@ -159,7 +159,7 @@ module OneM2M_Functions { v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort; } - vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; if(PX_UT_IMPLEMENTED) { map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT); @@ -217,8 +217,8 @@ module OneM2M_Functions { v_binding_in := "WSCK"; } - vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; - vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_binding_in, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; v_cSEBaseResource := f_generateLocalResource(-, -1, int5); vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1); @@ -274,8 +274,8 @@ module OneM2M_Functions { v_binding_in := "WSCK"; } - vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; - vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; activate(a_default()); vc_cseSimu := activate(a_cse_cf02_cse1()); @@ -328,8 +328,8 @@ module OneM2M_Functions { v_binding_in := "WSCK"; } - vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; - vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] }; //Initialze the IUT @@ -370,7 +370,8 @@ module OneM2M_Functions { v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort; } - vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; if(PX_UT_IMPLEMENTED) { map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT); @@ -429,8 +430,8 @@ module OneM2M_Functions { v_binding_in := "WSCK"; } - vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; - vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; activate(a_default()); vc_cseSimu := activate(a_cse_cf04()); diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index 0dcd835e4901e294717afb25f01643e89e5d1184..bece78ad2850df13376382ab38616f8222ff5986 100644 --- a/LibOneM2M/OneM2M_Pixits.ttcn +++ b/LibOneM2M/OneM2M_Pixits.ttcn @@ -121,10 +121,10 @@ module OneM2M_Pixits { localPort := 3131, // Test Adapter client port (for debug purpose only) sutAddress := omit } - } - }, - serialization := e_xml + } }, + serialization := e_xml + }, mcaPortIn := { binding := { httpBindingDesc := { @@ -151,10 +151,10 @@ module OneM2M_Pixits { localPort := 3132, // Test Adapter client port (for debug purpose only) sutAddress := omit } - } - }, - serialization := e_xml + } }, + serialization := e_xml + }, mcaPortIn := { binding := { coapBindingDesc := { @@ -174,17 +174,17 @@ module OneM2M_Pixits { mcaPort := { binding := { coapBindingDesc := { - bindingProtocol := e_coap, - bindingDesc := { - tsAddress := "192.168.56.102", - remotePort:= 9010, - localPort := 3031, - sutAddress := omit - } + bindingProtocol := e_coap, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort:= 9010, + localPort := 3031, + sutAddress := omit } - }, - serialization := e_xml + } }, + serialization := e_xml + }, mcaPortIn := { binding := { coapBindingDesc := { @@ -202,17 +202,17 @@ module OneM2M_Pixits { mccPort := { binding := { httpBindingDesc := { - bindingProtocol := e_http, - bindingDesc := { - tsAddress := "192.168.56.102", - remotePort:= 9011, - localPort := 4031, + bindingProtocol := e_http, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort:= 9011, + localPort := 4031, sutAddress := omit - } } - }, - serialization := e_xml + } }, + serialization := e_xml + }, mccPortIn := { binding := { coapBindingDesc := { diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn index 7c6d6cc439a875342c53eef67f2651a97081d80b..69e140ba18b7dae8586fcbd8929921c1823eb5c7 100644 --- a/OneM2M_Testcases_CSE_Release_2.ttcn +++ b/OneM2M_Testcases_CSE_Release_2.ttcn @@ -93,9 +93,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_CRE_003(e_cseRelative)); v_ae1.done; } @@ -104,9 +102,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_CRE_003(e_spRelative)); v_ae1.done; } @@ -115,9 +111,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_CRE_003(e_absolute)); v_ae1.done; } @@ -134,9 +128,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_CRE_004(e_cseRelative)); v_ae1.done; } @@ -145,9 +137,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_CRE_004(e_spRelative)); v_ae1.done; } @@ -156,9 +146,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_CRE_004(e_absolute)); v_ae1.done; } @@ -178,9 +166,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_GEN_RET_003_CSR() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_RET_003(e_cseRelative)); v_ae1.done; } @@ -189,9 +175,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_RET_003(e_spRelative)); v_ae1.done; } @@ -200,9 +184,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_RET_003(e_absolute)); v_ae1.done; } @@ -220,9 +202,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_RET_004(e_cseRelative)); v_ae1.done; } @@ -231,9 +211,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_RET_004(e_spRelative)); v_ae1.done; } @@ -242,9 +220,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_RET_004(e_absolute)); v_ae1.done; } @@ -265,9 +241,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_UPD_003(e_cseRelative)); v_ae1.done; } @@ -276,9 +250,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_UPD_003(e_spRelative)); v_ae1.done; } @@ -287,9 +259,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_UPD_003(e_absolute)); v_ae1.done; } @@ -307,9 +277,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_UPD_004(e_cseRelative)); v_ae1.done; } @@ -318,9 +286,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_UPD_004(e_spRelative)); v_ae1.done; } @@ -329,9 +295,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_UPD_004(e_absolute)); v_ae1.done; } @@ -352,9 +316,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_DEL_003(e_cseRelative)); v_ae1.done; } @@ -363,9 +325,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_DEL_003(e_spRelative)); v_ae1.done; } @@ -374,9 +334,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_DEL_003(e_absolute)); v_ae1.done; } @@ -394,9 +352,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_DEL_004(e_cseRelative)); v_ae1.done; } @@ -405,9 +361,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_DEL_004(e_spRelative)); v_ae1.done; } @@ -416,9 +370,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_GEN_DEL_004(e_absolute)); v_ae1.done; } @@ -445,9 +397,7 @@ module OneM2M_Testcases_CSE_Release_2 { var RequestPrimitive v_request; var template PrimitiveContent v_contentResponse; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - v_request := valueof(m_createRemoteCSEBase); + v_request := valueof(m_createRemoteCSEBase); v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE v_request.primitiveContent.remoteCSE.resourceName := c_defaultRemoteCSEResourceName; @@ -466,9 +416,7 @@ module OneM2M_Testcases_CSE_Release_2 { var RequestPrimitive v_request; var template PrimitiveContent v_contentResponse; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - v_request := valueof(m_createRemoteCSEBase); + v_request := valueof(m_createRemoteCSEBase); v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE v_request.primitiveContent.remoteCSE.expirationTime := "20301231T012345"; @@ -503,9 +451,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - + v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345"; v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest)); @@ -517,9 +463,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - + v_updateRequest.primitiveContent.remoteCSE.requestReachability := true; v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest)); @@ -550,8 +494,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_cse1.start(f_CSE_DMR_001(v_createRequest)); //Create Container v_cse1.done; @@ -564,8 +506,6 @@ module OneM2M_Testcases_CSE_Release_2 { var CseSimu v_cse1 := CseSimu.create("CSE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_updateRequest.primitiveContent.container.labels := v_labels_1; v_cse1.start(f_CSE_DMR_001(v_updateRequest)); //Update Container @@ -578,8 +518,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_cse1.start(f_CSE_DMR_001(m_retrieve("NotInitialized", "NotInitialized"))); //Retrieve Container v_cse1.done; @@ -590,8 +528,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_cse1.start(f_CSE_DMR_001(m_delete("NotInitialized", "NotInitialized"))); //Delete Container v_cse1.done; @@ -610,8 +546,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_002(v_createRequest)); //Create Container v_ae1.done; @@ -624,8 +558,6 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_DMR_002(v_updateRequest)); //Update Container @@ -638,8 +570,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_002(m_retrieve("NotInitialized", "NotInitialized"))); //Retrieve Container v_ae1.done; @@ -650,8 +580,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_002(m_delete("NotInitialized", "NotInitialized"))); //Delete Container v_ae1.done; @@ -671,9 +599,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createPollingChannelBase; var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_createRequest.primitiveContent.pollingChannel.resourceName := omit; @@ -702,9 +628,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel v_ae1.done; @@ -732,9 +656,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel v_ae1.done; } @@ -751,9 +673,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel v_ae1.done; } @@ -772,9 +692,7 @@ module OneM2M_Testcases_CSE_Release_2 { var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); + v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); @@ -790,9 +708,7 @@ module OneM2M_Testcases_CSE_Release_2 { var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); + v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); v_ae1.done; if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); @@ -809,9 +725,7 @@ module OneM2M_Testcases_CSE_Release_2 { var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest)); v_ae1.done; @@ -838,9 +752,7 @@ module OneM2M_Testcases_CSE_Release_2 { const integer c_maxNumberOfInstances := 1; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances; + v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances; v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2 v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container @@ -865,9 +777,7 @@ module OneM2M_Testcases_CSE_Release_2 { const XSD.String c_primitiveContent2 := "Content2"; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize; + v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize; v_createRequestContentInstance1.primitiveContent.contentInstance.content := c_primitiveContent1; //ContentInstance 1 v_createRequestContentInstance2.primitiveContent.contentInstance.content := c_primitiveContent2; //ContentInstance 2 v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //ContentInstance 2 @@ -892,9 +802,7 @@ module OneM2M_Testcases_CSE_Release_2 { const integer c_maxByteSize := 1; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize; + v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize; v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container v_ae1.done; @@ -911,9 +819,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_CRE_015_CNT() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_015(int3, m_createContainerBase));//Container v_ae1.done; } @@ -922,9 +828,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_015(int9, m_createGroupBase));//Group v_ae1.done; } @@ -933,9 +837,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_015(int1, m_createAcpBase));//AccessControlPolicy v_ae1.done; } @@ -944,9 +846,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_015(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } @@ -955,9 +855,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_CRE_015(int15, m_createPollingChannelBase));//PollingChannel v_ae1.done; } @@ -974,9 +872,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.uRI := mw_contentContainer_rc2; v_ae1.start(f_CSE_DMR_CRE_016(int3, m_createContainerBase, v_contentResponse));//Container @@ -987,9 +883,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.uRI := mw_contentGroup_rc2; v_ae1.start(f_CSE_DMR_CRE_016(int9, m_createGroupBase, v_contentResponse));//Group @@ -1000,9 +894,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.uRI := mw_contentAcp_rc2; v_ae1.start(f_CSE_DMR_CRE_016(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy @@ -1013,9 +905,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.uRI := mw_contentSubscription_rc2; v_ae1.start(f_CSE_DMR_CRE_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription @@ -1026,9 +916,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.uRI := mw_contentPollingChannel_rc2; v_ae1.start(f_CSE_DMR_CRE_016(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel @@ -1046,9 +934,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.resource := mw_contentContainer_rc3; v_ae1.start(f_CSE_DMR_CRE_017(int3, m_createContainerBase, v_contentResponse));//Container @@ -1059,9 +945,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.resource := mw_contentGroup_rc3; v_ae1.start(f_CSE_DMR_CRE_017(int9, m_createGroupBase, v_contentResponse));//Group @@ -1072,9 +956,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.resource := mw_contentAcp_rc3; v_ae1.start(f_CSE_DMR_CRE_017(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy @@ -1085,9 +967,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.resource := mw_contentSubscription_rc3; v_ae1.start(f_CSE_DMR_CRE_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription @@ -1098,9 +978,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.resource := mw_contentPollingChannel_rc3; v_ae1.start(f_CSE_DMR_CRE_017(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel @@ -1117,8 +995,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_CRE_018_RCN_4() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + v_ae1.start(f_CSE_DMR_CRE_018(int4));//ResultContent = 4 (attributes and child resources) v_ae1.done; } @@ -1126,8 +1003,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_CRE_018_RCN_5() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + v_ae1.start(f_CSE_DMR_CRE_018(int5));//ResultContent = 5 (attributes and child resources references) v_ae1.done; } @@ -1135,8 +1011,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_CRE_018_RCN_6() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + v_ae1.start(f_CSE_DMR_CRE_018(int6));//ResultContent = 6 (child resources references) v_ae1.done; } @@ -1144,8 +1019,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_CRE_018_RCN_8() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + v_ae1.start(f_CSE_DMR_CRE_018(int8));//ResultContent = 8 (child resources) v_ae1.done; } @@ -1160,9 +1034,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.container := mw_contentContainer_rc1; v_ae1.start(f_CSE_DMR_CRE_019(int3, m_createContainerBase, v_contentResponse));//Container @@ -1173,9 +1045,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.group_ := mw_contentGroup_rc1; v_ae1.start(f_CSE_DMR_CRE_019(int9, m_createGroupBase, v_contentResponse));//Group @@ -1186,9 +1056,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.accessControlPolicy := mw_contentAcp_rc1; v_ae1.start(f_CSE_DMR_CRE_019(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy @@ -1199,9 +1067,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.subscription := mw_contentSubscription_rc1; v_ae1.start(f_CSE_DMR_CRE_019(int23, m_createSubscriptionBase, v_contentResponse));//Subscription @@ -1212,9 +1078,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.pollingChannel := mw_contentPollingChannel_rc1; v_ae1.start(f_CSE_DMR_CRE_019(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel @@ -1233,9 +1097,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.container := mw_contentContainer_rc1; //Provided attributes should not be returned unless modified v_contentResponse.container.resourceName := omit; @@ -1248,9 +1110,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.group_ := mw_contentGroup_rc1; //Provided attributes should not be returned unless modified v_contentResponse.group_.resourceName := omit; @@ -1265,9 +1125,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.accessControlPolicy := mw_contentAcp_rc1; //Provided attributes should not be returned unless modified v_contentResponse.accessControlPolicy.resourceName := omit; @@ -1282,9 +1140,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.subscription := mw_contentSubscription_rc1; //Provided attributes should not be returned unless modified v_contentResponse.subscription.resourceName := omit; @@ -1298,9 +1154,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var template PrimitiveContent v_contentResponse; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_contentResponse.pollingChannel := mw_contentPollingChannel_rc1; //Provided attributes should not be returned unless modified v_contentResponse.pollingChannel.resourceName := omit; @@ -1325,9 +1179,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.pollingChannel := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel := mw_contentPollingChannelBase; v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel v_ae1.done; @@ -1346,36 +1198,28 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing) + v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing) v_ae1.done; } testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address) + v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address) v_ae1.done; } testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address) + v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address) v_ae1.done; } testcase TC_CSE_DMR_RET_020_RCN_9() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int9));//ResultContent = 9 (modified attributes) + v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int9));//ResultContent = 9 (modified attributes) v_ae1.done; } @@ -1392,9 +1236,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := mw_contentContainer_rc1; + v_contentResponse.container := mw_contentContainer_rc1; v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container v_ae1.done; @@ -1405,9 +1247,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := mw_contentGroup_rc1; + v_contentResponse.group_ := mw_contentGroup_rc1; v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group v_ae1.done; @@ -1418,9 +1258,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy := mw_contentAcp_rc1; v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; @@ -1431,9 +1269,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.pollingChannel := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel := mw_contentPollingChannelBase; v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel v_ae1.done; @@ -1444,9 +1280,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.subscription := mw_contentSubscription_rc1; + v_contentResponse.subscription := mw_contentSubscription_rc1; v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; @@ -1465,9 +1299,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := mw_contentContainer_rc4; + v_contentResponse.container := mw_contentContainer_rc4; v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container v_ae1.done; @@ -1478,9 +1310,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := mw_contentGroup_rc4; + v_contentResponse.group_ := mw_contentGroup_rc4; v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group v_ae1.done; @@ -1491,9 +1321,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := mw_contentAcp_rc4; + v_contentResponse.accessControlPolicy := mw_contentAcp_rc4; v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; @@ -1504,9 +1332,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.pollingChannel := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel := mw_contentPollingChannelBase; v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel v_ae1.done; @@ -1517,9 +1343,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.subscription := mw_contentSubscription_rc4; + v_contentResponse.subscription := mw_contentSubscription_rc4; v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; @@ -1538,9 +1362,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := mw_contentContainer_rc5; + v_contentResponse.container := mw_contentContainer_rc5; v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container v_ae1.done; @@ -1551,9 +1373,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := mw_contentGroup_rc5; + v_contentResponse.group_ := mw_contentGroup_rc5; v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group v_ae1.done; @@ -1564,9 +1384,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := mw_contentAcp_rc5; + v_contentResponse.accessControlPolicy := mw_contentAcp_rc5; v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; @@ -1576,9 +1394,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.pollingChannel := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel := mw_contentPollingChannelBase; v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel v_ae1.done; @@ -1588,9 +1404,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.subscription := mw_contentSubscription_rc5; + v_contentResponse.subscription := mw_contentSubscription_rc5; v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; @@ -1608,9 +1422,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := mw_contentContainer_rc6; + v_contentResponse.container := mw_contentContainer_rc6; v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container v_ae1.done; @@ -1620,9 +1432,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := mw_contentGroup_rc6; + v_contentResponse.group_ := mw_contentGroup_rc6; v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group v_ae1.done; @@ -1632,9 +1442,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := mw_contentAcp_rc6; + v_contentResponse.accessControlPolicy := mw_contentAcp_rc6; v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; @@ -1644,9 +1452,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.subscription := mw_contentSubscription_rc6; + v_contentResponse.subscription := mw_contentSubscription_rc6; v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; @@ -1664,9 +1470,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := mw_contentContainer_rc8; + v_contentResponse.container := mw_contentContainer_rc8; v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container v_ae1.done; @@ -1676,9 +1480,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := mw_contentGroup_rc8; + v_contentResponse.group_ := mw_contentGroup_rc8; v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group v_ae1.done; @@ -1688,9 +1490,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := mw_contentAcp_rc8; + v_contentResponse.accessControlPolicy := mw_contentAcp_rc8; v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; @@ -1700,9 +1500,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.subscription := mw_contentSubscription_rc8; + v_contentResponse.subscription := mw_contentSubscription_rc8; v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription v_ae1.done; @@ -1729,9 +1527,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1; + v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1; v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2; v_ae1.start(f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest));//PollingChannel @@ -1777,9 +1573,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1; + v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel v_ae1.done; @@ -1825,9 +1619,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createPollingChannelBase; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1; + v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1; v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -1875,9 +1667,7 @@ module OneM2M_Testcases_CSE_Release_2 { var Timestamp v_creationTime := "21001231T012345"; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}; + v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}; v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime; v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel @@ -1909,9 +1699,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var AttributeAux_list v_nullFields; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_nullFields := {{"expirationTime", omit}}; + v_nullFields := {{"expirationTime", omit}}; v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime; @@ -1943,9 +1731,7 @@ module OneM2M_Testcases_CSE_Release_2 { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_createRequest := m_createPollingChannelBase; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}; + v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}; v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter; @@ -1969,9 +1755,7 @@ module OneM2M_Testcases_CSE_Release_2 { var Labels v_labels_1:= {"VALUE_1"}; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container @@ -2007,9 +1791,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.contentInstance.labels := v_labels; + v_updateRequest.primitiveContent.contentInstance.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container v_ae1.done; @@ -2041,9 +1823,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createAcpBase; var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1; + v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1; v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2; v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP @@ -2073,9 +1853,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1; + v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1; v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2; v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container @@ -2104,9 +1882,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1; + v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1; v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2; v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container @@ -2134,9 +1910,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1; + v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1; v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2165,9 +1939,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1; + v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1; v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2197,9 +1969,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1; + v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1; v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2229,9 +1999,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1; + v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1; v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2261,9 +2029,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1; + v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1; v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2293,9 +2059,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.groupID := v_groupID_1; + v_createRequest.primitiveContent.subscription.groupID := v_groupID_1; v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2325,9 +2089,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1; + v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1; v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2357,9 +2119,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1; + v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1; v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2389,9 +2149,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1; + v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1; v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2421,9 +2179,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1; + v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1; v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2453,9 +2209,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1; + v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1; v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2485,9 +2239,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1; + v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1; v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2517,9 +2269,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1; + v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1; v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2; v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription @@ -2552,63 +2302,49 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_UPD_019_RCN_2() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address) v_ae1.done; } testcase TC_CSE_DMR_UPD_019_RCN_3() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address) v_ae1.done; } testcase TC_CSE_DMR_UPD_019_RCN_4() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int4));//ResultContent = 4 (attributes and child resources) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int4));//ResultContent = 4 (attributes and child resources) v_ae1.done; } testcase TC_CSE_DMR_UPD_019_RCN_5() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int5));//ResultContent = 5 (attributes and child resource references) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int5));//ResultContent = 5 (attributes and child resource references) v_ae1.done; } testcase TC_CSE_DMR_UPD_019_RCN_6() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int6));//ResultContent = 6 (child resource references) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int6));//ResultContent = 6 (child resource references) v_ae1.done; } testcase TC_CSE_DMR_UPD_019_RCN_7() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int7));//ResultContent = 7 (original resource) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int7));//ResultContent = 7 (original resource) v_ae1.done; } testcase TC_CSE_DMR_UPD_019_RCN_8() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int8));//ResultContent = 8 (child resources) + v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int8));//ResultContent = 8 (child resources) v_ae1.done; } } // end g_CSE_DMR_UPD_019 @@ -2624,9 +2360,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; + v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; v_ae1.start(f_CSE_DMR_UPD_020(int3, m_createContainerBase, int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -2637,9 +2371,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"}; + v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"}; v_ae1.start(f_CSE_DMR_UPD_020(int9, m_createGroupBase, int23, m_createSubscriptionBase, v_updateRequest));//Group v_ae1.done; @@ -2650,9 +2382,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"}; + v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"}; v_ae1.start(f_CSE_DMR_UPD_020(int1, m_createAcpBase, int23, m_createSubscriptionBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -2672,9 +2402,7 @@ module OneM2M_Testcases_CSE_Release_2 { var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; + v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; v_contentResponse := f_getTemplateFromPrimitiveContent(v_updateRequest.primitiveContent); v_ae1.start(f_CSE_DMR_UPD_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase, v_updateRequest));//Container @@ -2686,9 +2414,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"}; + v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"}; v_contentResponse := f_getTemplateFromPrimitiveContent(v_updateRequest.primitiveContent); v_ae1.start(f_CSE_DMR_UPD_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//Group @@ -2701,9 +2427,7 @@ module OneM2M_Testcases_CSE_Release_2 { var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"}; + v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"}; v_contentResponse := f_getTemplateFromPrimitiveContent(v_updateRequest.primitiveContent); v_ae1.start(f_CSE_DMR_UPD_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//AccessControlPolicy @@ -2724,9 +2448,7 @@ module OneM2M_Testcases_CSE_Release_2 { var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := m_contentContainer_allOmit; + v_contentResponse.container := m_contentContainer_allOmit; v_contentResponse.container.lastModifiedTime := ?; v_contentResponse.container.stateTag := ?; v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; @@ -2740,9 +2462,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := m_contentGroup_allOmit; + v_contentResponse.group_ := m_contentGroup_allOmit; v_contentResponse.group_.lastModifiedTime := ?; v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"}; @@ -2756,9 +2476,7 @@ module OneM2M_Testcases_CSE_Release_2 { var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy := m_contentAcp_allOmit; v_contentResponse.accessControlPolicy.lastModifiedTime := ?; v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"}; @@ -2781,9 +2499,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel v_ae1.done; }; @@ -2799,72 +2515,56 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_DEL_011_RCN_2() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_3() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_4() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int4));//ResultContent = 4 (attributes and child resources) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int4));//ResultContent = 4 (attributes and child resources) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_5() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int5));//ResultContent = 5 (attributes and child resource references) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int5));//ResultContent = 5 (attributes and child resource references) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_6() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int6));//ResultContent = 6 (child resource references) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int6));//ResultContent = 6 (child resource references) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_7() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int7));//ResultContent = 7 (original resource) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int7));//ResultContent = 7 (original resource) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_8() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int8));//ResultContent = 8 (child resources) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int8));//ResultContent = 8 (child resources) v_ae1.done; } testcase TC_CSE_DMR_DEL_011_RCN_9() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int9));//ResultContent = 9 (modified attributes) + v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int9));//ResultContent = 9 (modified attributes) v_ae1.done; } } // end g_CSE_DMR_DEL_011 @@ -2879,9 +2579,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_DEL_012(int3, m_createContainerBase, int3, m_createContainerBase));//Container v_ae1.done; } @@ -2890,9 +2588,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_DEL_012(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group v_ae1.done; } @@ -2901,9 +2597,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_DMR_DEL_012(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; } @@ -2921,9 +2615,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.container := mw_contentContainer_rc1; + v_contentResponse.container := mw_contentContainer_rc1; v_ae1.start(f_CSE_DMR_DEL_013(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container v_ae1.done; @@ -2934,9 +2626,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.group_ := mw_contentGroup_rc1; + v_contentResponse.group_ := mw_contentGroup_rc1; v_ae1.start(f_CSE_DMR_DEL_013(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group v_ae1.done; @@ -2947,9 +2637,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_contentResponse.accessControlPolicy := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy := mw_contentAcp_rc1; v_ae1.start(f_CSE_DMR_DEL_013(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy v_ae1.done; @@ -2971,72 +2659,56 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_DMR_NTF_001_RCN_1() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int1));//ResultContent = 1 (attributes) + v_ae1.start(f_CSE_DMR_NTF_001(int1));//ResultContent = 1 (attributes) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_2() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int2));//ResultContent = 2 (hierarchical address) + v_ae1.start(f_CSE_DMR_NTF_001(int2));//ResultContent = 2 (hierarchical address) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_3() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int3));//ResultContent = 3 (attributes and hierarchical address) + v_ae1.start(f_CSE_DMR_NTF_001(int3));//ResultContent = 3 (attributes and hierarchical address) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_4() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int4));//ResultContent = 4 (attributes and child resources) + v_ae1.start(f_CSE_DMR_NTF_001(int4));//ResultContent = 4 (attributes and child resources) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_5() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int5));//ResultContent = 5 (attributes and child resources references) + v_ae1.start(f_CSE_DMR_NTF_001(int5));//ResultContent = 5 (attributes and child resources references) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_6() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int6));//ResultContent = 6 (child resources references) + v_ae1.start(f_CSE_DMR_NTF_001(int6));//ResultContent = 6 (child resources references) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_7() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int7));//ResultContent = 7 (original resource) + v_ae1.start(f_CSE_DMR_NTF_001(int7));//ResultContent = 7 (original resource) v_ae1.done; } testcase TC_CSE_DMR_NTF_001_RCN_8() runs on Tester system CseSystem { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_DMR_NTF_001(int8));//ResultContent = 8 (child resources) + v_ae1.start(f_CSE_DMR_NTF_001(int8));//ResultContent = 8 (child resources) v_ae1.done; } } // end g_CSE_DMR_NTF_001 @@ -3050,8 +2722,6 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; v_ae1.start(f_CSE_DMR_NTF_002()); @@ -3078,7 +2748,7 @@ module OneM2M_Testcases_CSE_Release_2 { vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63)); f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); - vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred + vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -1)); // AE2 is registred f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); v_ae2Index := f_getLatestResource(vc_ae2); @@ -3157,9 +2827,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; const XSD.String c_content := "Random Value"; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value"; + v_childResourceRequest.primitiveContent.contentInstance.content := "Random Value"; v_ae1.start(f_CSE_SUB_CRE_001(int3, v_parentResourceRequest, int4, v_childResourceRequest)); v_ae1.done; @@ -3171,9 +2839,7 @@ module OneM2M_Testcases_CSE_Release_2 { var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest)); + v_ae1.start(f_CSE_SUB_CRE_001(int23, v_parentResourceRequest, int23, v_parentResourceRequest)); v_ae1.done; } @@ -3185,9 +2851,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; const XSD.String c_content := "Random Value"; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value"; + v_childResourceRequest.primitiveContent.timeSeriesInstance.content := "Random Value"; v_ae1.start(f_CSE_SUB_CRE_001(int29, v_parentResourceRequest, int30, v_childResourceRequest)); v_ae1.done; @@ -3206,9 +2870,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_NTF_001() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_NTF_001()); v_ae1.done; @@ -3283,9 +2945,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_NTF_002() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_NTF_002()); v_ae1.done; @@ -3360,9 +3020,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_NTF_003() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_NTF_003()); v_ae1.done; @@ -3446,9 +3104,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_002() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_002()); v_ae1.done; @@ -3535,9 +3191,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_003() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_003()); v_ae1.done; @@ -3620,9 +3274,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_004() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_004()); v_ae1.done; @@ -3716,9 +3368,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_005() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_005()); v_ae1.done; @@ -3804,9 +3454,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_006() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_006()); v_ae1.done; @@ -3889,9 +3537,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_007() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_007()); v_ae1.done; @@ -3963,9 +3609,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_008() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_008()); v_ae1.done; @@ -4041,9 +3685,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_UPD_009() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_UPD_009()); v_ae1.done; @@ -4134,9 +3776,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_DEL_002() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_DEL_002()); v_ae1.done; @@ -4219,9 +3859,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_SUB_DEL_003() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_SUB_DEL_003()); v_ae1.done; @@ -4356,9 +3994,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_PCH_001()); + v_ae1.start(f_CSE_PCH_001()); v_ae1.done; @@ -4468,9 +4104,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_PCH_002()); + v_ae1.start(f_CSE_PCH_002()); v_ae1.done; @@ -4576,9 +4210,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_PCH_003()); + v_ae1.start(f_CSE_PCH_003()); v_ae1.done; } @@ -4687,8 +4319,6 @@ module OneM2M_Testcases_CSE_Release_2 { var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_cse1.start(f_CSE_PCH_004()); v_cse1.done; } @@ -4775,8 +4405,6 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_PCH_005(m_retrieve("NotInitialized", "NotInitialized"))); v_ae1.done; @@ -4788,8 +4416,6 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1; v_ae1.start(f_CSE_PCH_005(v_updateRequest)); @@ -4801,9 +4427,6 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_PCH_005(m_delete("NotInitialized", "NotInitialized"))); v_ae1.done; @@ -4818,9 +4441,7 @@ module OneM2M_Testcases_CSE_Release_2 { testcase TC_CSE_PCH_006() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_ae1.start(f_CSE_PCH_006()); v_ae1.done; } @@ -4892,9 +4513,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_001(m_createContainerBase, -)); //Create Container + v_ae1.start(f_CSE_NBR_SYN_001(m_createContainerBase, -)); //Create Container v_ae1.done; } @@ -4906,9 +4525,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_SYN_001(m_updateContainerBase, m_createContainerBase)); //Update Container v_ae1.done; @@ -4920,9 +4537,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container + v_ae1.start(f_CSE_NBR_SYN_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container v_ae1.done; } @@ -4932,9 +4547,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container + v_ae1.start(f_CSE_NBR_SYN_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container v_ae1.done; } @@ -4952,9 +4565,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_002(m_createContainerBase, -)); //Create Container + v_ae1.start(f_CSE_NBR_SYN_002(m_createContainerBase, -)); //Create Container v_ae1.done; } @@ -4966,9 +4577,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_SYN_002(m_updateContainerBase, m_createContainerBase)); //Update Container v_ae1.done; @@ -4980,9 +4589,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container + v_ae1.start(f_CSE_NBR_SYN_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container v_ae1.done; } @@ -4992,9 +4599,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container + v_ae1.start(f_CSE_NBR_SYN_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container v_ae1.done; } @@ -5012,9 +4617,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_003(m_createContainerBase, -, int1)); //Create Container + v_ae1.start(f_CSE_NBR_SYN_003(m_createContainerBase, -, int1)); //Create Container v_ae1.done; } @@ -5026,9 +4629,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_SYN_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container v_ae1.done; @@ -5040,9 +4641,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2)); //Retrieve Container + v_ae1.start(f_CSE_NBR_SYN_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2)); //Retrieve Container v_ae1.done; } @@ -5052,9 +4651,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_SYN_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int4)); //Delete Container + v_ae1.start(f_CSE_NBR_SYN_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int4)); //Delete Container v_ae1.done; } @@ -5075,9 +4672,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_001(m_createContainerBase, -)); //Create Container + v_ae1.start(f_CSE_NBR_ASY_001(m_createContainerBase, -)); //Create Container v_ae1.done; } @@ -5089,9 +4684,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_ASY_001(m_updateContainerBase, m_createContainerBase)); //Update Container v_ae1.done; @@ -5103,9 +4696,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container + v_ae1.start(f_CSE_NBR_ASY_001(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container v_ae1.done; } @@ -5115,9 +4706,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container + v_ae1.start(f_CSE_NBR_ASY_001(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container v_ae1.done; } @@ -5135,9 +4724,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_002(m_createContainerBase, -)); //Create Container + v_ae1.start(f_CSE_NBR_ASY_002(m_createContainerBase, -)); //Create Container v_ae1.done; } @@ -5149,9 +4736,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_ASY_002(m_updateContainerBase, m_createContainerBase)); //Update Container v_ae1.done; @@ -5163,9 +4748,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container + v_ae1.start(f_CSE_NBR_ASY_002(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container v_ae1.done; } @@ -5175,9 +4758,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container + v_ae1.start(f_CSE_NBR_ASY_002(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container v_ae1.done; } @@ -5195,9 +4776,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_003(m_createContainerBase, -, int2001)); //Create Container + v_ae1.start(f_CSE_NBR_ASY_003(m_createContainerBase, -, int2001)); //Create Container v_ae1.done; } @@ -5209,9 +4788,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_ASY_003(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container v_ae1.done; @@ -5223,9 +4800,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container + v_ae1.start(f_CSE_NBR_ASY_003(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container v_ae1.done; } @@ -5235,9 +4810,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container + v_ae1.start(f_CSE_NBR_ASY_003(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container v_ae1.done; } @@ -5255,9 +4828,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_004(m_createContainerBase, -)); //Create Container + v_ae1.start(f_CSE_NBR_ASY_004(m_createContainerBase, -)); //Create Container v_ae1.done; } @@ -5269,9 +4840,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_ASY_004(m_updateContainerBase, m_createContainerBase)); //Update Container v_ae1.done; @@ -5283,9 +4852,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_004(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container + v_ae1.start(f_CSE_NBR_ASY_004(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase)); //Retrieve Container v_ae1.done; } @@ -5295,9 +4862,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_004(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container + v_ae1.start(f_CSE_NBR_ASY_004(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase)); //Delete Container v_ae1.done; } @@ -5315,9 +4880,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_005(m_createContainerBase, -, int2001)); //Create Container + v_ae1.start(f_CSE_NBR_ASY_005(m_createContainerBase, -, int2001)); //Create Container v_ae1.done; } @@ -5329,9 +4892,7 @@ module OneM2M_Testcases_CSE_Release_2 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels_1 := {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.container.labels := v_labels_1; + v_updateRequest.primitiveContent.container.labels := v_labels_1; v_ae1.start(f_CSE_NBR_ASY_005(m_updateContainerBase, m_createContainerBase, int2004)); //Update Container v_ae1.done; @@ -5343,9 +4904,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_005(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container + v_ae1.start(f_CSE_NBR_ASY_005(m_retrieve("NotInitialized", "NotInitialized"), m_createContainerBase, int2000)); //Retrieve Container v_ae1.done; } @@ -5355,9 +4914,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template RequestPrimitive v_createRequest := m_createContainerBase; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_NBR_ASY_005(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container + v_ae1.start(f_CSE_NBR_ASY_005(m_delete("NotInitialized", "NotInitialized"), m_createContainerBase, int2002)); //Delete Container v_ae1.done; }