Commit d91c49e3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'TS_PIXITS_ENHANCEMENT_BUGGY' of https://git.onem2m.org/TST/ATS...

Merge branch 'TS_PIXITS_ENHANCEMENT_BUGGY' of https://git.onem2m.org/TST/ATS into TS_PIXITS_ENHANCEMENT_BUGGY
parents 784724ac 29d64ec9
......@@ -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());
......
......@@ -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 := {
......
......@@ -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;