diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 85c24219177d9a304c0d6ffaf9a246562694eb7a..9d4c04e5f223d65c2b0af10cb84007391e3dd5a0 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -27,17 +27,41 @@ module OneM2M_Functions { /** @desc Ports mapping and default behaviour activation for Config 1 */ - function f_cf01Up(in boolean p_auxiliaryAe2Required := false) runs on AeSimu { + function f_cf01Up(in boolean p_auxiliaryAe2Required := false) runs on AeSimu system AeSystem { // Variables + var charstring v_binding; + var charstring v_binding_in; vc_config := e_cf01; vc_testSystemRole := e_ae; // Map - map(self:mcaPort, system:mcaPort); - map(self:mcaPortIn, system:mcaPortIn); + map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort, PX_TS_SETTINGS.SUT.sutAddress); + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); + if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.coapBindingDesc)) { + v_binding_in := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.mqttBindingDesc)) { + v_binding_in := "MQTT"; + } else { + v_binding_in := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] }; + activate(a_default()); vc_aeSimu := activate(a_cse_cf01()); @@ -45,8 +69,6 @@ module OneM2M_Functions { if(p_auxiliaryAe2Required) { vc_auxiliaryAe2Up := p_auxiliaryAe2Required; vc_ae2 := AeSimu.create("AE2") alive; - vc_ae2.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE2)); - vc_ae2.done; vc_ae2.start(f_cf01UpAe2()); vc_ae2.done; } @@ -58,17 +80,41 @@ module OneM2M_Functions { /** @desc Ports mapping and default behaviour activation for Config 1 on the auxiliary AE2 */ - function f_cf01UpAe2() runs on AeSimu { + function f_cf01UpAe2() runs on AeSimu system AeSystem { // Variables + var charstring v_binding; + var charstring v_binding_in; vc_config := e_cf01; vc_testSystemRole := e_ae; // Map - map(self:mcaPort, system:mcaPort); - map(self:mcaPortIn, system:mcaPortIn); + map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE2.mcaPort, PX_TS_SETTINGS.SUT.sutAddress); + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE2.mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); + if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.httpBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.coapBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.mqttBindingDesc)) { + v_binding_in := "MQTT"; + } else { + v_binding_in := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; + //Initialze the IUT } // end f_cf01UpAe2 @@ -76,20 +122,32 @@ module OneM2M_Functions { /** * @desc Ports mapping and default behaviour activation for Config 02 */ - function f_cf02Up(in CseTypeID p_cseType := int2) runs on AeSimu { + function f_cf02Up(in CseTypeID p_cseType := int2) runs on AeSimu system AeSystem { // Variables + var charstring v_binding; vc_config := e_cf02; vc_testSystemRole := e_ae; vc_cse1 := CseSimu.create("CSE1") alive; - vc_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - vc_cse1.done; // Map - map(self:mcaPort, system:mcaPort); + map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); + + if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; + if(PX_UT_IMPLEMENTED) { - map(self:utPort, system:utPort); + map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT); } activate(a_default()); vc_aeSimu := activate(a_cse_cf02_ae1()); @@ -105,19 +163,43 @@ module OneM2M_Functions { /** @desc Ports mapping and default behaviour activation for Config 2 on the CSE1 */ - function f_cf02UpCse1(in CseTypeID p_cseType := int2) runs on CseSimu { + function f_cf02UpCse1(in CseTypeID p_cseType := int2) runs on CseSimu system CseSystem { // Variables + var charstring v_binding; + var charstring v_binding_in; var PrimitiveContent v_cSEBaseResource; vc_config := e_cf02; vc_testSystemRole := e_cse; vc_cseType := p_cseType; // Map - map(self:mccPort, system:mccPort); - map(self:mccPortIn, system:mccPortIn); + map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort, PX_TS_SETTINGS.SUT.sutAddress); + map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); - + + if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) { + v_binding_in := "MQTT"; + } else { + v_binding_in := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; + vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; + v_cSEBaseResource := f_generateLocalResource(-, -1, int5); vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1); @@ -128,25 +210,48 @@ module OneM2M_Functions { /** * @desc Ports mapping and default behaviour activation for Config 02 */ - function f_cf02UpCseSimuMaster(in CseTypeID p_cseType := int2) runs on CseSimu { + function f_cf02UpCseSimuMaster(in CseTypeID p_cseType := int2) runs on CseSimu system CseSystem { // Variables + var charstring v_binding; + var charstring v_binding_in; var PrimitiveContent v_cSEBaseResource; vc_config := e_cf02CseSimuMaster; vc_testSystemRole := e_cse; vc_cseType := p_cseType; vc_ae1 := AeSimu.create("AE1") alive; - vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - vc_ae1.done; //Initialization of local CSEBase v_cSEBaseResource := f_generateLocalResource(-, -1, int5); vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1); // Map - map(self:mccPort, system:mccPort); - map(self:mccPortIn, system:mccPortIn); + map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort, PX_TS_SETTINGS.SUT.sutAddress); + map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); + + if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) { + v_binding_in := "MQTT"; + } else { + v_binding_in := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; + vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; + activate(a_default()); vc_cseSimu := activate(a_cse_cf02_cse1()); vc_ae1.start(f_cf02UpAe1()); @@ -161,17 +266,41 @@ module OneM2M_Functions { /** @desc Ports mapping and default behaviour activation for Config 2 on the AE1 */ - function f_cf02UpAe1(in CseTypeID p_cseType := int2) runs on AeSimu { + function f_cf02UpAe1(in CseTypeID p_cseType := int2) runs on AeSimu system AeSystem { // Variables + var charstring v_binding; + var charstring v_binding_in; vc_config := e_cf02CseSimuMaster; vc_testSystemRole := e_ae; // Map - map(self:mcaPort, system:mcaPort); - map(self:mcaPortIn, system:mcaPortIn); + map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort, PX_TS_SETTINGS.SUT.sutAddress); + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); + if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.coapBindingDesc)) { + v_binding_in := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.mqttBindingDesc)) { + v_binding_in := "MQTT"; + } else { + v_binding_in := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] }; + vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] }; + //Initialze the IUT } // end f_cf02UpAe1 @@ -179,9 +308,10 @@ module OneM2M_Functions { /** * @desc Ports mapping and default behaviour activation for Config 03 */ - function f_cf03Up(in CseTypeID p_cseType := int2) runs on CseSimu { + function f_cf03Up(in CseTypeID p_cseType := int2) runs on CseSimu system CseSystem { // Variables + var charstring v_binding; var PrimitiveContent v_cSEBaseResource; vc_config := e_cf03; vc_testSystemRole := e_cse; @@ -192,10 +322,23 @@ module OneM2M_Functions { vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1); // Map - map(self:mcaPortIn, system:mcaPortIn);//TODO To be consistent, we should use mcaPortIn for AE testing + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPort, PX_TS_SETTINGS.SUT.sutAddress);//TODO To be consistent, we should use mcaPortIn for AE testing map(self:acPort, system:acPort); + + if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] }; + if(PX_UT_IMPLEMENTED) { - map(self:utPort, system:utPort); + map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT); } activate(a_default()); vc_cseSimu := activate(a_cse_cf03()); @@ -209,9 +352,11 @@ module OneM2M_Functions { /** * @desc Ports mapping and default behaviour activation for Config 04 */ - function f_cf04Up(in CseTypeID p_cseType := int2) runs on CseSimu { + function f_cf04Up(in CseTypeID p_cseType := int2) runs on CseSimu system CseSystem { // Variables + var charstring v_binding; + var charstring v_binding_in; var PrimitiveContent v_cSEBaseResource; vc_config := e_cf04; vc_testSystemRole := e_cse; @@ -221,9 +366,32 @@ module OneM2M_Functions { vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1); // Map - map(self:mccPort, system:mccPort); - map(self:mccPortIn, system:mccPortIn); + map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort, PX_TS_SETTINGS.SUT.sutAddress); + map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn, PX_TS_SETTINGS.SUT.sutAddress); map(self:acPort, system:acPort); + + if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) { + v_binding := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) { + v_binding := "COAP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) { + v_binding := "MQTT"; + } else { + v_binding := "WSCK"; + } + if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) { + v_binding_in := "HTTP"; + } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) { + v_binding_in := "MQTT"; + } else { + v_binding_in := "WSCK"; + } + + vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] }; + vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] }; + activate(a_default()); vc_cseSimu := activate(a_cse_cf04()); @@ -749,7 +917,7 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(int2, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -814,10 +982,10 @@ module OneM2M_Functions { //TODO Test, to be removed v_request.to_ := f_getResourceAddress(); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); - //mcaPort.send(f_getMsgOutPrimitive(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); + //f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})))); } else { - mcaPort.send(f_getMsgOutPrimitive(m_request(m_createAe(p_appId)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_createAe(p_appId)))); } tc_ac.start; alt { @@ -908,7 +1076,7 @@ module OneM2M_Functions { vc_ae2.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"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); p_ae2Index := f_getResourceFromAeSimu(vc_ae2); @@ -954,7 +1122,7 @@ module OneM2M_Functions { v_request.from_ := f_getOriginator(vc_resourcesIndexToBeDeleted[i]); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1046,7 +1214,8 @@ module OneM2M_Functions { v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(v_resourceIndex, vc_testSystemRole))); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + //mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1076,7 +1245,8 @@ module OneM2M_Functions { //v_request := valueof(m_delete(v_childResourceRefs[0], f_getOriginator(vc_remoteCseIndex))); v_request := valueof(m_delete(v_childResourceRefs[0]));//TODO Originator super user to be replaced by CSE1_ID (line above) - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + //mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1107,7 +1277,8 @@ module OneM2M_Functions { [] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request { tc_ac.stop; f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); log(__SCOPE__&": INFO: Deregistration performed successfully"); } [] tc_ac.timeout { @@ -1143,7 +1314,7 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -1215,7 +1386,7 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(int1, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -1260,7 +1431,7 @@ module OneM2M_Functions { v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(v_request), p_nullFields))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(v_request), p_nullFields))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -1292,7 +1463,7 @@ module OneM2M_Functions { */ function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{ - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -1329,8 +1500,8 @@ module OneM2M_Functions { v_request := valueof(p_requestPrimitive); } - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); - + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); + tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { @@ -1360,7 +1531,8 @@ module OneM2M_Functions { */ function f_cse_operationResource(template RequestPrimitive p_requestPrimitive) runs on AeSimu return PrimitiveContent{ - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -1390,7 +1562,7 @@ module OneM2M_Functions { function f_cse_isResourcePresent (integer p_resourceIndex) runs on AeSimu return boolean { //Check to see if the resource is present or not - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { @@ -1427,7 +1599,7 @@ module OneM2M_Functions { log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource"); //Check to see if the resource has NOT been created - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) { @@ -1464,7 +1636,7 @@ module OneM2M_Functions { v_request.from_ := f_getOriginator(vc_acpAuxIndex); v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))}; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { @@ -1498,7 +1670,7 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); } @@ -1516,7 +1688,7 @@ module OneM2M_Functions { v_request := f_getUpdateRequestPrimitive(p_resourceType, p_targetIndex, p_requestUpdatePrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); } @@ -1628,10 +1800,10 @@ module OneM2M_Functions { v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; if(getverdict == pass) { - mcaPortIn.send(f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive))); } else { v_responsePrimitive.responseStatusCode := int4000; - mcaPortIn.send(f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive))); } //mcaPort.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); // TODO have to be deleted @@ -1659,7 +1831,7 @@ module OneM2M_Functions { //Send response in any case v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); tc_ac.start; repeat; } @@ -1698,7 +1870,7 @@ module OneM2M_Functions { //Send response in any case v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive{ tc_ac.stop; @@ -1743,7 +1915,7 @@ module OneM2M_Functions { } if(isvalue(v_responsePrimitive)) { - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } @@ -1780,7 +1952,7 @@ module OneM2M_Functions { //Send response in any case v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request { tc_ac.stop; @@ -1793,7 +1965,7 @@ module OneM2M_Functions { //Send response in any case v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); v_notificationsReceived := v_notificationsReceived + 1; if(v_notificationsReceived < p_numberOfAggregatedNotification) { tc_ac.start; @@ -1828,7 +2000,7 @@ module OneM2M_Functions { tc_ac.stop; v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) { setverdict(fail, __SCOPE__ & ":ERROR: subscriptionDeletion attribute have to be set to TRUE"); } @@ -1884,7 +2056,7 @@ module OneM2M_Functions { //p_requestPrimitive.from_ := PX_CSE1_ID; p_requestPrimitive.from_ := f_getOriginator(vc_remoteCseIndex, e_cse); - mccPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responseNotify(int2000))) -> value vc_response { @@ -1965,12 +2137,12 @@ module OneM2M_Functions { } v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mccPortIn.receive(mw_request(?)) -> value v_request { setverdict(fail, __SCOPE__ & ":ERROR: Request received with unexpected parameters"); v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier)); - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -1998,7 +2170,7 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(f_getAnnouncedResourceType(p_resourceType), p_requestPrimitive, vc_remoteCseIndex); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -2050,12 +2222,12 @@ module OneM2M_Functions { setverdict(pass, __SCOPE__ & ":INFO: Expected UPDATE Announcement received"); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mccPortIn.receive(mw_request(?)) -> value v_request { setverdict(fail, __SCOPE__ & ":ERROR: Request received with unexpected parameters"); v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier)); - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -2091,12 +2263,12 @@ module OneM2M_Functions { setverdict(pass, __SCOPE__ & ":INFO: Expected DELETE Announcement received"); f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mccPortIn.receive(mw_request(?)) -> value v_request { setverdict(fail, __SCOPE__ & ":ERROR: Request received with unexpected parameters"); v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier)); - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -2128,7 +2300,8 @@ module OneM2M_Functions { [] mccPortIn.receive(mw_request(p_request)) -> value vc_request { tc_ac.stop; v_localResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] tc_ac.timeout { setverdict(inconc, __SCOPE__&":INFO: No creation for resource received"); @@ -2180,7 +2353,8 @@ module OneM2M_Functions { } v_response.from_ := PX_CSE1_ID; v_response.to_ := vc_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response))); } [] tc_ac.timeout { @@ -2201,7 +2375,8 @@ module OneM2M_Functions { */ function f_cse_updateAnnouncedResource(in RequestPrimitive p_requestPrimitive) runs on CseSimu { - mccPort.send(f_getMsgOutPrimitive(m_request(p_requestPrimitive))); + //mccPort.send(f_getMsgOutPrimitive(m_request(p_requestPrimitive))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(p_requestPrimitive))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -2249,7 +2424,9 @@ module OneM2M_Functions { } else { setverdict(inconc, __SCOPE__&":INFO: Unexpected resource update"); } - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + } [] tc_ac.timeout { setverdict(inconc, __SCOPE__&":INFO: No answer while updating resource"); @@ -2283,7 +2460,9 @@ module OneM2M_Functions { } else { setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval"); } - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + } [] tc_ac.timeout { setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource"); @@ -2305,7 +2484,9 @@ module OneM2M_Functions { var RequestPrimitive v_requestPrimitive; var URIList v_uriList := {}; v_requestPrimitive := valueof(m_retrieveChildResourceRefs(f_getResourceAddress(p_targetResourceIndex), p_originator)); - mccPort.send(f_getMsgOutPrimitive(m_request(v_requestPrimitive))); + //mccPort.send(f_getMsgOutPrimitive(m_request(v_requestPrimitive))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_requestPrimitive))); + tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -2349,7 +2530,9 @@ module OneM2M_Functions { } else { setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval"); } - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + } [] tc_ac.timeout { setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource"); @@ -2368,7 +2551,9 @@ module OneM2M_Functions { function f_cse_isResourcePresent_cseSimu (integer p_resourceIndex) runs on CseSimu return boolean { //Check to see if the resource is present or not - mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); + //mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))))); + tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2000))) { @@ -2405,7 +2590,9 @@ module OneM2M_Functions { log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource"); //Check to see if the resource has NOT been created - mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))))); + //mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))))); + tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int4004))) { @@ -2448,7 +2635,8 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(int16, p_requestPrimitive, -1); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + //mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { @@ -2456,7 +2644,7 @@ module OneM2M_Functions { setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly"); f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive); vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1); - v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource)), vc_cSEBaseIndex, int16); + v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")))), vc_cSEBaseIndex, int16); // FIXME To be review not sure we have to use CSE1 vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex); } [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) { @@ -2498,7 +2686,7 @@ module OneM2M_Functions { f_cse_activateDefaults_cse1(); //send triggering primitive to SUT - f_sendUtPrimitive(v_utRequest,v_action); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { @@ -2512,9 +2700,10 @@ module OneM2M_Functions { v_response.from_ := PX_CSE1_ID; v_response.to_ := v_request.primitive.requestPrimitive.from_; v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response))); - vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1, false); + vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")))), int16, -1, false); v_resourceIndex := vc_remoteCseIndex; v_remoteCSERegistered:=true; tc_ac.start(10.0); @@ -2550,7 +2739,8 @@ module OneM2M_Functions { setverdict(pass, __SCOPE__&":INFO: CREATE Request received successfuly"); v_responsePrimitive := f_getCreateResponsePrimitive(vc_request.primitive.requestPrimitive.resourceType, vc_request.primitive.requestPrimitive); v_responsePrimitive.responseStatusCode := int2001; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mccPortIn.receive(mw_request(?)) { tc_ac.stop; @@ -2612,7 +2802,7 @@ module OneM2M_Functions { v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime; v_myResource.cSEBase.cSE_ID := PX_CSE1_ID; v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT; - v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_PROTOCOL_BINDING_CSE1, PX_CSE1_ADDRESS, "")}; + v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mcaPortIn, "")}; v_myResource.cSEBase.cseType := vc_cseType; v_myResource.cSEBase.supportedReleaseVersions := {"2a"}; @@ -3039,7 +3229,8 @@ module OneM2M_Functions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + //mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response { @@ -3079,7 +3270,8 @@ module OneM2M_Functions { f_processCreateRequestPrimitive(p_requestPrimitive.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } @@ -3102,7 +3294,7 @@ module OneM2M_Functions { //Send response v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); log(__SCOPE__&": WARNING: Unexpected Notification message received"); repeat; } @@ -3110,7 +3302,7 @@ module OneM2M_Functions { //Send response v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); log(__SCOPE__&": WARNING: Unexpected Notification for Subscription Verification message received"); repeat; } @@ -3161,7 +3353,8 @@ module OneM2M_Functions { v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); tc_ac.start(10.0); repeat; } @@ -3171,9 +3364,11 @@ module OneM2M_Functions { f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive); if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.cSEBase)) { - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}}))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}}))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}}))); } else { - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } tc_ac.start(10.0); repeat; @@ -3183,7 +3378,8 @@ module OneM2M_Functions { log(__SCOPE__&": WARNING: Unexpected UPDATE message received"); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); tc_ac.start(10.0); repeat; } @@ -3192,7 +3388,8 @@ module OneM2M_Functions { log(__SCOPE__&": WARNING: Unexpected DELETE message received"); f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); tc_ac.start(10.0); repeat; } @@ -3203,7 +3400,8 @@ module OneM2M_Functions { //Send response in any case v_response := valueof(m_responseNotification(int2000, omit)); v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + //mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response))); tc_ac.start(10.0); repeat; } @@ -3231,7 +3429,7 @@ module OneM2M_Functions { //Send response in any case v_response := valueof(m_responseNotification(int2000, omit)); v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_response))); tc_ac.start(10.0); repeat; } @@ -3310,7 +3508,7 @@ module OneM2M_Functions { v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } @@ -3356,11 +3554,11 @@ module OneM2M_Functions { v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType); v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex); if(v_resourceIndex != -1) { - mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)))); setverdict(pass, __SCOPE__&":INFO: Container created successfuly"); } else { - mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)))); setverdict(inconc, __SCOPE__&":INFO: Container creation failed"); } } @@ -3403,11 +3601,11 @@ module OneM2M_Functions { v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType); v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex); if(v_resourceIndex != -1) { - mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)))); setverdict(pass, __SCOPE__&":INFO: Polling Channel created successfuly"); } else { - mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)))); setverdict(inconc, __SCOPE__&":INFO: Polling Channel creation failed"); } } @@ -3452,7 +3650,7 @@ module OneM2M_Functions { //Send response in any case v_response := valueof(m_responseNotification(int2000, omit)); v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_response))); tc_ac.start(10.0); repeat; } @@ -3460,7 +3658,7 @@ module OneM2M_Functions { v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); tc_ac.start(10.0); repeat; } @@ -3498,8 +3696,7 @@ module OneM2M_Functions { * @param MsgOut MsgOut primitive */ - function f_getMsgOutPrimitive(template MsgOut p_msgOut) runs on Tester return MsgOut { - p_msgOut.protocolBinding := vc_protocolBinding; + function f_getMsgOutPrimitive(template MsgOut p_msgOut) runs on Tester return MsgOut { // TODO To be removed return valueof(p_msgOut); } @@ -4152,20 +4349,47 @@ module OneM2M_Functions { * @param p_announcementTargetResource Announcement Target Resource * @return p_annoucementTargetPoA Announcemenet Target PoA */ - function f_getCompletePoA(in charstring p_protocolBinding := PX_PROTOCOL_BINDING_CSE1, in charstring p_announcementTargetAddress := PX_CSE1_ADDRESS, charstring p_announcementTargetResource := "" ) return charstring { - - if(p_protocolBinding == "HTTP") { - return "http://" & p_announcementTargetAddress & "/" & p_announcementTargetResource; - } else if (p_protocolBinding == "COAP") { - return "coap://" & p_announcementTargetAddress & "/" & p_announcementTargetResource; - } else if (p_protocolBinding == "MQTT") { - return "mqtt://" & PX_SUT_ADDRESS & "/" & p_announcementTargetResource;//TODO - } else { - return "ws://" & p_announcementTargetAddress & "/" & p_announcementTargetResource; - } + function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mcaPortIn, charstring p_announcementTargetResource := "") return charstring { + var charstring v_poa; + + if (ischosen(p_portDesc.binding.httpBindingDesc)) { + v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress; + if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort)) { + v_poa := v_poa & ":" & int2str(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort); + } + } else if (ischosen(p_portDesc.binding.coapBindingDesc)) { + v_poa := "coap://" & p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress; + if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort)) { + v_poa := v_poa & ":" & int2str(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort); + } + } else if (ischosen(p_portDesc.binding.mqttBindingDesc)) { + v_poa := "mqtt://" & p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress; + if (ispresent(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort)) { + v_poa := v_poa & ":" & int2str(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort); + } + } else { + v_poa := "ws://" & p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress; + if (ispresent(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort)) { + v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort); + } + } + v_poa := v_poa & "/" & p_announcementTargetResource; + + return v_poa; } - - + + function f_getPortAddress(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mcaPortIn) return charstring { + if (ischosen(p_portDesc.binding.httpBindingDesc)) { + return p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress; + } else if (ischosen(p_portDesc.binding.coapBindingDesc)) { + return p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress; + } else if (ischosen(p_portDesc.binding.mqttBindingDesc)) { + return p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress; + } else { + return p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress; + } + } + /** * @desc Resolution of the local resource index for a given resource address (URI) * @param p_address Resource URI (can be structured/unstructured cseRelative/spRelative/absolute) @@ -4486,18 +4710,22 @@ module OneM2M_Functions { /** * @desc Retrieve IP address from a given address which includes port information separated by : - * @param p_addressPort Given address + * @param p_portDesc Given address * @return IPv4 Address */ - function f_getIpv4Address(charstring p_addressPort) runs on Tester return charstring { - + function f_getIpv4Address(in PortDesc p_portDesc) runs on Tester return charstring { var charstring v_ipv4Address := ""; - var integer i:= 0; - while ((i < lengthof(p_addressPort)-1) and (p_addressPort[i] != ":")){ - v_ipv4Address := v_ipv4Address & p_addressPort[i]; - i := i + 1; - } + if (ischosen(p_portDesc.binding.httpBindingDesc)) { + v_ipv4Address := p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress; + } else if (ischosen(p_portDesc.binding.coapBindingDesc)) { + v_ipv4Address := p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress; + } else if (ischosen(p_portDesc.binding.mqttBindingDesc)) { + v_ipv4Address := p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress; + } else { + v_ipv4Address := p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress; + } + return v_ipv4Address; } // end f_getIpv4Address @@ -4675,22 +4903,7 @@ module OneM2M_Functions { } return valueof(p_resource); } - /** - * @desc Retrieve AE_ID for a given AE resource - * @param p_targetResourceIndex Internal resource index of the given resource - * @return AE_ID of the given resource - */ - function f_setProtocolBinding(charstring p_protocolBinding) runs on Tester { - vc_protocolBinding := p_protocolBinding; - } - /** - * @desc Returns the protocol binding used by the component - */ - function f_getProtocolBinding() runs on Tester return charstring { - return vc_protocolBinding; - } - }//end group getSetFunctions group CheckingFunctions { @@ -5406,7 +5619,19 @@ module OneM2M_Functions { } } - + + function f_send( + in InterfaceIds p_interfaceIds, + in MsgOut p_msgOut + ) runs on Tester { + log(">>> f_send: ", p_interfaceIds); + + p_msgOut.protocolBinding := vc_myInterfaces[enum2int(p_interfaceIds)].myProtocolBinding; + p_msgOut.serialization := vc_myInterfaces[enum2int(p_interfaceIds)].mySerialization; + log("f_send: protocolBinding=", p_msgOut.protocolBinding); + vc_myInterfaces[enum2int(p_interfaceIds)].myPort.send(p_msgOut); + } + }//end of commonFunctions group externalFunctions { diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index 2832df7cf6462189391a1d6bd5e06dd82c7f4ad3..c042ac98cde4e59b240b7f911a6fcd276839934e 100644 --- a/LibOneM2M/OneM2M_Pixits.ttcn +++ b/LibOneM2M/OneM2M_Pixits.ttcn @@ -49,32 +49,32 @@ module OneM2M_Pixits { /** * @desc IUT CSE Name */ - modulepar XSD.ID PX_CSE_NAME := "cseName"; + modulepar XSD.ID PX_CSE_NAME := "oneMPOWER-IN-CSE"; /** * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1 */ - modulepar XSD.ID PX_CSE_ID := "/cseId"; + modulepar XSD.ID PX_CSE_ID := "/ID-CSE-01"; /** * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1 */ - modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId"; + modulepar XSD.ID PX_CSE_RESOURCE_ID := "ID-CSE-01"; /** * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID */ - modulepar XSD.ID PX_SP_ID := "//om2m.org"; + modulepar XSD.ID PX_SP_ID := "//idcc.com"; /** * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1 */ - modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin"; + modulepar XSD.ID PX_SUPER_AE_ID := "CsuperAE1"; /** * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1 */ - modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin"; + modulepar XSD.ID PX_SUPER_CSE_ID := "admin:admin"; /** * @desc Allowed AE-IDs starting with C @@ -110,32 +110,137 @@ module OneM2M_Pixits { * @desc Primitive scope to use during test execution */ modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative; - - /** - * @desc Serialization to use during test execution - */ - modulepar charstring PX_SERIALIZATION := "XML"; - - /** - * @desc Protocolo binding to use during test execution - */ - //modulepar charstring PX_PROTOCOL_BINDING := "HTTP"; /** - * @desc Protocolo binding to use during test execution - */ - modulepar charstring PX_PROTOCOL_BINDING_CSE1 := "HTTP"; - - /** - * @desc Protocolo binding to use during test execution - */ - modulepar charstring PX_PROTOCOL_BINDING_AE1 := "HTTP"; - - /** - * @desc Protocolo binding to use during test execution - */ - modulepar charstring PX_PROTOCOL_BINDING_AE2 := "HTTP"; + * @desc Test System settings + */ + modulepar TestSystemSettingsDesc PX_TS_SETTINGS := { + AE1 := { // AE1 component settings + mcaPort := { + binding := { + httpBindingDesc := { + bindingProtocol := e_http, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort := 9011, // SUT CoAP/HTTP port + localPort := 3131, // Test Adapter client port (for debug purpose only) + sutAddress := omit + } + } + }, + serialization := e_xml + }, + mcaPortIn := { + binding := { + httpBindingDesc := { + bindingProtocol := e_http, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort := omit, + localPort := 3141, // Test Adapter listener port (AeSimu acts as server) + sutAddress := omit + } + } + }, + serialization := e_xml + } + }, + AE2 := { // AE2 component settings + mcaPort := { + binding := { + coapBindingDesc := { + bindingProtocol := e_coap, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort := 9010, // SUT CoAP/HTTP port + localPort := 3132, // Test Adapter client port (for debug purpose only) + sutAddress := omit + } + } + }, + serialization := e_xml + }, + mcaPortIn := { + binding := { + coapBindingDesc := { + bindingProtocol := e_coap, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort := omit, + localPort := 3142, // Test Adapter listener port (AeSimu acts as server) + sutAddress := omit + } + } + }, + serialization := e_xml + } + }, + CSE1 := { // CSE1 component settings + mcaPort := { + binding := { + coapBindingDesc := { + bindingProtocol := e_coap, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort:= 9010, + localPort := 3031 + } + } + }, + serialization := e_xml + }, + mcaPortIn := { + binding := { + coapBindingDesc := { + bindingProtocol := e_coap, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort:= omit, + localPort := 3041, + sutAddress := omit + } + } + }, + serialization := e_xml + }, + mccPort := { + binding := { + httpBindingDesc := { + bindingProtocol := e_http, + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort:= 9011, + localPort := 4031, + sutAddress := omit + } + } + }, + serialization := e_xml + }, + mccPortIn := { + binding := { + coapBindingDesc := { + bindingProtocol := e_coap , + bindingDesc := { + tsAddress := "192.168.56.102", + remotePort:= omit, + localPort := 4041, + sutAddress := omit + } + } + }, + serialization := e_xml + } + }, + SUT := { sutAddress := "192.168.56.103" }, + UT := omit + }; + modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml"; + modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID"; + modulepar charstring PX_CREDENTIAL_ID := "admin:admin"; + modulepar charstring PX_REQUEST_URI := "/"; + /** * @desc Namespace composed of "prefix" = "xml namespace" to use during test execution */ @@ -150,25 +255,10 @@ module OneM2M_Pixits { * @desc Time given for configuring IUT when required (i.e. when UT not implemented) */ modulepar float PX_TCONFIG_IUT := 10.0; - + } group TesterParameters { - - /** - * @desc AE1 IP address and listening port - */ - modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3141"; - - /** - * @desc AE2 IP address and listening port - */ - modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3142"; - - /** - * @desc CSE1 IP address and listening port - */ - modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:4141"; /** * @desc Test System CSE1 Name diff --git a/LibOneM2M/OneM2M_Ports.ttcn b/LibOneM2M/OneM2M_Ports.ttcn index fbfdbc6024dc35bbb7ffe700a6855d824231f4db..fedd647300c4b7a5fd342604b058b7d0b575b4f3 100644 --- a/LibOneM2M/OneM2M_Ports.ttcn +++ b/LibOneM2M/OneM2M_Ports.ttcn @@ -31,6 +31,7 @@ module OneM2M_Ports { MsgIn; out MsgOut; + map param (in PortDesc p_portDesc, in charstring p_sutAddress); }; /** @@ -62,6 +63,7 @@ module OneM2M_Ports { UtTriggerAckPrimitive; out UtTriggerPrimitive; + map param (in UtDesc p_utDesc) } }//end module diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index 6431beaef847691e7892709a24cd1e079f9a31a4..a18831808648e08aac548a549bf86dc0c5c1cf26 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -44,8 +44,8 @@ module OneM2M_Templates { primitive := { requestPrimitive := p_requestPrimitive}, host := PX_SUT_ADDRESS, xmlNamespace := PX_XML_NAMESPACE, - protocolBinding := PX_PROTOCOL_BINDING_AE1, - serialization := PX_SERIALIZATION, + protocolBinding := "", + serialization := "", forcedFields := p_forcedFields }; @@ -57,8 +57,8 @@ module OneM2M_Templates { primitive := { responsePrimitive := p_responsePrimitive}, host := PX_SUT_ADDRESS, xmlNamespace := PX_XML_NAMESPACE, - protocolBinding := PX_PROTOCOL_BINDING_AE1, - serialization := PX_SERIALIZATION, + protocolBinding := "", + serialization := "", forcedFields := p_forcedFields }; @@ -71,7 +71,7 @@ module OneM2M_Templates { host := PX_SUT_ADDRESS, xmlNamespace := PX_XML_NAMESPACE, protocolBinding := "HTTP", - serialization := PX_SERIALIZATION, + serialization := "", forcedFields := p_forcedFields }; @@ -4141,21 +4141,21 @@ module OneM2M_Templates { choice := omit//O }; - template RemoteCSE_optional m_contentMyRemoteCSEResource modifies m_contentRemoteCSE_allOmit := { + template RemoteCSE_optional m_contentMyRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := { resourceName := PX_CSE1_NAME,//M resourceType := int16,//M resourceID := PX_CSE1_RESOURCE_ID,//M - pointOfAccess := {PX_CSE1_ADDRESS},//O + pointOfAccess := { p_pointOfAccess }, //O cSEBase := PX_CSE1_ID & "/" & PX_CSE1_NAME,//M cSE_ID := PX_CSE1_ID,//M requestReachability := true//M }; - template RemoteCSE_optional m_contentLocalRemoteCSEResource modifies m_contentRemoteCSE_allOmit := { + template RemoteCSE_optional m_contentLocalRemoteCSEResource(in charstring p_pointOfAccess) modifies m_contentRemoteCSE_allOmit := { resourceName := PX_CSE_NAME,//M resourceType := int16,//M resourceID := PX_CSE_RESOURCE_ID,//M - pointOfAccess := {PX_SUT_ADDRESS},//O + pointOfAccess := { p_pointOfAccess },//O cSEBase := PX_CSE_ID & "/" & PX_CSE_NAME,//M cSE_ID := PX_CSE_ID,//M requestReachability := true//M diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn index 4b1e6af946af5957249c4bb51a1a717f5750cf1d..b510922f7605c98de0c7c54754397f6610da20a4 100644 --- a/LibOneM2M/OneM2M_TestSystem.ttcn +++ b/LibOneM2M/OneM2M_TestSystem.ttcn @@ -22,6 +22,22 @@ module OneM2M_TestSystem { * Test System Components * *************************************** */ + + type enumerated InterfaceIds { + e_mca_port (0), + e_mca_in_port (1), + e_mcc_port (2), + e_mcc_in_port (3) + } + + type record Interface { + OneM2MPort myPort, + charstring myProtocolBinding, + charstring mySerialization + } + + type record of Interface Interfaces; + type component Tester { port AdapterControlPort acPort; port InfoPort infoPort; @@ -30,7 +46,6 @@ module OneM2M_TestSystem { timer tc_ac := PX_TAC; timer tc_wait := PX_TWAIT; //global variables - var charstring vc_protocolBinding; var Configurations vc_config; var TestSystemRole vc_testSystemRole; var MyResourcesList vc_resourcesList; @@ -41,6 +56,7 @@ module OneM2M_TestSystem { var default vc_aeSimu := null; var default vc_cseSimu := null; var PrimitiveContent vc_primitiveContentRetrievedResource; + var Interfaces vc_myInterfaces := {}; }; type component AeSimu extends Tester { diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn index 1c34ae4e649ad85ad4000f35af4689fe9a88c5fe..80dcac237e823fc1c2064179b3d1f58b7746eb7f 100644 --- a/LibOneM2M/OneM2M_Types.ttcn +++ b/LibOneM2M/OneM2M_Types.ttcn @@ -16,25 +16,24 @@ module OneM2M_Types { import from XSD all; - type record AccessControlPolicy { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - SetOfAcrs privileges, - SetOfAcrs selfPrivileges, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + SetOfAcrs privileges, + SetOfAcrs selfPrivileges, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -51,21 +50,21 @@ with { type record AccessControlPolicyAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - XSD.AnyURI link, - SetOfAcrs privileges, - SetOfAcrs selfPrivileges, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + XSD.AnyURI link, + SetOfAcrs privileges, + SetOfAcrs selfPrivileges, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -87,23 +86,23 @@ with { type record ActiveCmdhPolicy { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.ID activeCmdhPolicyLink + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.ID activeCmdhPolicyLink } with { variant "name as uncapitalized"; @@ -115,43 +114,43 @@ with { type record AE { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.String appName optional, - XSD.String app_ID, - XSD.ID aE_ID, - PoaList pointOfAccess optional, - XSD.AnyURI ontologyRef optional, - XSD.AnyURI nodeLink optional, - XSD.Boolean requestReachability, - Serializations contentSerialization optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Container container, - Group group_, - AccessControlPolicy accessControlPolicy, - Subscription subscription, - PollingChannel pollingChannel, - Schedule schedule, - SemanticDescriptor semanticDescriptor, - TimeSeries timeSeries, - TrafficPattern trafficPattern, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.String appName optional, + XSD.String app_ID, + XSD.ID aE_ID, + PoaList pointOfAccess optional, + XSD.AnyURI ontologyRef optional, + XSD.AnyURI nodeLink optional, + XSD.Boolean requestReachability, + Serializations contentSerialization optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Container container, + Group group_, + AccessControlPolicy accessControlPolicy, + Subscription subscription, + PollingChannel pollingChannel, + Schedule schedule, + SemanticDescriptor semanticDescriptor, + TimeSeries timeSeries, + TrafficPattern trafficPattern, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional } with { variant "element"; @@ -172,46 +171,46 @@ with { type record AEAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.String appName optional, - XSD.String app_ID optional, - XSD.ID aE_ID optional, - PoaList pointOfAccess optional, - XSD.AnyURI ontologyRef optional, - XSD.AnyURI nodeLink optional, - XSD.Boolean requestReachability optional, - Serializations contentSerialization optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Container container, - ContainerAnnc containerAnnc, - Group group_, - GroupAnnc groupAnnc, - AccessControlPolicy accessControlPolicy, - AccessControlPolicyAnnc accessControlPolicyAnnc, - Subscription subscription, - ScheduleAnnc scheduleAnnc, - SemanticDescriptor semanticDescriptor, - TimeSeries timeSeries, - TimeSeriesAnnc timeSeriesAnnc, - TrafficPatternAnnc trafficPatternAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.String appName optional, + XSD.String app_ID optional, + XSD.ID aE_ID optional, + PoaList pointOfAccess optional, + XSD.AnyURI ontologyRef optional, + XSD.AnyURI nodeLink optional, + XSD.Boolean requestReachability optional, + Serializations contentSerialization optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Container container, + ContainerAnnc containerAnnc, + Group group_, + GroupAnnc groupAnnc, + AccessControlPolicy accessControlPolicy, + AccessControlPolicyAnnc accessControlPolicyAnnc, + Subscription subscription, + ScheduleAnnc scheduleAnnc, + SemanticDescriptor semanticDescriptor, + TimeSeries timeSeries, + TimeSeriesAnnc timeSeriesAnnc, + TrafficPatternAnnc trafficPatternAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional } with { variant "element"; @@ -231,32 +230,32 @@ with { type record AllJoynApp { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - AllJoynDirection direction, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription, - AllJoynSvcObject allJoynSvcObject - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + AllJoynDirection direction, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription, + AllJoynSvcObject allJoynSvcObject + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -272,32 +271,32 @@ with { type record AllJoynAppAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - AllJoynDirection direction, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription, - AllJoynSvcObject allJoynSvcObject, - AllJoynSvcObjectAnnc allJoynSvcObjectAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + AllJoynDirection direction, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription, + AllJoynSvcObject allJoynSvcObject, + AllJoynSvcObjectAnnc allJoynSvcObjectAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -313,34 +312,34 @@ with { type record AllJoynInterface { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.AnyURI interfaceIntrospectXmlRef, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription, - AllJoynMethod allJoynMethod, - AllJoynProperty allJoynProperty, - Container container - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.AnyURI interfaceIntrospectXmlRef, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription, + AllJoynMethod allJoynMethod, + AllJoynProperty allJoynProperty, + Container container + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -356,36 +355,36 @@ with { type record AllJoynInterfaceAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.AnyURI interfaceIntrospectXmlRef optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription, - AllJoynMethod allJoynMethod, - AllJoynMethodAnnc allJoynMethodAnnc, - AllJoynProperty allJoynProperty, - AllJoynPropertyAnnc allJoynPropertyAnnc, - Container container, - ContainerAnnc containerAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.AnyURI interfaceIntrospectXmlRef optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription, + AllJoynMethod allJoynMethod, + AllJoynMethodAnnc allJoynMethodAnnc, + AllJoynProperty allJoynProperty, + AllJoynPropertyAnnc allJoynPropertyAnnc, + Container container, + ContainerAnnc containerAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -401,33 +400,33 @@ with { type record AllJoynMethodCall { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String input optional, - XSD.String callStatus optional, - XSD.String output optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String input optional, + XSD.String callStatus optional, + XSD.String output optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -443,29 +442,29 @@ with { type record AllJoynMethodCallAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -481,31 +480,31 @@ with { type record AllJoynMethod { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription, - AllJoynMethodCall allJoynMethodCall - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription, + AllJoynMethodCall allJoynMethodCall + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -521,31 +520,31 @@ with { type record AllJoynMethodAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription, - AllJoynMethodCall allJoynMethodCall, - AllJoynMethodCallAnnc allJoynMethodCallAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription, + AllJoynMethodCall allJoynMethodCall, + AllJoynMethodCallAnnc allJoynMethodCallAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -561,32 +560,32 @@ with { type record AllJoynProperty { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String currentValue, - XSD.String requestedValue optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String currentValue, + XSD.String requestedValue optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -602,29 +601,29 @@ with { type record AllJoynPropertyAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -640,33 +639,33 @@ with { type record AllJoynSvcObject { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String objectPath, - XSD.Boolean enable, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription, - AllJoynInterface allJoynInterface - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String objectPath, + XSD.Boolean enable, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription, + AllJoynInterface allJoynInterface + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -684,33 +683,33 @@ with { type record AllJoynSvcObjectAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String objectPath, - XSD.Boolean enable optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription, - AllJoynInterface allJoynInterface, - AllJoynInterfaceAnnc allJoynInterfaceAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String objectPath, + XSD.Boolean enable optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription, + AllJoynInterface allJoynInterface, + AllJoynInterfaceAnnc allJoynInterfaceAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -728,33 +727,33 @@ with { type record AreaNwkDeviceInfo { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String devID, - XSD.String devType, - XSD.AnyURI areaNwkId, - XSD.NonNegativeInteger sleepInterval optional, - XSD.NonNegativeInteger sleepDuration optional, - XSD.String devStatus optional, - ListOfURIs listOfNeighbors, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String devID, + XSD.String devType, + XSD.AnyURI areaNwkId, + XSD.NonNegativeInteger sleepInterval optional, + XSD.NonNegativeInteger sleepDuration optional, + XSD.String devStatus optional, + ListOfURIs listOfNeighbors, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -771,32 +770,32 @@ with { type record AreaNwkDeviceInfoAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String devID optional, - XSD.String devType optional, - XSD.AnyURI areaNwkId optional, - XSD.NonNegativeInteger sleepInterval optional, - XSD.NonNegativeInteger sleepDuration optional, - XSD.String devStatus optional, - ListOfURIs listOfNeighbors optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String devID optional, + XSD.String devType optional, + XSD.AnyURI areaNwkId optional, + XSD.NonNegativeInteger sleepInterval optional, + XSD.NonNegativeInteger sleepDuration optional, + XSD.String devStatus optional, + ListOfURIs listOfNeighbors optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -812,28 +811,28 @@ with { type record AreaNwkInfo { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String areaNwkType, - ListOfURIs listOfDevices, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String areaNwkType, + ListOfURIs listOfDevices, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -850,27 +849,27 @@ with { type record AreaNwkInfoAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String areaNwkType optional, - ListOfURIs listOfDevices optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String areaNwkType optional, + ListOfURIs listOfDevices optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -886,28 +885,28 @@ with { type record Battery { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.UnsignedInt batteryLevel, - BatteryStatus batteryStatus, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.UnsignedInt batteryLevel, + BatteryStatus batteryStatus, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -924,27 +923,27 @@ with { type record BatteryAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.UnsignedInt batteryLevel optional, - BatteryStatus batteryStatus optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.UnsignedInt batteryLevel optional, + BatteryStatus batteryStatus optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -960,25 +959,25 @@ with { type record CmdhBuffer { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - ListOfEventCatWithDef applicableEventCategory, - XSD.NonNegativeInteger maxBufferSize, - XSD.PositiveInteger storagePriority (1 .. !11) + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + ListOfEventCatWithDef applicableEventCategory, + XSD.NonNegativeInteger maxBufferSize, + XSD.PositiveInteger storagePriority (1 .. !11) } with { variant "name as uncapitalized"; @@ -990,23 +989,23 @@ with { type record CmdhDefaults { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - record length(2 .. infinity) of MgmtLinkRef mgmtLink_list + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + record length(2 .. infinity) of MgmtLinkRef mgmtLink_list } with { variant "name as uncapitalized"; @@ -1020,28 +1019,28 @@ with { type record CmdhDefEcValue { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.PositiveInteger order, - EventCat defEcValue, - ListOfM2MID requestOrigin, - XSD.AnySimpleType requestContext optional,//FIXME Use AnySimpleType instead - XSD.Boolean requestContextNotification optional, - XSD.AnySimpleType requestCharacteristics optional//FIXME Use AnySimpleType instead + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.PositiveInteger order, + EventCat defEcValue, + ListOfM2MID requestOrigin, + XSD.AnySimpleType requestContext optional,//FIXME Use AnySimpleType instead + XSD.Boolean requestContextNotification optional, + XSD.AnySimpleType requestCharacteristics optional//FIXME Use AnySimpleType instead } with { variant "name as uncapitalized"; @@ -1055,28 +1054,28 @@ with { type record CmdhEcDefParamValues { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - ListOfEventCatWithDef applicableEventCategory, - XSD.Long defaultRequestExpTime, - XSD.Long defaultResultExpTime, - XSD.Long defaultOpExecTime, - XSD.Long defaultRespPersistence, - XSD.Boolean defaultDelAggregation + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + ListOfEventCatWithDef applicableEventCategory, + XSD.Long defaultRequestExpTime, + XSD.Long defaultResultExpTime, + XSD.Long defaultOpExecTime, + XSD.Long defaultRespPersistence, + XSD.Boolean defaultDelAggregation } with { variant "name as uncapitalized"; @@ -1090,37 +1089,37 @@ with { type record CmdhLimits { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.PositiveInteger order, - ListOfM2MID requestOrigin, - XSD.AnySimpleType requestContext,//FIXME Use AnySimpleType instead - XSD.Boolean requestContextNotification optional, - XSD.AnySimpleType requestCharacteristics,//FIXME Use AnySimpleType instead - ListOfEventCat limitsEventCategory, - ListOfMinMax limitsRequestExpTime, - ListOfMinMax limitsResultExpTime, - ListOfMinMax limitsOpExecTime, - ListOfMinMax limitsRespPersistence, - enumerated { - x0, - x1, - x0_1 - } limitsDelAggregation + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.PositiveInteger order, + ListOfM2MID requestOrigin, + XSD.AnySimpleType requestContext,//FIXME Use AnySimpleType instead + XSD.Boolean requestContextNotification optional, + XSD.AnySimpleType requestCharacteristics,//FIXME Use AnySimpleType instead + ListOfEventCat limitsEventCategory, + ListOfMinMax limitsRequestExpTime, + ListOfMinMax limitsResultExpTime, + ListOfMinMax limitsOpExecTime, + ListOfMinMax limitsRespPersistence, + enumerated { + x0, + x1, + x0_1 + } limitsDelAggregation } with { variant "name as uncapitalized"; @@ -1137,24 +1136,24 @@ with { type record CmdhNetworkAccessRules { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - ListOfEventCatWithDef applicableEventCategories, - record of MgmtLinkRef mgmtLink_list + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + ListOfEventCatWithDef applicableEventCategories, + record of MgmtLinkRef mgmtLink_list } with { variant "name as uncapitalized"; @@ -1168,28 +1167,28 @@ with { type record CmdhNwAccessRule { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - ListOfM2MID targetNetwork, - XSD.NonNegativeInteger minReqVolume, - XSD.NonNegativeInteger spreadingWaitTime, - BackOffParameters backOffParameters, - XSD.AnySimpleType otherConditions,//FIXME Use AnySimpleType instead - MgmtLinkRef mgmtLink + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + ListOfM2MID targetNetwork, + XSD.NonNegativeInteger minReqVolume, + XSD.NonNegativeInteger spreadingWaitTime, + BackOffParameters backOffParameters, + XSD.AnySimpleType otherConditions,//FIXME Use AnySimpleType instead + MgmtLinkRef mgmtLink } with { variant "name as uncapitalized"; @@ -1201,24 +1200,24 @@ with { type record CmdhPolicy { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String cmdhPolicyName, - record length(4 .. infinity) of MgmtLinkRef mgmtLink_list + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String cmdhPolicyName, + record length(4 .. infinity) of MgmtLinkRef mgmtLink_list } with { variant "name as uncapitalized"; @@ -1245,11 +1244,11 @@ with { }; -type XSD.Token DeviceID (pattern "(urn:dev:ops:[\dABCDEFabcdef]#6-[\w_%]#(1,)-[\w_%]#(1,))" & "|" & - "(urn:dev:os:[\dABCDEFabcdef]#6-[\w_%]#(1,))" & "|" & - "(urn:imei:\d#15)" & "|" & - "(urn:esn:[\dABCDEFabcdef]#8)" & "|" & - "(urn:meid:[\dABCDEFabcdef]#14)") +type XSD.Token DeviceID (pattern "(urn:dev:ops:[\dABCDEFabcdef]#6-[\w_%]#(1,)-[\w_%]#(1,))" & "|" & + "(urn:dev:os:[\dABCDEFabcdef]#6-[\w_%]#(1,))" & "|" & + "(urn:imei:\d#15)" & "|" & + "(urn:esn:[\dABCDEFabcdef]#8)" & "|" & + "(urn:meid:[\dABCDEFabcdef]#14)") with { variant "name as uncapitalized"; }; @@ -1336,7 +1335,7 @@ with { type XSD.Token Ipv4 (pattern "([0-9A-Fa-f]#(8)(/([0-9]|[1-2][0-9]|3[0-2]))#(0,1))" & "|" & - "((25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))#(0,1))") + "((25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))#(0,1))") with { variant "name as uncapitalized"; }; @@ -1353,7 +1352,7 @@ type XSD.Token Ipv6 (pattern "([0-9A-Fa-f]#(1,4)(:[0-9A-Fa-f]#(1,4))#7(/([0-9]|[ "(([0-9A-Fa-f]#(1,4):)#(1,7):(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))#(0,1))" & "|" & //Double colon end "(((:(:0#(1,4))#(0,3)(:(0#(1,4)|[fF]#4))#(0,1))|(0#(1,4):(:0#(1,4))#(0,2)(:(0#(1,4)|[fF]#4))#(0,1))|((0#(1,4):)#2(:0#(1,4))#(0,1)(:(0#(1,4)|[fF]#4))#(0,1))|((0#(1,4):)#3(:(0#(1,4)|[fF]#4))#(0,1))|((0#(1,4):)#4(0#(1,4)|[fF]#4)#(0,1))):(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]#(0,1)[0-9]#(0,1)[0-9]))" & "|" & //Embedded IPv4 addresses without CIDR suffix. Should IPv4 CIDR suffix be added "(::(/0)#(0,1))") //The unspecified address - + with { variant "name as uncapitalized"; }; @@ -1382,8 +1381,8 @@ with { type union AbsRelTimestamp { - Timestamp alt_, - XSD.Long alt_1 + Timestamp alt_, + XSD.Long alt_1 } with { variant "name as uncapitalized"; @@ -1395,8 +1394,8 @@ with { type union MissingDataList { - ListOfTimeStamp alt_, - ListOfRelTimeStamp alt_1 + ListOfTimeStamp alt_, + ListOfRelTimeStamp alt_1 } with { variant "name as uncapitalized"; @@ -1434,9 +1433,9 @@ with { type enumerated PermittedMediaTypes { - applicationcbor, - applicationjson, - applicationxml + applicationcbor, + applicationjson, + applicationxml } with { variant "text 'applicationcbor' as 'application/cbor'"; @@ -1456,8 +1455,8 @@ with { type XSD.String ContentInfo //TODO To be fixed (pattern "([\w/!#$^_.#(1,)&\-]#(1,)(:[0-2])#(0,1))" & "|" & - // "([\w/!#$^_.#(1,)&\-]#(1,)((:[0-2])#(0,1))#(1,)((:[0-5])#(0,1)))") - + // "([\w/!#$^_.#(1,)&\-]#(1,)((:[0-2])#(0,1))#(1,)((:[0-5])#(0,1)))") + with { variant "name as uncapitalized"; }; @@ -1465,8 +1464,8 @@ with { type union EventCat { - StdEventCats alt_, - XSD.Integer alt_1 (100 .. 999) + StdEventCats alt_, + XSD.Integer alt_1 (100 .. 999) } with { variant "name as uncapitalized"; @@ -1478,11 +1477,11 @@ with { type union EventCatWithDef { - enumerated { - int0(0) - } alt_, - StdEventCats alt_1, - XSD.Integer alt_2 (100 .. 999) + enumerated { + int0(0) + } alt_, + StdEventCats alt_1, + XSD.Integer alt_2 (100 .. 999) } with { variant "name as uncapitalized"; @@ -1571,8 +1570,8 @@ with { type union DynAuthJWT { - E2eCompactJWS alt_, - E2eCompactJWE alt_1 + E2eCompactJWS alt_, + E2eCompactJWE alt_1 } with { variant "name as uncapitalized"; @@ -1590,9 +1589,9 @@ with { type union LocationTargetID { - NodeID alt_, - ExternalID alt_1, - XSD.String alt_2 (pattern "([0-9]*)") + NodeID alt_, + ExternalID alt_1, + XSD.String alt_2 (pattern "([0-9]*)") } with { variant "name as uncapitalized"; @@ -1624,8 +1623,8 @@ with { type record DeliveryMetaData { - XSD.Boolean tracingOption, - ListOfM2MID tracingInfo optional + XSD.Boolean tracingOption, + ListOfM2MID tracingInfo optional } with { variant "name as uncapitalized"; @@ -1636,14 +1635,14 @@ with { type record AggregatedRequest { - record length(1 .. infinity) of record { - Operation operation, - XSD.AnyURI to_, - XSD.ID from_, - RequestID requestIdentifier, - PrimitiveContent primitiveContent optional, - MetaInformation metaInformation optional - } request_list + record length(1 .. infinity) of record { + Operation operation, + XSD.AnyURI to_, + XSD.ID from_, + RequestID requestIdentifier, + PrimitiveContent primitiveContent optional, + MetaInformation metaInformation optional + } request_list } with { variant "name as uncapitalized"; @@ -1656,26 +1655,26 @@ with { type record MetaInformation { - ResourceType resourceType optional, - Timestamp originatingTimestamp optional, - AbsRelTimestamp requestExpirationTimestamp optional, - AbsRelTimestamp resultExpirationTimestamp optional, - AbsRelTimestamp operationExecutionTime optional, - ResponseTypeInfo responseType optional, - AbsRelTimestamp resultPersistence optional, - ResultContent resultContent optional, - EventCat eventCategory optional, - XSD.Boolean deliveryAggregation optional, - XSD.String groupRequestIdentifier optional, - FilterCriteria filterCriteria optional, - DiscResType discoveryResultType optional, - record length(1 .. infinity) of RoleID roleIDs optional, - XSD.Boolean tokenRequestIndicator optional, - record length(1 .. infinity) of DynAuthJWT tokens optional, - record length(1 .. infinity) of TokenID tokenIDs optional, - record length(1 .. infinity) of XSD.NCName localTokenIDs optional, - ReleaseVersion releaseVersionIndicator, - XSD.String vendorInformation optional + ResourceType resourceType optional, + Timestamp originatingTimestamp optional, + AbsRelTimestamp requestExpirationTimestamp optional, + AbsRelTimestamp resultExpirationTimestamp optional, + AbsRelTimestamp operationExecutionTime optional, + ResponseTypeInfo responseType optional, + AbsRelTimestamp resultPersistence optional, + ResultContent resultContent optional, + EventCat eventCategory optional, + XSD.Boolean deliveryAggregation optional, + XSD.String groupRequestIdentifier optional, + FilterCriteria filterCriteria optional, + DiscResType discoveryResultType optional, + record length(1 .. infinity) of RoleID roleIDs optional, + XSD.Boolean tokenRequestIndicator optional, + record length(1 .. infinity) of DynAuthJWT tokens optional, + record length(1 .. infinity) of TokenID tokenIDs optional, + record length(1 .. infinity) of XSD.NCName localTokenIDs optional, + ReleaseVersion releaseVersionIndicator, + XSD.String vendorInformation optional } with { variant "name as uncapitalized"; @@ -1694,70 +1693,70 @@ with { //FIXME Use this type instead type record PrimitiveContent type union PrimitiveContent { - //TS-0004 - 7.5.2-1 & 7.5.2-2 Common elements to request/response content - //ResourceTypes - AEAnnc_optional aEAnnc, - AE_optional aE, - AccessControlPolicy_optional accessControlPolicy, - AccessControlPolicyAnnc_optional accessControlPolicyAnnc, - ContentInstance_optional contentInstance, - ContentInstanceAnnc_optional contentInstanceAnnc, - Container_optional container, - ContainerAnnc_optional containerAnnc, - Delivery_optional delivery, - FlexContainerResource_optional flexContainer, - CSEBase_optional cSEBase, - Group_optional group_, - GroupAnnc_optional groupAnnc, - LocationPolicy_optional locationPolicy, - LocationPolicyAnnc_optional locationPolicyAnnc, - MgmtResource_optional mgmtResource,//MgmtResource - MgmtCmd_optional mgmtCmd, - AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource - Node_optional node, - NodeAnnc_optional nodeAnnc, - PollingChannel_optional pollingChannel, - Request_optional request, - RemoteCSE_optional remoteCSE, - RemoteCSEAnnc_optional remoteCSEAnnc, - Schedule_optional schedule, - ScheduleAnnc_optional scheduleAnnc, - StatsConfig_optional statsConfig, - StatsCollect_optional statsCollect, - M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile, - ServiceSubscribedAppRule_optional serviceSubscribedAppRule, - Subscription_optional subscription, - SemanticDescriptor_optional semanticDescriptor, - TimeSeries_optional timeSeries, - TimeSeriesInstance_optional timeSeriesInstance, - TimeSeriesAnnc_optional timeSeriesAnnc, - TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc, - GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance, - //SecurityInfo - SecurityInfo securityInfo, - //TS-0004 - 7.5.2-1 Elements used for request content - Notification notification, - AggregatedNotification aggregatedNotification, - AttributeList attributeList, - ResponsePrimitive responsePrimitive, - //TS-0004 - 7.5.2-2 Elements used for response content - Resource resource, - URIList uRIList, - ResourceRefList resourceRefList, - AggregatedResponse aggregatedResponse, - URI uRI, - RequestPrimitive requestPrimitive, - DebugInfo debugInfo, - //Invalid types - AE_update_invalid aE_update_invalid, - ACP_update_invalid aCP_update_invalid, - Container_update_invalid container_update_invalid, - Group_update_invalid group_update_invalid, - PollingChannel_update_invalid pollingChannel_update_invalid, - Schedule_update_invalid schedule_update_invalid, - Subscription_update_invalid subscription_update_invalid, - LocationPolicy_update_invalid locationPolicy_update_invalid, - TimeSeries_update_invalid timeSeries_update_invalid + //TS-0004 - 7.5.2-1 & 7.5.2-2 Common elements to request/response content + //ResourceTypes + AEAnnc_optional aEAnnc, + AE_optional aE, + AccessControlPolicy_optional accessControlPolicy, + AccessControlPolicyAnnc_optional accessControlPolicyAnnc, + ContentInstance_optional contentInstance, + ContentInstanceAnnc_optional contentInstanceAnnc, + Container_optional container, + ContainerAnnc_optional containerAnnc, + Delivery_optional delivery, + FlexContainerResource_optional flexContainer, + CSEBase_optional cSEBase, + Group_optional group_, + GroupAnnc_optional groupAnnc, + LocationPolicy_optional locationPolicy, + LocationPolicyAnnc_optional locationPolicyAnnc, + MgmtResource_optional mgmtResource,//MgmtResource + MgmtCmd_optional mgmtCmd, + AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource + Node_optional node, + NodeAnnc_optional nodeAnnc, + PollingChannel_optional pollingChannel, + Request_optional request, + RemoteCSE_optional remoteCSE, + RemoteCSEAnnc_optional remoteCSEAnnc, + Schedule_optional schedule, + ScheduleAnnc_optional scheduleAnnc, + StatsConfig_optional statsConfig, + StatsCollect_optional statsCollect, + M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile, + ServiceSubscribedAppRule_optional serviceSubscribedAppRule, + Subscription_optional subscription, + SemanticDescriptor_optional semanticDescriptor, + TimeSeries_optional timeSeries, + TimeSeriesInstance_optional timeSeriesInstance, + TimeSeriesAnnc_optional timeSeriesAnnc, + TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc, + GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance, + //SecurityInfo + SecurityInfo securityInfo, + //TS-0004 - 7.5.2-1 Elements used for request content + Notification notification, + AggregatedNotification aggregatedNotification, + AttributeList attributeList, + ResponsePrimitive responsePrimitive, + //TS-0004 - 7.5.2-2 Elements used for response content + Resource resource, + URIList uRIList, + ResourceRefList resourceRefList, + AggregatedResponse aggregatedResponse, + URI uRI, + RequestPrimitive requestPrimitive, + DebugInfo debugInfo, + //Invalid types + AE_update_invalid aE_update_invalid, + ACP_update_invalid aCP_update_invalid, + Container_update_invalid container_update_invalid, + Group_update_invalid group_update_invalid, + PollingChannel_update_invalid pollingChannel_update_invalid, + Schedule_update_invalid schedule_update_invalid, + Subscription_update_invalid subscription_update_invalid, + LocationPolicy_update_invalid locationPolicy_update_invalid, + TimeSeries_update_invalid timeSeries_update_invalid } @@ -1766,28 +1765,28 @@ type union PrimitiveContent { type record FilterCriteria { - Timestamp createdBefore optional, - Timestamp createdAfter optional, - Timestamp modifiedSince optional, - Timestamp unmodifiedSince optional, - XSD.PositiveInteger stateTagSmaller optional, - XSD.NonNegativeInteger stateTagBigger optional, - Timestamp expireBefore optional, - Timestamp expireAfter optional, - Labels labels optional, - ResourceTypeList resourceType optional, - XSD.NonNegativeInteger sizeAbove optional, - XSD.PositiveInteger sizeBelow optional, - record of TypeOfContent contentType_list, - record of Attribute attribute_list, - FilterUsage filterUsage optional, - XSD.NonNegativeInteger limit optional, - record of Sparql semanticsFilter_list, - XSD.Boolean filterOperation optional, - ContentFilterSyntax contentFilterSyntax optional, - XSD.String contentFilterQuery optional, - XSD.PositiveInteger level optional, - XSD.PositiveInteger offset optional + Timestamp createdBefore optional, + Timestamp createdAfter optional, + Timestamp modifiedSince optional, + Timestamp unmodifiedSince optional, + XSD.PositiveInteger stateTagSmaller optional, + XSD.NonNegativeInteger stateTagBigger optional, + Timestamp expireBefore optional, + Timestamp expireAfter optional, + Labels labels optional, + ResourceTypeList resourceType optional, + XSD.NonNegativeInteger sizeAbove optional, + XSD.PositiveInteger sizeBelow optional, + record of TypeOfContent contentType_list, + record of Attribute attribute_list, + FilterUsage filterUsage optional, + XSD.NonNegativeInteger limit optional, + record of Sparql semanticsFilter_list, + XSD.Boolean filterOperation optional, + ContentFilterSyntax contentFilterSyntax optional, + XSD.String contentFilterQuery optional, + XSD.PositiveInteger level optional, + XSD.PositiveInteger offset optional } with { variant "name as uncapitalized"; @@ -1804,8 +1803,8 @@ with { type record Attribute { - XSD.NCName name, - XSD.AnySimpleType value_//FIXME Use AnySimpleType instead + XSD.NCName name, + XSD.AnySimpleType value_//FIXME Use AnySimpleType instead } with { variant "name as uncapitalized"; @@ -1815,7 +1814,7 @@ with { type record ScheduleEntries { - record length(1 .. infinity) of ScheduleEntry scheduleEntry_list + record length(1 .. infinity) of ScheduleEntry scheduleEntry_list } with { variant "name as uncapitalized"; @@ -1830,8 +1829,8 @@ with { type record ActionStatus { - XSD.AnyURI action_ optional, - Status status optional + XSD.AnyURI action_ optional, + Status status optional } with { variant "name as uncapitalized"; @@ -1841,8 +1840,8 @@ with { type record AnyArgType { - XSD.NCName name, - XSD.AnySimpleType value_//FIXME Use AnySimpleType instead + XSD.NCName name, + XSD.AnySimpleType value_//FIXME Use AnySimpleType instead } with { variant "name as uncapitalized"; @@ -1852,7 +1851,7 @@ with { type record ResetArgsType { - record of AnyArgType anyArg_list + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1863,7 +1862,7 @@ with { type record RebootArgsType { - record of AnyArgType anyArg_list + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1874,11 +1873,11 @@ with { type record UploadArgsType { - XSD.String fileType, - XSD.AnyURI uRL, - XSD.String username, - XSD.String password, - record of AnyArgType anyArg_list + XSD.String fileType, + XSD.AnyURI uRL, + XSD.String username, + XSD.String password, + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1890,17 +1889,17 @@ with { type record DownloadArgsType { - XSD.String fileType, - XSD.AnyURI uRL, - XSD.String username, - XSD.String password, - XSD.PositiveInteger filesize, - XSD.String targetFile, - XSD.PositiveInteger delaySeconds, - XSD.AnyURI successURL, - Timestamp startTime, - Timestamp completeTime, - record of AnyArgType anyArg_list + XSD.String fileType, + XSD.AnyURI uRL, + XSD.String username, + XSD.String password, + XSD.PositiveInteger filesize, + XSD.String targetFile, + XSD.PositiveInteger delaySeconds, + XSD.AnyURI successURL, + Timestamp startTime, + Timestamp completeTime, + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1912,12 +1911,12 @@ with { type record SoftwareInstallArgsType { - XSD.AnyURI uRL, - XSD.String uUID, - XSD.String username, - XSD.String password, - XSD.String executionEnvRef, - record of AnyArgType anyArg_list + XSD.AnyURI uRL, + XSD.String uUID, + XSD.String username, + XSD.String password, + XSD.String executionEnvRef, + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1930,13 +1929,13 @@ with { type record SoftwareUpdateArgsType { - XSD.String uUID, - XSD.String version, - XSD.AnyURI uRL, - XSD.String username, - XSD.String password, - XSD.String executionEnvRef, - record of AnyArgType anyArg_list + XSD.String uUID, + XSD.String version, + XSD.AnyURI uRL, + XSD.String username, + XSD.String password, + XSD.String executionEnvRef, + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1949,10 +1948,10 @@ with { type record SoftwareUninstallArgsType { - XSD.String uUID, - XSD.String version, - XSD.String executionEnvRef, - record of AnyArgType anyArg_list + XSD.String uUID, + XSD.String version, + XSD.String executionEnvRef, + record of AnyArgType anyArg_list } with { variant "name as uncapitalized"; @@ -1964,15 +1963,15 @@ with { type record ExecReqArgsListType { - union { - record of ResetArgsType reset_list, - record length(1 .. infinity) of RebootArgsType reboot_list, - record length(1 .. infinity) of UploadArgsType upload_list, - record length(1 .. infinity) of DownloadArgsType download_list, - record length(1 .. infinity) of SoftwareInstallArgsType softwareInstall_list, - record length(1 .. infinity) of SoftwareUpdateArgsType softwareUpdate_list, - record length(1 .. infinity) of SoftwareUninstallArgsType softwareUninstall_list - } choice + union { + record of ResetArgsType reset_list, + record length(1 .. infinity) of RebootArgsType reboot_list, + record length(1 .. infinity) of UploadArgsType upload_list, + record length(1 .. infinity) of DownloadArgsType download_list, + record length(1 .. infinity) of SoftwareInstallArgsType softwareInstall_list, + record length(1 .. infinity) of SoftwareUpdateArgsType softwareUpdate_list, + record length(1 .. infinity) of SoftwareUninstallArgsType softwareUninstall_list + } choice } with { variant "name as uncapitalized"; @@ -1996,9 +1995,9 @@ with { type record MgmtLinkRef { - ResourceName name, - MgmtDefinition type_, - XSD.AnyURI base + ResourceName name, + MgmtDefinition type_, + XSD.AnyURI base } with { variant "name as uncapitalized"; @@ -2013,7 +2012,7 @@ with { type record SetOfAcrs { - record of AccessControlRule accessControlRule_list + record of AccessControlRule accessControlRule_list } with { variant "name as uncapitalized"; @@ -2024,22 +2023,22 @@ with { type record AccessControlRule { - ListOfURIs accessControlOriginators, - AccessControlOperations accessControlOperations, - record of record { - record of ScheduleEntry accessControlWindow_list, - record { - record length(1 .. infinity) of Ipv4 ipv4Addresses optional, - record length(1 .. infinity) of Ipv6 ipv6Addresses optional - } accessControlIpAddresses optional, - LocationRegion accessControlLocationRegion optional - } accessControlContexts_list, - XSD.Boolean accessControlAuthenticationFlag optional, - record of record { - ResourceType resourceType optional, - XSD.AnyURI specializationID optional, - record length(1 .. infinity) of ResourceType childResourceType - } accessControlObjectDetails_list + ListOfURIs accessControlOriginators, + AccessControlOperations accessControlOperations, + record of record { + record of ScheduleEntry accessControlWindow_list, + record { + record length(1 .. infinity) of Ipv4 ipv4Addresses optional, + record length(1 .. infinity) of Ipv6 ipv6Addresses optional + } accessControlIpAddresses optional, + LocationRegion accessControlLocationRegion optional + } accessControlContexts_list, + XSD.Boolean accessControlAuthenticationFlag optional, + record of record { + ResourceType resourceType optional, + XSD.AnyURI specializationID optional, + record length(1 .. infinity) of ResourceType childResourceType + } accessControlObjectDetails_list } with { variant "name as uncapitalized"; @@ -2059,10 +2058,10 @@ with { type record ChildResourceRef { - ResourceName name, - XSD.AnyURI specializationID optional, - ResourceType type_, - XSD.AnyURI base + ResourceName name, + XSD.AnyURI specializationID optional, + ResourceType type_, + XSD.AnyURI base } with { //variant "name as uncapitalized"; @@ -2076,8 +2075,8 @@ with { type record ResponseTypeInfo { - ResponseType responseTypeValue, - record of XSD.AnyURI notificationURI optional + ResponseType responseTypeValue, + record of XSD.AnyURI notificationURI optional } with { variant "name as uncapitalized"; @@ -2089,16 +2088,16 @@ with { type record OperationResult { - ResponseStatusCode responseStatusCode, - RequestID requestIdentifier, - PrimitiveContent primitiveContent optional, - XSD.AnyURI to_ optional, - XSD.ID from_ optional, - Timestamp originatingTimestamp optional, - AbsRelTimestamp resultExpirationTimestamp optional, - EventCat eventCategory optional, - ContentStatus contentStatus optional, - XSD.PositiveInteger contentOffset optional + ResponseStatusCode responseStatusCode, + RequestID requestIdentifier, + PrimitiveContent primitiveContent optional, + XSD.AnyURI to_ optional, + XSD.ID from_ optional, + Timestamp originatingTimestamp optional, + AbsRelTimestamp resultExpirationTimestamp optional, + EventCat eventCategory optional, + ContentStatus contentStatus optional, + XSD.PositiveInteger contentOffset optional } with { variant "name as uncapitalized"; @@ -2111,10 +2110,10 @@ with { type record ContentRef { - record length(1 .. infinity) of record { - XSD.NCName name, - XSD.AnyURI uRI - } uRIReference_list + record length(1 .. infinity) of record { + XSD.NCName name, + XSD.AnyURI uRI + } uRIReference_list } with { variant "name as uncapitalized"; @@ -2126,8 +2125,8 @@ with { type record DeletionContexts { - record of ScheduleEntry timeOfDay_list, - record of LocationRegion locationRegions_list + record of ScheduleEntry timeOfDay_list, + record of LocationRegion locationRegions_list } with { variant "name as uncapitalized"; @@ -2140,10 +2139,10 @@ with { type record LocationRegion { - union { - record length(1 .. infinity) of CountryCode countryCode, - record length(3) of XSD.Float circRegion - } choice + union { + record length(1 .. infinity) of CountryCode countryCode, + record length(3) of XSD.Float circRegion + } choice } with { variant "name as uncapitalized"; @@ -2161,8 +2160,8 @@ with { type record MissingData { - XSD.NonNegativeInteger number, - XSD.Duration duration + XSD.NonNegativeInteger number, + XSD.Duration duration } with { variant "name as uncapitalized"; @@ -2175,11 +2174,11 @@ with { type record ReceiverESPrimRandObject { - XSD.NCName esprimRandID, - XSD.NCName esprimRandValue, - AbsRelTimestamp esprimRandExpiry, - record length(1 .. infinity) of EsprimKeyGenAlgID esprimKeyGenAlgIDs, - record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs + XSD.NCName esprimRandID, + XSD.NCName esprimRandValue, + AbsRelTimestamp esprimRandExpiry, + record length(1 .. infinity) of EsprimKeyGenAlgID esprimKeyGenAlgIDs, + record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs } with { variant "name as uncapitalized"; @@ -2192,11 +2191,11 @@ with { type record OriginatorESPrimRandObject { - XSD.NCName esprimRandID, - XSD.NCName esprimRandValue, - AbsRelTimestamp esprimRandExpiry, - EsprimKeyGenAlgID esprimKeyGenAlgIDs, - record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs + XSD.NCName esprimRandID, + XSD.NCName esprimRandValue, + AbsRelTimestamp esprimRandExpiry, + EsprimKeyGenAlgID esprimKeyGenAlgIDs, + record length(1 .. infinity) of EsprimProtocolAndAlgID esprimProtocolAndAlgIDs } with { variant "name as uncapitalized"; @@ -2206,9 +2205,9 @@ with { type record E2eSecInfo { - record length(1 .. infinity) of Suid supportedE2ESecFeatures, - record length(1 .. infinity) of XSD.Base64Binary certificates optional, - ReceiverESPrimRandObject sharedReceiverESPrimRandObject optional + record length(1 .. infinity) of Suid supportedE2ESecFeatures, + record length(1 .. infinity) of XSD.Base64Binary certificates optional, + ReceiverESPrimRandObject sharedReceiverESPrimRandObject optional } with { variant "name as uncapitalized"; @@ -2219,9 +2218,9 @@ with { type record TokenPermission { - ListOfM2MID resourceIDs optional, - SetOfAcrs privileges optional, - record length(1 .. infinity) of RoleID roleIDs optional + ListOfM2MID resourceIDs optional, + SetOfAcrs privileges optional, + record length(1 .. infinity) of RoleID roleIDs optional } with { variant "name as uncapitalized"; @@ -2231,7 +2230,7 @@ with { type record TokenPermissions { - record of TokenPermission permission_list + record of TokenPermission permission_list } with { variant "name as uncapitalized"; @@ -2242,16 +2241,16 @@ with { type record TokenClaimSet { - XSD.String version, - TokenID tokenID, - XSD.ID holder, - XSD.ID issuer, - Timestamp notBefore, - Timestamp notAfter, - XSD.String tokenName optional, - ListOfM2MID audience optional, - TokenPermissions permissions optional, - XSD.String extension_ optional + XSD.String version, + TokenID tokenID, + XSD.ID holder, + XSD.ID issuer, + Timestamp notBefore, + Timestamp notAfter, + XSD.String tokenName optional, + ListOfM2MID audience optional, + TokenPermissions permissions optional, + XSD.String extension_ optional } with { variant "name as uncapitalized"; @@ -2261,10 +2260,10 @@ with { type record DynAuthLocalTokenIdAssignments { - record length(1 .. infinity) of record { - XSD.NCName localTokenID, - TokenID tokenID - } localTokenIdAssignment_list + record length(1 .. infinity) of record { + XSD.NCName localTokenID, + TokenID tokenID + } localTokenIdAssignment_list } with { variant "name as uncapitalized"; @@ -2275,11 +2274,11 @@ with { type record DynAuthTokenSummary { - TokenID tokenID, - Timestamp notBefore, - Timestamp notAfter, - XSD.String tokenName optional, - ListOfM2MID audience optional + TokenID tokenID, + Timestamp notBefore, + Timestamp notAfter, + XSD.String tokenName optional, + ListOfM2MID audience optional } with { variant "name as uncapitalized"; @@ -2288,11 +2287,11 @@ with { type record DynAuthTokenReqInfo { - record length(1 .. infinity) of record { - XSD.AnyURI uRI, - DynAuthDasRequest dasRequest optional, - DynAuthJWT securedDasRequest optional - } dasInfo_list + record length(1 .. infinity) of record { + XSD.AnyURI uRI, + DynAuthDasRequest dasRequest optional, + DynAuthJWT securedDasRequest optional + } dasInfo_list } with { variant "name as uncapitalized"; @@ -2304,20 +2303,20 @@ with { type record DynAuthDasRequest { - XSD.ID originator, - ResourceType targetedResourceType, - Operation operation, - record { - Ipv4 ipv4Address optional, - Ipv6 ipv6Address optional - } originatorIP optional, - LocationRegion originatorLocation optional, - record length(1 .. infinity) of RoleID originatorRoleIDs optional, - AbsRelTimestamp requestTimestamp optional, - XSD.AnyURI targetedResourceID optional, - AbsRelTimestamp proposedPrivilegesLifetime optional, - record length(1 .. infinity) of RoleID roleIDsFromACPs optional, - record length(1 .. infinity) of TokenID tokenIDs optional + XSD.ID originator, + ResourceType targetedResourceType, + Operation operation, + record { + Ipv4 ipv4Address optional, + Ipv6 ipv6Address optional + } originatorIP optional, + LocationRegion originatorLocation optional, + record length(1 .. infinity) of RoleID originatorRoleIDs optional, + AbsRelTimestamp requestTimestamp optional, + XSD.AnyURI targetedResourceID optional, + AbsRelTimestamp proposedPrivilegesLifetime optional, + record length(1 .. infinity) of RoleID roleIDsFromACPs optional, + record length(1 .. infinity) of TokenID tokenIDs optional } with { variant "name as uncapitalized"; @@ -2331,13 +2330,13 @@ with { type record BackOffParameters { - record length(1 .. infinity) of record { - NetworkAction networkAction optional, - XSD.NonNegativeInteger initialBackoffTime, - XSD.NonNegativeInteger additionalBackoffTime, - XSD.NonNegativeInteger maximumBackoffTime, - XSD.NonNegativeInteger optionalRandomBackoffTime optional - } backOffParametersSet_list + record length(1 .. infinity) of record { + NetworkAction networkAction optional, + XSD.NonNegativeInteger initialBackoffTime, + XSD.NonNegativeInteger additionalBackoffTime, + XSD.NonNegativeInteger maximumBackoffTime, + XSD.NonNegativeInteger optionalRandomBackoffTime optional + } backOffParametersSet_list } with { variant "name as uncapitalized"; @@ -2352,7 +2351,7 @@ with { type record ListOfDataLinks { - record length(1 .. infinity) of DataLink dataLinkEntry_list + record length(1 .. infinity) of DataLink dataLinkEntry_list } with { variant "name as uncapitalized"; @@ -2365,9 +2364,9 @@ with { type record DataLink { - XSD.AnyURI name, - XSD.ID dataContainerID, - XSD.NCName attributeName optional + XSD.AnyURI name, + XSD.ID dataContainerID, + XSD.NCName attributeName optional } with { variant "name as uncapitalized"; @@ -2378,13 +2377,13 @@ with { type record Resource_1 { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional } with { variant "name as 'resource'"; @@ -2394,16 +2393,16 @@ with { type record RegularResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional } with { variant "name as uncapitalized"; @@ -2413,18 +2412,18 @@ with { type record AnnounceableResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional } with { variant "name as uncapitalized"; @@ -2435,17 +2434,17 @@ with { type record AnnouncedResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional } with { variant "name as uncapitalized"; @@ -2455,16 +2454,16 @@ with { type record AnnounceableSubordinateResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional } with { variant "name as uncapitalized"; @@ -2475,14 +2474,14 @@ with { type record SubordinateResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime } with { variant "name as uncapitalized"; @@ -2492,15 +2491,15 @@ with { type record AnnouncedSubordinateResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - XSD.AnyURI link + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + XSD.AnyURI link } with { variant "name as uncapitalized"; @@ -2510,22 +2509,22 @@ with { type record MgmtResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional } with { variant "name as uncapitalized"; @@ -2536,21 +2535,21 @@ with { type record AnnouncedMgmtResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional } with { variant "name as uncapitalized"; @@ -2569,23 +2568,23 @@ with { type record FlexContainerResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize } with { variant "name as uncapitalized"; @@ -2595,21 +2594,21 @@ with { type record AnnouncedFlexContainerResource { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize } with { variant "name as uncapitalized"; @@ -2621,11 +2620,11 @@ with { type union Sg_announceableSubordinateResource_group { - AnnounceableSubordinateResource sg_announceableSubordinateResource, - AccessControlPolicy accessControlPolicy, - ContentInstance contentInstance, - Schedule schedule, - TimeSeriesInstance timeSeriesInstance + AnnounceableSubordinateResource sg_announceableSubordinateResource, + AccessControlPolicy accessControlPolicy, + ContentInstance contentInstance, + Schedule schedule, + TimeSeriesInstance timeSeriesInstance } with { variant "untagged"; @@ -2636,11 +2635,11 @@ with { type union Sg_announcedSubordinateResource_group { - AnnouncedSubordinateResource sg_announcedSubordinateResource, - AccessControlPolicyAnnc accessControlPolicyAnnc, - ContentInstanceAnnc contentInstanceAnnc, - ScheduleAnnc scheduleAnnc, - TimeSeriesInstanceAnnc timeSeriesInstanceAnnc + AnnouncedSubordinateResource sg_announcedSubordinateResource, + AccessControlPolicyAnnc accessControlPolicyAnnc, + ContentInstanceAnnc contentInstanceAnnc, + ScheduleAnnc scheduleAnnc, + TimeSeriesInstanceAnnc timeSeriesInstanceAnnc } with { variant "untagged"; @@ -2651,26 +2650,26 @@ with { type union Sg_mgmtResource_group { - MgmtResource sg_mgmtResource, - ActiveCmdhPolicy activeCmdhPolicy, - AreaNwkDeviceInfo areaNwkDeviceInfo, - AreaNwkInfo areaNwkInfo, - Battery battery, - CmdhBuffer cmdhBuffer, - CmdhDefEcValue cmdhDefEcValue, - CmdhDefaults cmdhDefaults, - CmdhEcDefParamValues cmdhEcDefParamValues, - CmdhLimits cmdhLimits, - CmdhNetworkAccessRules cmdhNetworkAccessRules, - CmdhNwAccessRule cmdhNwAccessRule, - CmdhPolicy cmdhPolicy, - DeviceCapability deviceCapability, - DeviceInfo deviceInfo, - EventLog eventLog, - Firmware firmware, - Memory memory, - Reboot reboot, - Software software + MgmtResource sg_mgmtResource, + ActiveCmdhPolicy activeCmdhPolicy, + AreaNwkDeviceInfo areaNwkDeviceInfo, + AreaNwkInfo areaNwkInfo, + Battery battery, + CmdhBuffer cmdhBuffer, + CmdhDefEcValue cmdhDefEcValue, + CmdhDefaults cmdhDefaults, + CmdhEcDefParamValues cmdhEcDefParamValues, + CmdhLimits cmdhLimits, + CmdhNetworkAccessRules cmdhNetworkAccessRules, + CmdhNwAccessRule cmdhNwAccessRule, + CmdhPolicy cmdhPolicy, + DeviceCapability deviceCapability, + DeviceInfo deviceInfo, + EventLog eventLog, + Firmware firmware, + Memory memory, + Reboot reboot, + Software software } with { variant "untagged"; @@ -2681,16 +2680,16 @@ with { type union Sg_announceableResource_group { - AnnounceableResource sg_announceableResource, - AE aE, - Container container, - Group group_, - LocationPolicy locationPolicy, - Node node, - RemoteCSE remoteCSE, - SemanticDescriptor semanticDescriptor, - TimeSeries timeSeries, - TrafficPattern trafficPattern + AnnounceableResource sg_announceableResource, + AE aE, + Container container, + Group group_, + LocationPolicy locationPolicy, + Node node, + RemoteCSE remoteCSE, + SemanticDescriptor semanticDescriptor, + TimeSeries timeSeries, + TrafficPattern trafficPattern } with { variant "untagged"; @@ -2703,16 +2702,16 @@ with { type union Sg_announcedResource_group { - AnnouncedResource sg_announcedResource, - AEAnnc aEAnnc, - ContainerAnnc containerAnnc, - GroupAnnc groupAnnc, - LocationPolicyAnnc locationPolicyAnnc, - NodeAnnc nodeAnnc, - RemoteCSEAnnc remoteCSEAnnc, - SemanticDescriptorAnnc semanticDescriptorAnnc, - TimeSeriesAnnc timeSeriesAnnc, - TrafficPatternAnnc trafficPatternAnnc + AnnouncedResource sg_announcedResource, + AEAnnc aEAnnc, + ContainerAnnc containerAnnc, + GroupAnnc groupAnnc, + LocationPolicyAnnc locationPolicyAnnc, + NodeAnnc nodeAnnc, + RemoteCSEAnnc remoteCSEAnnc, + SemanticDescriptorAnnc semanticDescriptorAnnc, + TimeSeriesAnnc timeSeriesAnnc, + TrafficPatternAnnc trafficPatternAnnc } with { variant "untagged"; @@ -2724,17 +2723,17 @@ with { type union Sg_flexContainerResource_group { - FlexContainerResource sg_flexContainerResource, - AllJoynApp allJoynApp, - AllJoynInterface allJoynInterface, - AllJoynMethod allJoynMethod, - AllJoynMethodCall allJoynMethodCall, - AllJoynProperty allJoynProperty, - AllJoynSvcObject allJoynSvcObject, - GenericInterworkingOperationInstance genericInterworkingOperationInstance, - GenericInterworkingService genericInterworkingService, - SvcFwWrapper svcFwWrapper, - SvcObjWrapper svcObjWrapper + FlexContainerResource sg_flexContainerResource, + AllJoynApp allJoynApp, + AllJoynInterface allJoynInterface, + AllJoynMethod allJoynMethod, + AllJoynMethodCall allJoynMethodCall, + AllJoynProperty allJoynProperty, + AllJoynSvcObject allJoynSvcObject, + GenericInterworkingOperationInstance genericInterworkingOperationInstance, + GenericInterworkingService genericInterworkingService, + SvcFwWrapper svcFwWrapper, + SvcObjWrapper svcObjWrapper } with { variant "untagged"; @@ -2745,17 +2744,17 @@ with { type union Sg_announcedFlexContainerResource_group { - AnnouncedFlexContainerResource sg_announcedFlexContainerResource, - AllJoynAppAnnc allJoynAppAnnc, - AllJoynInterfaceAnnc allJoynInterfaceAnnc, - AllJoynMethodAnnc allJoynMethodAnnc, - AllJoynMethodCallAnnc allJoynMethodCallAnnc, - AllJoynPropertyAnnc allJoynPropertyAnnc, - AllJoynSvcObjectAnnc allJoynSvcObjectAnnc, - GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc, - GenericInterworkingServiceAnnc genericInterworkingServiceAnnc, - SvcFwWrapperAnnc svcFwWrapperAnnc, - SvcObjWrapperAnnc svcObjWrapperAnnc + AnnouncedFlexContainerResource sg_announcedFlexContainerResource, + AllJoynAppAnnc allJoynAppAnnc, + AllJoynInterfaceAnnc allJoynInterfaceAnnc, + AllJoynMethodAnnc allJoynMethodAnnc, + AllJoynMethodCallAnnc allJoynMethodCallAnnc, + AllJoynPropertyAnnc allJoynPropertyAnnc, + AllJoynSvcObjectAnnc allJoynSvcObjectAnnc, + GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc, + GenericInterworkingServiceAnnc genericInterworkingServiceAnnc, + SvcFwWrapperAnnc svcFwWrapperAnnc, + SvcObjWrapperAnnc svcObjWrapperAnnc } with { variant "untagged"; @@ -2766,17 +2765,17 @@ with { type union Sg_announcedMgmtResource_group { - AnnouncedMgmtResource sg_announcedMgmtResource, - AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc, - AreaNwkInfoAnnc areaNwkInfoAnnc, - BatteryAnnc batteryAnnc, - DeviceCapabilityAnnc deviceCapabilityAnnc, - DeviceInfoAnnc deviceInfoAnnc, - EventLogAnnc eventLogAnnc, - FirmwareAnnc firmwareAnnc, - MemoryAnnc memoryAnnc, - RebootAnnc rebootAnnc, - SoftwareAnnc softwareAnnc + AnnouncedMgmtResource sg_announcedMgmtResource, + AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc, + AreaNwkInfoAnnc areaNwkInfoAnnc, + BatteryAnnc batteryAnnc, + DeviceCapabilityAnnc deviceCapabilityAnnc, + DeviceInfoAnnc deviceInfoAnnc, + EventLogAnnc eventLogAnnc, + FirmwareAnnc firmwareAnnc, + MemoryAnnc memoryAnnc, + RebootAnnc rebootAnnc, + SoftwareAnnc softwareAnnc } with { variant "untagged"; @@ -2787,8 +2786,8 @@ with { type union Sg_resource_group { - Resource sg_resource, - CSEBase cSEBase + Resource sg_resource, + CSEBase cSEBase } with { variant "untagged"; @@ -2800,24 +2799,24 @@ with { type union Sg_regularResource_group { - RegularResource sg_regularResource, - Delivery delivery, - DynamicAuthorizationConsultation dynamicAuthorizationConsultation, - EventConfig eventConfig, - ExecInstance execInstance, - M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile, - MgmtCmd mgmtCmd, - NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef, - NotificationTargetPolicy notificationTargetPolicy, - PolicyDeletionRules policyDeletionRules, - Request request, - Role role, - ServiceSubscribedAppRule serviceSubscribedAppRule, - ServiceSubscribedNode serviceSubscribedNode, - StatsCollect statsCollect, - StatsConfig statsConfig, - Subscription subscription, - Token token + RegularResource sg_regularResource, + Delivery delivery, + DynamicAuthorizationConsultation dynamicAuthorizationConsultation, + EventConfig eventConfig, + ExecInstance execInstance, + M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile, + MgmtCmd mgmtCmd, + NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef, + NotificationTargetPolicy notificationTargetPolicy, + PolicyDeletionRules policyDeletionRules, + Request request, + Role role, + ServiceSubscribedAppRule serviceSubscribedAppRule, + ServiceSubscribedNode serviceSubscribedNode, + StatsCollect statsCollect, + StatsConfig statsConfig, + Subscription subscription, + Token token } with { variant "untagged"; @@ -2828,8 +2827,8 @@ with { type union Sg_subordinateResource_group { - SubordinateResource sg_subordinateResource, - PollingChannel pollingChannel + SubordinateResource sg_subordinateResource, + PollingChannel pollingChannel } with { variant "untagged"; @@ -2840,38 +2839,38 @@ with { type record Container { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances, - XSD.NonNegativeInteger currentByteSize, - XSD.AnyURI locationID optional, - XSD.AnyURI ontologyRef optional, - XSD.Boolean disableRetrieval optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ContentInstance contentInstance, - Container container, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances, + XSD.NonNegativeInteger currentByteSize, + XSD.AnyURI locationID optional, + XSD.AnyURI ontologyRef optional, + XSD.Boolean disableRetrieval optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ContentInstance contentInstance, + Container container, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -2890,40 +2889,40 @@ with { type record ContainerAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances optional, - XSD.NonNegativeInteger currentByteSize optional, - XSD.AnyURI locationID optional, - XSD.AnyURI ontologyRef optional, - XSD.Boolean disableRetrieval optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ContentInstance contentInstance, - ContentInstanceAnnc contentInstanceAnnc, - Container container, - ContainerAnnc containerAnnc, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances optional, + XSD.NonNegativeInteger currentByteSize optional, + XSD.AnyURI locationID optional, + XSD.AnyURI ontologyRef optional, + XSD.Boolean disableRetrieval optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ContentInstance contentInstance, + ContentInstanceAnnc contentInstanceAnnc, + Container container, + ContainerAnnc containerAnnc, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -2941,27 +2940,27 @@ with { type record ContentInstance { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - ContentInfo contentInfo optional, - XSD.NonNegativeInteger contentSize, - ContentRef contentRef optional, - XSD.AnyURI ontologyRef optional, - XSD.AnySimpleType content,//FIXME Use AnySimpleType instead - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + ContentInfo contentInfo optional, + XSD.NonNegativeInteger contentSize, + ContentRef contentRef optional, + XSD.AnyURI ontologyRef optional, + XSD.AnySimpleType content,//FIXME Use AnySimpleType instead + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list + } choice optional } with { variant "name as uncapitalized"; @@ -2978,24 +2977,24 @@ with { type record ContentInstanceAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - XSD.AnyURI link, - XSD.NonNegativeInteger stateTag, - ContentInfo contentInfo optional, - XSD.NonNegativeInteger contentSize optional, - XSD.AnyURI ontologyRef optional, - XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + XSD.AnyURI link, + XSD.NonNegativeInteger stateTag, + ContentInfo contentInfo optional, + XSD.NonNegativeInteger contentSize optional, + XSD.AnyURI ontologyRef optional, + XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list + } choice optional } with { variant "name as uncapitalized"; @@ -3011,47 +3010,47 @@ with { type record CSEBase { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - CseTypeID cseType optional, - XSD.ID cSE_ID, - ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type - PoaList pointOfAccess, - XSD.AnyURI nodeLink optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - RemoteCSE remoteCSE, - RemoteCSEAnnc remoteCSEAnnc, - Node node, - AE aE, - Container container, - Group group_, - AccessControlPolicy accessControlPolicy, - Subscription subscription, - MgmtCmd mgmtCmd, - LocationPolicy locationPolicy, - StatsConfig statsConfig, - StatsCollect statsCollect, - Request request, - Delivery delivery, - Schedule schedule, - M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile, - ServiceSubscribedAppRule serviceSubscribedAppRule, - Role role, - Token token, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + CseTypeID cseType optional, + XSD.ID cSE_ID, + ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type + PoaList pointOfAccess, + XSD.AnyURI nodeLink optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + RemoteCSE remoteCSE, + RemoteCSEAnnc remoteCSEAnnc, + Node node, + AE aE, + Container container, + Group group_, + AccessControlPolicy accessControlPolicy, + Subscription subscription, + MgmtCmd mgmtCmd, + LocationPolicy locationPolicy, + StatsConfig statsConfig, + StatsCollect statsCollect, + Request request, + Delivery delivery, + Schedule schedule, + M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile, + ServiceSubscribedAppRule serviceSubscribedAppRule, + Role role, + Token token, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional } with { variant "element"; @@ -3070,29 +3069,29 @@ with { type record Delivery { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag, - XSD.ID source, - XSD.ID target, - Timestamp lifespan, - EventCat eventCat, - DeliveryMetaData deliveryMetaData, - AggregatedRequest aggregatedRequest, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag, + XSD.ID source, + XSD.ID target, + Timestamp lifespan, + EventCat eventCat, + DeliveryMetaData deliveryMetaData, + AggregatedRequest aggregatedRequest, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -3108,32 +3107,32 @@ with { type record DeviceCapability { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String capabilityName, - XSD.Boolean attached, - ActionStatus capabilityActionStatus, - XSD.Boolean currentState, - XSD.Boolean enable optional, - XSD.Boolean disable optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String capabilityName, + XSD.Boolean attached, + ActionStatus capabilityActionStatus, + XSD.Boolean currentState, + XSD.Boolean enable optional, + XSD.Boolean disable optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -3158,31 +3157,31 @@ with { type record DeviceCapabilityAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String capabilityName optional, - XSD.Boolean attached optional, - ActionStatus capabilityActionStatus optional, - XSD.Boolean currentState optional, - XSD.Boolean enable optional, - XSD.Boolean disable optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String capabilityName optional, + XSD.Boolean attached optional, + ActionStatus capabilityActionStatus optional, + XSD.Boolean currentState optional, + XSD.Boolean enable optional, + XSD.Boolean disable optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -3206,33 +3205,33 @@ with { type record DeviceInfo { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String deviceLabel, - XSD.String manufacturer, - XSD.String model, - XSD.String deviceType, - XSD.String fwVersion, - XSD.String swVersion, - XSD.String hwVersion, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String deviceLabel, + XSD.String manufacturer, + XSD.String model, + XSD.String deviceType, + XSD.String fwVersion, + XSD.String swVersion, + XSD.String hwVersion, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -3249,32 +3248,32 @@ with { type record DeviceInfoAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String deviceLabel optional, - XSD.String manufacturer optional, - XSD.String model optional, - XSD.String deviceType optional, - XSD.String fwVersion optional, - XSD.String swVersion optional, - XSD.String hwVersion optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String deviceLabel optional, + XSD.String manufacturer optional, + XSD.String model optional, + XSD.String deviceType optional, + XSD.String fwVersion optional, + XSD.String swVersion optional, + XSD.String hwVersion optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -3290,19 +3289,19 @@ with { type record DynamicAuthorizationConsultation { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.Boolean dynamicAuthorizationEnabled, - ListOfURIs dynamicAuthorizationPoA, - Timestamp dynamicAuthorizationLifetime optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.Boolean dynamicAuthorizationEnabled, + ListOfURIs dynamicAuthorizationPoA, + Timestamp dynamicAuthorizationLifetime optional } with { variant "name as uncapitalized"; @@ -3315,56 +3314,56 @@ with { type enumerated ResourceType { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7), - int8(8), - int9(9), - int10(10), - int11(11), - int12(12), - int13(13), - int14(14), - int15(15), - int16(16), - int17(17), - int18(18), - int19(19), - int20(20), - int21(21), - int22(22), - int23(23), - int24(24), - int25(25), - int26(26), - int27(27), - int28(28), - int29(29), - int30(30), - int31(31), - int32(32), - int33(33), - int34(34), - int10001(10001), - int10002(10002), - int10003(10003), - int10004(10004), - int10009(10009), - int10010(10010), - int10013(10013), - int10014(10014), - int10016(10016), - int10018(10018), - int10024(10024), - int10028(10028), - int10029(10029), - int10030(10030), - int10033(10033), - int10034(10034) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7), + int8(8), + int9(9), + int10(10), + int11(11), + int12(12), + int13(13), + int14(14), + int15(15), + int16(16), + int17(17), + int18(18), + int19(19), + int20(20), + int21(21), + int22(22), + int23(23), + int24(24), + int25(25), + int26(26), + int27(27), + int28(28), + int29(29), + int30(30), + int31(31), + int32(32), + int33(33), + int34(34), + int10001(10001), + int10002(10002), + int10003(10003), + int10004(10004), + int10009(10009), + int10010(10010), + int10013(10013), + int10014(10014), + int10016(10016), + int10018(10018), + int10024(10024), + int10028(10028), + int10029(10029), + int10030(10030), + int10033(10033), + int10034(10034) } with { variant "useNumber"; @@ -3374,9 +3373,9 @@ with { type enumerated CseTypeID { - int1(1), - int2(2), - int3(3) + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3386,9 +3385,9 @@ with { type enumerated LocationSource { - int1(1), - int2(2), - int3(3) + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3398,9 +3397,9 @@ with { type enumerated StdEventCats { - int2(2), - int3(3), - int4(4) + int2(2), + int3(3), + int4(4) } with { variant "useNumber"; @@ -3410,11 +3409,11 @@ with { type enumerated Operation { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -3424,10 +3423,10 @@ with { type enumerated ResponseType { - int1(1), - int2(2), - int3(3), - int4(4) + int1(1), + int2(2), + int3(3), + int4(4) } with { variant "useNumber"; @@ -3437,16 +3436,16 @@ with { type enumerated ResultContent { - int0(0), - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7), - int8(8), - int9(9) + int0(0), + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7), + int8(8), + int9(9) } with { variant "useNumber"; @@ -3456,8 +3455,8 @@ with { type enumerated DiscResType { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -3467,63 +3466,63 @@ with { type enumerated ResponseStatusCode { - int1000(1000), - int1001(1001), - int1002(1002), - int2000(2000), - int2001(2001), - int2002(2002), - int2004(2004), - int4000(4000), - int4001(4001), - int4004(4004), - int4005(4005), - int4008(4008), - int4015(4015), - int4101(4101), - int4102(4102), - int4103(4103), - int4104(4104), - int4105(4105), - int4106(4106), - int4107(4107), - int4108(4108), - int4109(4109), - int4110(4110), - int4111(4111), - int4112(4112), - int4113(4113), - int4114(4114), - int4115(4115), - int4116(4116), - int4117(4117), - int5000(5000), - int5001(5001), - int5103(5103), - int5105(5105), - int5106(5106), - int5203(5203), - int5204(5204), - int5205(5205), - int5206(5206), - int5207(5207), - int5208(5208), - int5209(5209), - int5210(5210), - int5211(5211), - int5212(5212), - int6003(6003), - int6005(6005), - int6010(6010), - int6020(6020), - int6021(6021), - int6022(6022), - int6023(6023), - int6024(6024), - int6025(6025), - int6026(6026), - int6028(6028), - int6029(6029) + int1000(1000), + int1001(1001), + int1002(1002), + int2000(2000), + int2001(2001), + int2002(2002), + int2004(2004), + int4000(4000), + int4001(4001), + int4004(4004), + int4005(4005), + int4008(4008), + int4015(4015), + int4101(4101), + int4102(4102), + int4103(4103), + int4104(4104), + int4105(4105), + int4106(4106), + int4107(4107), + int4108(4108), + int4109(4109), + int4110(4110), + int4111(4111), + int4112(4112), + int4113(4113), + int4114(4114), + int4115(4115), + int4116(4116), + int4117(4117), + int5000(5000), + int5001(5001), + int5103(5103), + int5105(5105), + int5106(5106), + int5203(5203), + int5204(5204), + int5205(5205), + int5206(5206), + int5207(5207), + int5208(5208), + int5209(5209), + int5210(5210), + int5211(5211), + int5212(5212), + int6003(6003), + int6005(6005), + int6010(6010), + int6020(6020), + int6021(6021), + int6022(6022), + int6023(6023), + int6024(6024), + int6025(6025), + int6026(6026), + int6028(6028), + int6029(6029) } with { variant "useNumber"; @@ -3533,11 +3532,11 @@ with { type enumerated RequestStatus { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -3547,59 +3546,59 @@ with { type enumerated MemberType { - int0(0), - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7), - int8(8), - int9(9), - int10(10), - int11(11), - int12(12), - int13(13), - int14(14), - int15(15), - int16(16), - int17(17), - int18(18), - int19(19), - int20(20), - int21(21), - int22(22), - int23(23), - int24(24), - int25(25), - int26(26), - int27(27), - int28(28), - int29(29), - int30(30), - int31(31), - int32(32), - int33(33), - int34(34), - int10001(10001), - int10002(10002), - int10003(10003), - int10004(10004), - int10009(10009), - int10010(10010), - int10013(10013), - int10014(10014), - int10016(10016), - int10018(10018), - int10024(10024), - int10028(10028), - int10029(10029), - int10030(10030), - int10033(10033), - int10034(10034), - int20001(20001), - int20002(20002) + int0(0), + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7), + int8(8), + int9(9), + int10(10), + int11(11), + int12(12), + int13(13), + int14(14), + int15(15), + int16(16), + int17(17), + int18(18), + int19(19), + int20(20), + int21(21), + int22(22), + int23(23), + int24(24), + int25(25), + int26(26), + int27(27), + int28(28), + int29(29), + int30(30), + int31(31), + int32(32), + int33(33), + int34(34), + int10001(10001), + int10002(10002), + int10003(10003), + int10004(10004), + int10009(10009), + int10010(10010), + int10013(10013), + int10014(10014), + int10016(10016), + int10018(10018), + int10024(10024), + int10028(10028), + int10029(10029), + int10030(10030), + int10033(10033), + int10034(10034), + int20001(20001), + int20002(20002) } with { variant "useNumber"; @@ -3609,9 +3608,9 @@ with { type enumerated ConsistencyStrategy { - int1(1), - int2(2), - int3(3) + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3621,13 +3620,13 @@ with { type enumerated CmdType { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7) } with { variant "useNumber"; @@ -3637,10 +3636,10 @@ with { type enumerated ExecModeType { - int1(1), - int2(2), - int3(3), - int4(4) + int1(1), + int2(2), + int3(3), + int4(4) } with { variant "useNumber"; @@ -3650,12 +3649,12 @@ with { type enumerated ExecStatusType { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6) } with { variant "useNumber"; @@ -3665,36 +3664,36 @@ with { type enumerated ExecResultType { - int0(0), - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7), - int8(8), - int9(9), - int10(10), - int11(11), - int12(12), - int13(13), - int14(14), - int15(15), - int16(16), - int19(19), - int20(20), - int21(21), - int22(22), - int23(23), - int24(24), - int25(25), - int26(26), - int27(27), - int28(28), - int29(29), - int30(30), - int31(31) + int0(0), + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7), + int8(8), + int9(9), + int10(10), + int11(11), + int12(12), + int13(13), + int14(14), + int15(15), + int16(16), + int19(19), + int20(20), + int21(21), + int22(22), + int23(23), + int24(24), + int25(25), + int26(26), + int27(27), + int28(28), + int29(29), + int30(30), + int31(31) } with { variant "useNumber"; @@ -3704,8 +3703,8 @@ with { type enumerated PendingNotification { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -3715,9 +3714,9 @@ with { type enumerated NotificationContentType { - int1(1), - int2(2), - int3(3) + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3727,11 +3726,11 @@ with { type enumerated NotificationEventType { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -3741,10 +3740,10 @@ with { type enumerated Status { - int0(0), - int1(1), - int2(2), - int3(3) + int0(0), + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3754,13 +3753,13 @@ with { type enumerated BatteryStatus { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7) } with { variant "useNumber"; @@ -3770,33 +3769,33 @@ with { type enumerated MgmtDefinition { - int0(0), - int1001(1001), - int1002(1002), - int1003(1003), - int1004(1004), - int1005(1005), - int1006(1006), - int1007(1007), - int1008(1008), - int1009(1009), - int1010(1010), - int1011(1011), - int1012(1012), - int1013(1013), - int1014(1014), - int1015(1015), - int1016(1016), - int1017(1017), - int1018(1018), - int1019(1019), - int1020(1020), - int1021(1021), - int1022(1022), - int1023(1023), - int1024(1024), - int1025(1025), - int1026(1026) + int0(0), + int1001(1001), + int1002(1002), + int1003(1003), + int1004(1004), + int1005(1005), + int1006(1006), + int1007(1007), + int1008(1008), + int1009(1009), + int1010(1010), + int1011(1011), + int1012(1012), + int1013(1013), + int1014(1014), + int1015(1015), + int1016(1016), + int1017(1017), + int1018(1018), + int1019(1019), + int1020(1020), + int1021(1021), + int1022(1022), + int1023(1023), + int1024(1024), + int1025(1025), + int1026(1026) } with { variant "useNumber"; @@ -3806,11 +3805,11 @@ with { type enumerated LogTypeId { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -3820,11 +3819,11 @@ with { type enumerated LogStatus { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -3834,9 +3833,9 @@ with { type enumerated EventType { - int1(1), - int2(2), - int3(3) + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3846,8 +3845,8 @@ with { type enumerated StatsRuleStatusType { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -3857,7 +3856,7 @@ with { type enumerated StatModelType { - int1(1) + int1(1) } with { variant "useNumber"; @@ -3867,9 +3866,9 @@ with { type enumerated EncodingType { - int0(0), - int1(1), - int2(2) + int0(0), + int1(1), + int2(2) } with { variant "useNumber"; @@ -3881,69 +3880,69 @@ with { type enumerated AccessControlOperations { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6), - int7(7), - int8(8), - int9(9), - int10(10), - int11(11), - int12(12), - int13(13), - int14(14), - int15(15), - int16(16), - int17(17), - int18(18), - int19(19), - int20(20), - int21(21), - int22(22), - int23(23), - int24(24), - int25(25), - int26(26), - int27(27), - int28(28), - int29(29), - int30(30), - int31(31), - int32(32), - int33(33), - int34(34), - int35(35), - int36(36), - int37(37), - int38(38), - int39(39), - int40(40), - int41(41), - int42(42), - int43(43), - int44(44), - int45(45), - int46(46), - int47(47), - int48(48), - int49(49), - int50(50), - int51(51), - int52(52), - int53(53), - int54(54), - int55(55), - int56(56), - int57(57), - int58(58), - int59(59), - int60(60), - int61(61), - int62(62), - int63(63) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7), + int8(8), + int9(9), + int10(10), + int11(11), + int12(12), + int13(13), + int14(14), + int15(15), + int16(16), + int17(17), + int18(18), + int19(19), + int20(20), + int21(21), + int22(22), + int23(23), + int24(24), + int25(25), + int26(26), + int27(27), + int28(28), + int29(29), + int30(30), + int31(31), + int32(32), + int33(33), + int34(34), + int35(35), + int36(36), + int37(37), + int38(38), + int39(39), + int40(40), + int41(41), + int42(42), + int43(43), + int44(44), + int45(45), + int46(46), + int47(47), + int48(48), + int49(49), + int50(50), + int51(51), + int52(52), + int53(53), + int54(54), + int55(55), + int56(56), + int57(57), + int58(58), + int59(59), + int60(60), + int61(61), + int62(62), + int63(63) } with { variant "useNumber"; @@ -3953,9 +3952,9 @@ with { type enumerated FilterUsage { - int1(1), - int2(2), - int3(3) + int1(1), + int2(2), + int3(3) } with { variant "useNumber"; @@ -3965,10 +3964,10 @@ with { type enumerated NotificationTargetPolicyAction { - int1(1), - int2(2), - int3(3), - int4(4) + int1(1), + int2(2), + int3(3), + int4(4) } with { variant "useNumber"; @@ -3978,8 +3977,8 @@ with { type enumerated LogicalOperator { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -3991,8 +3990,8 @@ with { type enumerated AllJoynDirection { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -4002,7 +4001,7 @@ with { type enumerated ContentFilterSyntax { - int1(1) + int1(1) } with { variant "useNumber"; @@ -4012,12 +4011,12 @@ with { type enumerated ContentSecurity { - int0(0), - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int0(0), + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -4027,27 +4026,27 @@ with { type enumerated Suid { - int10(10), - int11(11), - int12(12), - int13(13), - int14(14), - int15(15), - int21(21), - int22(22), - int23(23), - int24(24), - int25(25), - int32(32), - int33(33), - int34(34), - int35(35), - int40(40), - int41(41), - int42(42), - int43(43), - int44(44), - int45(45) + int10(10), + int11(11), + int12(12), + int13(13), + int14(14), + int15(15), + int21(21), + int22(22), + int23(23), + int24(24), + int25(25), + int32(32), + int33(33), + int34(34), + int35(35), + int40(40), + int41(41), + int42(42), + int43(43), + int44(44), + int45(45) } with { variant "useNumber"; @@ -4057,7 +4056,7 @@ with { type enumerated EsprimKeyGenAlgID { - int1(1) + int1(1) } with { variant "useNumber"; @@ -4067,9 +4066,9 @@ with { type enumerated EsprimProtocolAndAlgID { - int10(10), - int11(11), - int12(12) + int10(10), + int11(11), + int12(12) } with { variant "useNumber"; @@ -4079,8 +4078,8 @@ with { type enumerated PeriodicIndicator { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -4090,8 +4089,8 @@ with { type enumerated StationaryIndication { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -4101,8 +4100,8 @@ with { type enumerated ContentStatus { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -4112,11 +4111,11 @@ with { type enumerated NetworkAction { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5) } with { variant "useNumber"; @@ -4126,8 +4125,8 @@ with { type enumerated LocationInformationType { - int1(1), - int2(2) + int1(1), + int2(2) } with { variant "useNumber"; @@ -4137,10 +4136,10 @@ with { type enumerated GeofenceEventCriteria { - int1(1), - int2(2), - int3(3), - int4(4) + int1(1), + int2(2), + int3(3), + int4(4) } with { variant "useNumber"; @@ -4150,27 +4149,27 @@ with { type record EventConfig { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - XSD.String eventID, - EventType eventType, - Timestamp eventStart optional, - Timestamp eventEnd optional, - record of Operation operationType optional, - XSD.NonNegativeInteger dataSize optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + XSD.String eventID, + EventType eventType, + Timestamp eventStart optional, + Timestamp eventEnd optional, + record of Operation operationType optional, + XSD.NonNegativeInteger dataSize optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4187,31 +4186,31 @@ with { type record EventLog { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - LogTypeId logTypeId, - XSD.String logData, - LogStatus logStatus, - XSD.Boolean logStart, - XSD.Boolean logStop, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + LogTypeId logTypeId, + XSD.String logData, + LogStatus logStatus, + XSD.Boolean logStart, + XSD.Boolean logStop, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4232,30 +4231,30 @@ with { type record EventLogAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - LogTypeId logTypeId optional, - XSD.String logData optional, - LogStatus logStatus optional, - XSD.Boolean logStart optional, - XSD.Boolean logStop optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + LogTypeId logTypeId optional, + XSD.String logData optional, + LogStatus logStatus optional, + XSD.Boolean logStart optional, + XSD.Boolean logStop optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4275,29 +4274,29 @@ with { type record ExecInstance { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ExecStatusType execStatus, - ExecResultType execResult, - XSD.Boolean execDisable optional, - NodeID execTarget, - ExecModeType execMode optional, - XSD.Duration execFrequency optional, - XSD.Duration execDelay optional, - XSD.NonNegativeInteger execNumber optional, - ExecReqArgsListType execReqArgs optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ExecStatusType execStatus, + ExecResultType execResult, + XSD.Boolean execDisable optional, + NodeID execTarget, + ExecModeType execMode optional, + XSD.Duration execFrequency optional, + XSD.Duration execDelay optional, + XSD.NonNegativeInteger execNumber optional, + ExecReqArgsListType execReqArgs optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4315,31 +4314,31 @@ with { type record Firmware { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String version, - XSD.String firmwareName, - XSD.AnyURI uRL, - XSD.Boolean update, - ActionStatus updateStatus, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String version, + XSD.String firmwareName, + XSD.AnyURI uRL, + XSD.Boolean update, + ActionStatus updateStatus, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4359,30 +4358,30 @@ with { type record FirmwareAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String version optional, - XSD.String firmwareName optional, - XSD.AnyURI uRL optional, - XSD.Boolean update optional, - ActionStatus updateStatus optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String version optional, + XSD.String firmwareName optional, + XSD.AnyURI uRL optional, + XSD.Boolean update optional, + ActionStatus updateStatus optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4401,36 +4400,36 @@ with { type record GenericInterworkingOperationInstance { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String operationName, - XSD.String operationState, - ListOfDataLinks inputDataPointLinks optional, - ListOfDataLinks outputDataPointLinks optional, - ListOfDataLinks inputLinks optional, - ListOfDataLinks outputLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String operationName, + XSD.String operationState, + ListOfDataLinks inputDataPointLinks optional, + ListOfDataLinks outputDataPointLinks optional, + ListOfDataLinks inputLinks optional, + ListOfDataLinks outputLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4446,35 +4445,35 @@ with { type record GenericInterworkingOperationInstanceAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String operationName optional, - XSD.String operationState optional, - ListOfDataLinks inputDataPointLinks optional, - ListOfDataLinks outputDataPointLinks optional, - ListOfDataLinks inputLinks optional, - ListOfDataLinks outputLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String operationName optional, + XSD.String operationState optional, + ListOfDataLinks inputDataPointLinks optional, + ListOfDataLinks outputDataPointLinks optional, + ListOfDataLinks inputLinks optional, + ListOfDataLinks outputLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4490,35 +4489,35 @@ with { type record GenericInterworkingService { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String serviceName, - ListOfDataLinks inputDataPointLinks optional, - ListOfDataLinks outputDataPointLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - GenericInterworkingService genericInterworkingService, - GenericInterworkingOperationInstance genericInterworkingOperationInstance, - SemanticDescriptor semanticDescriptor, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String serviceName, + ListOfDataLinks inputDataPointLinks optional, + ListOfDataLinks outputDataPointLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + GenericInterworkingService genericInterworkingService, + GenericInterworkingOperationInstance genericInterworkingOperationInstance, + SemanticDescriptor semanticDescriptor, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4534,34 +4533,34 @@ with { type record GenericInterworkingServiceAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - XSD.String serviceName, - ListOfDataLinks inputDataPointLinks optional, - ListOfDataLinks outputDataPointLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - GenericInterworkingServiceAnnc genericInterworkingServiceAnnc, - GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + XSD.String serviceName, + ListOfDataLinks inputDataPointLinks optional, + ListOfDataLinks outputDataPointLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + GenericInterworkingServiceAnnc genericInterworkingServiceAnnc, + GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4577,36 +4576,36 @@ with { type record Group { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.ID creator optional, - MemberType memberType, - XSD.NonNegativeInteger currentNrOfMembers, - XSD.PositiveInteger maxNrOfMembers, - record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty - ListOfURIs membersAccessControlPolicyIDs optional, - XSD.Boolean memberTypeValidated optional, - ConsistencyStrategy consistencyStrategy optional, - XSD.String groupName optional, - XSD.Boolean semanticSupportIndicator optional, - BatchNotify notifyAggregation optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription, - SemanticDescriptor semanticDescriptor - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.ID creator optional, + MemberType memberType, + XSD.NonNegativeInteger currentNrOfMembers, + XSD.PositiveInteger maxNrOfMembers, + record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty + ListOfURIs membersAccessControlPolicyIDs optional, + XSD.Boolean memberTypeValidated optional, + ConsistencyStrategy consistencyStrategy optional, + XSD.String groupName optional, + XSD.Boolean semanticSupportIndicator optional, + BatchNotify notifyAggregation optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription, + SemanticDescriptor semanticDescriptor + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4628,35 +4627,35 @@ with { type record GroupAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MemberType memberType optional, - XSD.NonNegativeInteger currentNrOfMembers optional, - XSD.PositiveInteger maxNrOfMembers optional, - record of XSD.AnyURI memberIDs optional, - ListOfURIs membersAccessControlPolicyIDs optional, - XSD.Boolean memberTypeValidated optional, - ConsistencyStrategy consistencyStrategy optional, - XSD.String groupName optional, - XSD.Boolean semanticSupportIndicator optional, - BatchNotify notifyAggregation optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MemberType memberType optional, + XSD.NonNegativeInteger currentNrOfMembers optional, + XSD.PositiveInteger maxNrOfMembers optional, + record of XSD.AnyURI memberIDs optional, + ListOfURIs membersAccessControlPolicyIDs optional, + XSD.Boolean memberTypeValidated optional, + ConsistencyStrategy consistencyStrategy optional, + XSD.String groupName optional, + XSD.Boolean semanticSupportIndicator optional, + BatchNotify notifyAggregation optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4677,34 +4676,34 @@ with { type record LocationPolicy { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - LocationSource locationSource, - LocationInformationType locationInformationType, - ListOfDuration locationUpdatePeriod optional, - LocationTargetID locationTargetID optional, - XSD.AnyURI locationServer optional, - XSD.AnyURI locationContainerID, - XSD.String locationContainerName optional, - XSD.String locationStatus, - XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead - GeofenceEventCriteria geofenceEventCriteria optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + LocationSource locationSource, + LocationInformationType locationInformationType, + ListOfDuration locationUpdatePeriod optional, + LocationTargetID locationTargetID optional, + XSD.AnyURI locationServer optional, + XSD.AnyURI locationContainerID, + XSD.String locationContainerName optional, + XSD.String locationStatus, + XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead + GeofenceEventCriteria geofenceEventCriteria optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4721,27 +4720,27 @@ with { type record LocationPolicyAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - LocationSource locationSource optional, - LocationInformationType locationInformationType optional, - ListOfDuration locationUpdatePeriod optional, - LocationTargetID locationTargetID optional, - XSD.AnyURI locationServer optional, - XSD.AnyURI locationContainerID optional, - XSD.String locationContainerName optional, - XSD.String locationStatus optional, - XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead - GeofenceEventCriteria geofenceEventCriteria optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + LocationSource locationSource optional, + LocationInformationType locationInformationType optional, + ListOfDuration locationUpdatePeriod optional, + LocationTargetID locationTargetID optional, + XSD.AnyURI locationServer optional, + XSD.AnyURI locationContainerID optional, + XSD.String locationContainerName optional, + XSD.String locationStatus optional, + XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead + GeofenceEventCriteria geofenceEventCriteria optional } with { variant "name as uncapitalized"; @@ -4752,23 +4751,23 @@ with { type record M2mServiceSubscriptionProfile { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ServiceSubscribedNode serviceSubscribedNode, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ServiceSubscribedNode serviceSubscribedNode, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4784,28 +4783,28 @@ with { type record Memory { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.UnsignedLong memAvailable, - XSD.UnsignedLong memTotal, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.UnsignedLong memAvailable, + XSD.UnsignedLong memTotal, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4822,27 +4821,27 @@ with { type record MemoryAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.UnsignedLong memAvailable optional, - XSD.UnsignedLong memTotal optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.UnsignedLong memAvailable optional, + XSD.UnsignedLong memTotal optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -4858,32 +4857,32 @@ with { type record MgmtCmd { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.String description optional, - CmdType cmdType, - ExecReqArgsListType execReqArgs optional, - XSD.Boolean execEnable, - NodeID execTarget, - ExecModeType execMode optional, - XSD.Duration execFrequency optional, - XSD.Duration execDelay optional, - XSD.NonNegativeInteger execNumber optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ExecInstance execInstance, - Subscription subscription - } choice_list - } choice + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.String description optional, + CmdType cmdType, + ExecReqArgsListType execReqArgs optional, + XSD.Boolean execEnable, + NodeID execTarget, + ExecModeType execMode optional, + XSD.Duration execFrequency optional, + XSD.Duration execDelay optional, + XSD.NonNegativeInteger execNumber optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ExecInstance execInstance, + Subscription subscription + } choice_list + } choice } with { variant "name as uncapitalized"; @@ -4901,41 +4900,41 @@ with { type record Node { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - NodeID nodeID, - XSD.ID hostedCSELink optional, - XSD.String mgmtClientAddress optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Memory memory, - Battery battery, - AreaNwkInfo areaNwkInfo, - AreaNwkDeviceInfo areaNwkDeviceInfo, - Firmware firmware, - Software software, - DeviceInfo deviceInfo, - DeviceCapability deviceCapability, - Reboot reboot, - EventLog eventLog, - CmdhPolicy cmdhPolicy, - ActiveCmdhPolicy activeCmdhPolicy, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - TrafficPattern trafficPattern - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + NodeID nodeID, + XSD.ID hostedCSELink optional, + XSD.String mgmtClientAddress optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Memory memory, + Battery battery, + AreaNwkInfo areaNwkInfo, + AreaNwkDeviceInfo areaNwkDeviceInfo, + Firmware firmware, + Software software, + DeviceInfo deviceInfo, + DeviceCapability deviceCapability, + Reboot reboot, + EventLog eventLog, + CmdhPolicy cmdhPolicy, + ActiveCmdhPolicy activeCmdhPolicy, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + TrafficPattern trafficPattern + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -4952,39 +4951,39 @@ with { type record NodeAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - NodeID nodeID, - XSD.ID hostedCSELink optional, - XSD.String mgmtClientAddress optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - MemoryAnnc memoryAnnc, - BatteryAnnc batteryAnnc, - AreaNwkInfoAnnc areaNwkInfoAnnc, - AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc, - FirmwareAnnc firmwareAnnc, - SoftwareAnnc softwareAnnc, - DeviceInfoAnnc deviceInfoAnnc, - DeviceCapabilityAnnc deviceCapabilityAnnc, - RebootAnnc rebootAnnc, - EventLogAnnc eventLogAnnc, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - TrafficPatternAnnc trafficPatternAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + NodeID nodeID, + XSD.ID hostedCSELink optional, + XSD.String mgmtClientAddress optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + MemoryAnnc memoryAnnc, + BatteryAnnc batteryAnnc, + AreaNwkInfoAnnc areaNwkInfoAnnc, + AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc, + FirmwareAnnc firmwareAnnc, + SoftwareAnnc softwareAnnc, + DeviceInfoAnnc deviceInfoAnnc, + DeviceCapabilityAnnc deviceCapabilityAnnc, + RebootAnnc rebootAnnc, + EventLogAnnc eventLogAnnc, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + TrafficPatternAnnc trafficPatternAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5000,22 +4999,22 @@ with { type record NotificationTargetMgmtPolicyRef { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs notificationTargetURI optional, - XSD.AnyURI notificationlPolicyID optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs notificationTargetURI optional, + XSD.AnyURI notificationlPolicyID optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5031,27 +5030,27 @@ with { type record NotificationTargetPolicy { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - NotificationTargetPolicyAction action_, - XSD.Token policyLabel, - LogicalOperator rulesRelationship optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - PolicyDeletionRules policyDeletionRules, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + NotificationTargetPolicyAction action_, + XSD.Token policyLabel, + LogicalOperator rulesRelationship optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + PolicyDeletionRules policyDeletionRules, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5082,7 +5081,7 @@ with { type record AggregatedNotification_1 { - record of Notification notification_list + record of Notification notification_list } with { variant "name as 'aggregatedNotification'"; @@ -5092,26 +5091,26 @@ with { type record Notification_1 { - record { - Representation representation optional, - record { - Operation operation optional, - XSD.ID originator optional - } operationMonitor optional, - NotificationEventType notificationEventType optional - } notificationEvent optional, - XSD.Boolean verificationRequest optional, - XSD.Boolean subscriptionDeletion optional, - XSD.AnyURI subscriptionReference optional, - XSD.ID creator optional, - XSD.AnyURI notificationForwardingURI optional, - XSD.ID notificationTarget optional, - XSD.Boolean targetRemovalRequest optional, - XSD.Boolean targetRemovalAllowance optional, - record { - XSD.ID originator, - FilterCriteria filterCriteria - } iPEDiscoveryRequest optional + record { + Representation representation optional, + record { + Operation operation optional, + XSD.ID originator optional + } operationMonitor optional, + NotificationEventType notificationEventType optional + } notificationEvent optional, + XSD.Boolean verificationRequest optional, + XSD.Boolean subscriptionDeletion optional, + XSD.AnyURI subscriptionReference optional, + XSD.ID creator optional, + XSD.AnyURI notificationForwardingURI optional, + XSD.ID notificationTarget optional, + XSD.Boolean targetRemovalRequest optional, + XSD.Boolean targetRemovalAllowance optional, + record { + XSD.ID originator, + FilterCriteria filterCriteria + } iPEDiscoveryRequest optional } with { variant "name as 'notification'"; @@ -5136,12 +5135,12 @@ with { type record SecurityInfo_1 { - SecurityInfoType securityInfoType optional, - DynAuthDasRequest dasRequest optional, - DynAuthDasResponse dasResponse optional, - ReceiverESPrimRandObject esprimRandObject optional, - E2eCompactJWE esprimObject optional, - XSD.Base64Binary escertkeMessage optional + SecurityInfoType securityInfoType optional, + DynAuthDasRequest dasRequest optional, + DynAuthDasResponse dasResponse optional, + ReceiverESPrimRandObject esprimRandObject optional, + E2eCompactJWE esprimObject optional, + XSD.Base64Binary escertkeMessage optional } with { variant "name as 'securityInfo'"; @@ -5150,12 +5149,12 @@ with { type enumerated SecurityInfoType { - int1(1), - int2(2), - int3(3), - int4(4), - int5(5), - int6(6) + int1(1), + int2(2), + int3(3), + int4(4), + int5(5), + int6(6) } with { variant "useNumber"; @@ -5165,11 +5164,11 @@ with { type record DynAuthDasResponse { - record { - SetOfAcrs grantedPrivileges optional, - AbsRelTimestamp privilegesLifetime optional - } dynamicACPInfo optional, - record length(1 .. infinity) of DynAuthJWT tokens optional + record { + SetOfAcrs grantedPrivileges optional, + AbsRelTimestamp privilegesLifetime optional + } dynamicACPInfo optional, + record length(1 .. infinity) of DynAuthJWT tokens optional } with { variant "name as uncapitalized"; @@ -5179,20 +5178,20 @@ with { //FIXME To replace Representation type by this type union Representation { - Resource_2 resource, - XSD.AnyURI uRI + Resource_2 resource, + XSD.AnyURI uRI } with { - variant "name as 'representation'"; - variant (uRI) "name as capitalized"; + variant "name as 'representation'"; + variant (uRI) "name as capitalized"; }; //type record Representation //{ -// union { -// XSD.String elem, -// XSD.String elem_1 -// } choice optional +// union { +// XSD.String elem, +// XSD.String elem_1 +// } choice optional //} //with { // variant "name as uncapitalized"; @@ -5205,22 +5204,22 @@ with { type record PolicyDeletionRules { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - DeletionContexts deletionRules optional, - LogicalOperator deletionRulesRelation optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + DeletionContexts deletionRules optional, + LogicalOperator deletionRulesRelation optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5243,28 +5242,28 @@ with { type record Reboot { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.Boolean reboot, - XSD.Boolean factoryReset, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.Boolean reboot, + XSD.Boolean factoryReset, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5285,27 +5284,27 @@ with { type record RebootAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.Boolean reboot optional, - XSD.Boolean factoryReset optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.Boolean reboot optional, + XSD.Boolean factoryReset optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5325,50 +5324,50 @@ with { type record RemoteCSE { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - CseTypeID cseType optional, - PoaList pointOfAccess optional, - XSD.AnyURI cSEBase, - XSD.ID cSE_ID, - ExternalID m2M_Ext_ID optional, - TriggerRecipientID trigger_Recipient_ID optional, - XSD.Boolean requestReachability, - XSD.AnyURI nodeLink optional, - XSD.UnsignedInt triggerReferenceNumber optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - NodeAnnc nodeAnnc, - Container container, - ContainerAnnc containerAnnc, - Group group_, - GroupAnnc groupAnnc, - AccessControlPolicy accessControlPolicy, - AccessControlPolicyAnnc accessControlPolicyAnnc, - Subscription subscription, - PollingChannel pollingChannel, - Schedule schedule, - TimeSeries timeSeries, - TimeSeriesAnnc timeSeriesAnnc, - LocationPolicyAnnc locationPolicyAnnc, - AEAnnc aEAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + CseTypeID cseType optional, + PoaList pointOfAccess optional, + XSD.AnyURI cSEBase, + XSD.ID cSE_ID, + ExternalID m2M_Ext_ID optional, + TriggerRecipientID trigger_Recipient_ID optional, + XSD.Boolean requestReachability, + XSD.AnyURI nodeLink optional, + XSD.UnsignedInt triggerReferenceNumber optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + NodeAnnc nodeAnnc, + Container container, + ContainerAnnc containerAnnc, + Group group_, + GroupAnnc groupAnnc, + AccessControlPolicy accessControlPolicy, + AccessControlPolicyAnnc accessControlPolicyAnnc, + Subscription subscription, + PollingChannel pollingChannel, + Schedule schedule, + TimeSeries timeSeries, + TimeSeriesAnnc timeSeriesAnnc, + LocationPolicyAnnc locationPolicyAnnc, + AEAnnc aEAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5393,46 +5392,46 @@ with { type record RemoteCSEAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - CseTypeID cseType optional, - PoaList pointOfAccess optional, - XSD.AnyURI cSEBase optional, - XSD.ID cSE_ID optional, - XSD.Boolean requestReachability optional, - XSD.AnyURI nodeLink optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - NodeAnnc nodeAnnc, - Container container, - ContainerAnnc containerAnnc, - Group group_, - GroupAnnc groupAnnc, - AccessControlPolicy accessControlPolicy, - AccessControlPolicyAnnc accessControlPolicyAnnc, - Subscription subscription, - PollingChannel pollingChannel, - ScheduleAnnc scheduleAnnc, - LocationPolicyAnnc locationPolicyAnnc, - TimeSeries timeSeries, - TimeSeriesAnnc timeSeriesAnnc, - AEAnnc aEAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + CseTypeID cseType optional, + PoaList pointOfAccess optional, + XSD.AnyURI cSEBase optional, + XSD.ID cSE_ID optional, + XSD.Boolean requestReachability optional, + XSD.AnyURI nodeLink optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + NodeAnnc nodeAnnc, + Container container, + ContainerAnnc containerAnnc, + Group group_, + GroupAnnc groupAnnc, + AccessControlPolicy accessControlPolicy, + AccessControlPolicyAnnc accessControlPolicyAnnc, + Subscription subscription, + PollingChannel pollingChannel, + ScheduleAnnc scheduleAnnc, + LocationPolicyAnnc locationPolicyAnnc, + TimeSeries timeSeries, + TimeSeriesAnnc timeSeriesAnnc, + AEAnnc aEAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5454,31 +5453,31 @@ with { type record RequestPrimitive { - Operation operation, - XSD.AnyURI to_, - XSD.ID from_ optional, - RequestID requestIdentifier, - ResourceType resourceType optional, - PrimitiveContent primitiveContent optional, - record length(1 .. infinity) of RoleID roleIDs optional, - Timestamp originatingTimestamp optional, - AbsRelTimestamp requestExpirationTimestamp optional, - AbsRelTimestamp resultExpirationTimestamp optional, - AbsRelTimestamp operationExecutionTime optional, - ResponseTypeInfo responseType optional, - AbsRelTimestamp resultPersistence optional, - ResultContent resultContent optional, - EventCat eventCategory optional, - XSD.Boolean deliveryAggregation optional, - XSD.String groupRequestIdentifier optional, - FilterCriteria filterCriteria optional, - DiscResType discoveryResultType optional, - record length(1 .. infinity) of DynAuthJWT tokens optional, - record length(1 .. infinity) of TokenID tokenIDs optional, - record length(1 .. infinity) of XSD.NCName localTokenIDs optional, - XSD.Boolean tokenRequestIndicator optional, - ReleaseVersion releaseVersionIndicator, - XSD.String vendorInformation optional + Operation operation, + XSD.AnyURI to_, + XSD.ID from_ optional, + RequestID requestIdentifier, + ResourceType resourceType optional, + PrimitiveContent primitiveContent optional, + record length(1 .. infinity) of RoleID roleIDs optional, + Timestamp originatingTimestamp optional, + AbsRelTimestamp requestExpirationTimestamp optional, + AbsRelTimestamp resultExpirationTimestamp optional, + AbsRelTimestamp operationExecutionTime optional, + ResponseTypeInfo responseType optional, + AbsRelTimestamp resultPersistence optional, + ResultContent resultContent optional, + EventCat eventCategory optional, + XSD.Boolean deliveryAggregation optional, + XSD.String groupRequestIdentifier optional, + FilterCriteria filterCriteria optional, + DiscResType discoveryResultType optional, + record length(1 .. infinity) of DynAuthJWT tokens optional, + record length(1 .. infinity) of TokenID tokenIDs optional, + record length(1 .. infinity) of XSD.NCName localTokenIDs optional, + XSD.Boolean tokenRequestIndicator optional, + ReleaseVersion releaseVersionIndicator, + XSD.String vendorInformation optional } with { variant "name as uncapitalized"; @@ -5505,31 +5504,31 @@ with { type record Request { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag, - Operation operation, - XSD.AnyURI target, - XSD.ID originator, - RequestID requestID, - MetaInformation metaInformation, - PrimitiveContent primitiveContent optional, - RequestStatus requestStatus, - OperationResult operationResult, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag, + Operation operation, + XSD.AnyURI target, + XSD.ID originator, + RequestID requestID, + MetaInformation metaInformation, + PrimitiveContent primitiveContent optional, + RequestStatus requestStatus, + OperationResult operationResult, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5545,20 +5544,20 @@ with { type record ResponsePrimitive { - ResponseStatusCode responseStatusCode, - RequestID requestIdentifier, - PrimitiveContent primitiveContent optional, - XSD.ID to_ optional, - XSD.ID from_ optional, - Timestamp originatingTimestamp optional, - AbsRelTimestamp resultExpirationTimestamp optional, - EventCat eventCategory optional, - ContentStatus contentStatus optional, - XSD.PositiveInteger contentOffset optional, - DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional, - DynAuthTokenReqInfo tokenRequestInformation optional, - ReleaseVersion releaseVersionIndicator, - XSD.String vendorInformation optional + ResponseStatusCode responseStatusCode, + RequestID requestIdentifier, + PrimitiveContent primitiveContent optional, + XSD.ID to_ optional, + XSD.ID from_ optional, + Timestamp originatingTimestamp optional, + AbsRelTimestamp resultExpirationTimestamp optional, + EventCat eventCategory optional, + ContentStatus contentStatus optional, + XSD.PositiveInteger contentOffset optional, + DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional, + DynAuthTokenReqInfo tokenRequestInformation optional, + ReleaseVersion releaseVersionIndicator, + XSD.String vendorInformation optional } with { variant "name as uncapitalized"; @@ -5611,21 +5610,21 @@ with { type record ResourceWrapper { -// union { -// Sg_resource_group sg_resource, -// Sg_regularResource_group sg_regularResource, -// Sg_announcedResource_group sg_announcedResource, -// Sg_announceableResource_group sg_announceableResource, -// Sg_subordinateResource_group sg_subordinateResource, -// Sg_announcedSubordinateResource_group sg_announcedSubordinateResource, -// Sg_announceableSubordinateResource_group sg_announceableSubordinateResource, -// Sg_mgmtResource_group sg_mgmtResource, -// Sg_announcedMgmtResource_group sg_announcedMgmtResource, -// Sg_flexContainerResource_group sg_flexContainerResource, -// Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource -// } - Resource_2 choice,//TODO Use Resource_2 type instead - XSD.AnyURI uRI +// union { +// Sg_resource_group sg_resource, +// Sg_regularResource_group sg_regularResource, +// Sg_announcedResource_group sg_announcedResource, +// Sg_announceableResource_group sg_announceableResource, +// Sg_subordinateResource_group sg_subordinateResource, +// Sg_announcedSubordinateResource_group sg_announcedSubordinateResource, +// Sg_announceableSubordinateResource_group sg_announceableSubordinateResource, +// Sg_mgmtResource_group sg_mgmtResource, +// Sg_announcedMgmtResource_group sg_announcedMgmtResource, +// Sg_flexContainerResource_group sg_flexContainerResource, +// Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource +// } + Resource_2 choice,//TODO Use Resource_2 type instead + XSD.AnyURI uRI } with { variant "name as uncapitalized"; @@ -5636,8 +5635,8 @@ with { type record AggregatedResponse_1 { - XSD.AnyURI resourceID optional, - record of ResponsePrimitive responsePrimitive_list + XSD.AnyURI resourceID optional, + record of ResponsePrimitive responsePrimitive_list } with { variant "name as 'aggregatedResponse'"; @@ -5648,7 +5647,7 @@ with { type record ListOfChildResourceRef { - record length(1 .. infinity) of ChildResourceRef resourceRef_list + record length(1 .. infinity) of ChildResourceRef resourceRef_list } with { variant "name as uncapitalized"; @@ -5659,29 +5658,29 @@ with { type record Role { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - RoleID roleID, - XSD.ID issuer, - XSD.ID holder, - Timestamp notBefore, - Timestamp notAfter, - XSD.String roleName optional, - XSD.AnyURI tokenLink optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + RoleID roleID, + XSD.ID issuer, + XSD.ID holder, + Timestamp notBefore, + Timestamp notAfter, + XSD.String roleName optional, + XSD.AnyURI tokenLink optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5697,23 +5696,23 @@ with { type record Schedule { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - ScheduleEntries scheduleElement, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + ScheduleEntries scheduleElement, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -5730,16 +5729,16 @@ with { type record ScheduleAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - XSD.AnyURI link, - ScheduleEntries scheduleElement optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + XSD.AnyURI link, + ScheduleEntries scheduleElement optional } with { variant "name as uncapitalized"; @@ -5750,28 +5749,28 @@ with { type record SemanticDescriptor { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.ID creator optional, - DescriptorRepresentation descriptorRepresentation optional, - Sparql semanticOpExec optional, - XSD.Base64Binary descriptor, - XSD.AnyURI ontologyRef optional, - ListOfURIs relatedSemantics optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.ID creator optional, + DescriptorRepresentation descriptorRepresentation optional, + Sparql semanticOpExec optional, + XSD.Base64Binary descriptor, + XSD.AnyURI ontologyRef optional, + ListOfURIs relatedSemantics optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5788,26 +5787,26 @@ with { type record SemanticDescriptorAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - DescriptorRepresentation descriptorRepresentation optional, - Sparql semanticOpExec optional, - XSD.Base64Binary descriptor optional, - XSD.AnyURI ontologyRef optional, - ListOfURIs relatedSemantics optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + DescriptorRepresentation descriptorRepresentation optional, + Sparql semanticOpExec optional, + XSD.Base64Binary descriptor optional, + XSD.AnyURI ontologyRef optional, + ListOfURIs relatedSemantics optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5823,24 +5822,24 @@ with { type record ServiceSubscribedAppRule { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfM2MID applicableCredIDs optional, - ListOfM2MID allowedApp_IDs optional, - ListOfM2MID allowedAEs optional, - record length(1 .. infinity) of RoleID allowedRole_IDs optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfM2MID applicableCredIDs optional, + ListOfM2MID allowedApp_IDs optional, + ListOfM2MID allowedAEs optional, + record length(1 .. infinity) of RoleID allowedRole_IDs optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5859,24 +5858,24 @@ with { type record ServiceSubscribedNode { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - NodeID nodeID, - XSD.ID cSE_ID optional, - record of DeviceID deviceIdentifier optional, - ListOfURIs ruleLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + NodeID nodeID, + XSD.ID cSE_ID optional, + record of DeviceID deviceIdentifier optional, + ListOfURIs ruleLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5894,35 +5893,35 @@ with { type record Software { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String version, - XSD.String softwareName, - XSD.AnyURI uRL, - XSD.Boolean install, - XSD.Boolean uninstall, - ActionStatus installStatus, - XSD.Boolean activate_ optional, - XSD.Boolean deactivate_ optional, - ActionStatus activeStatus optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String version, + XSD.String softwareName, + XSD.AnyURI uRL, + XSD.Boolean install, + XSD.Boolean uninstall, + ActionStatus installStatus, + XSD.Boolean activate_ optional, + XSD.Boolean deactivate_ optional, + ActionStatus activeStatus optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -5950,34 +5949,34 @@ with { type record SoftwareAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional, - XSD.String version optional, - XSD.String softwareName optional, - XSD.AnyURI uRL optional, - XSD.Boolean install optional, - XSD.Boolean uninstall optional, - ActionStatus installStatus optional, - XSD.Boolean activate_ optional, - XSD.Boolean deactivate_ optional, - ActionStatus activeStatus optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional, + XSD.String version optional, + XSD.String softwareName optional, + XSD.AnyURI uRL optional, + XSD.Boolean install optional, + XSD.Boolean uninstall optional, + ActionStatus installStatus optional, + XSD.Boolean activate_ optional, + XSD.Boolean deactivate_ optional, + ActionStatus activeStatus optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -6004,28 +6003,28 @@ with { type record StatsCollect { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - XSD.String statsCollectID, - XSD.ID collectingEntityID, - ListOfM2MID collectedEntityID, - StatsRuleStatusType statsRuleStatus, - StatModelType statModel, - ScheduleEntries collectPeriod optional, - XSD.String eventID optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + XSD.String statsCollectID, + XSD.ID collectingEntityID, + ListOfM2MID collectedEntityID, + StatsRuleStatusType statsRuleStatus, + StatModelType statModel, + ScheduleEntries collectPeriod optional, + XSD.String eventID optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional } with { variant "name as uncapitalized"; @@ -6041,24 +6040,24 @@ with { type record StatsConfig { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - EventConfig eventConfig, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + EventConfig eventConfig, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6074,38 +6073,38 @@ with { type record Subscription { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - EventNotificationCriteria eventNotificationCriteria optional, - XSD.PositiveInteger expirationCounter optional, - ListOfURIs notificationURI, - XSD.AnyURI groupID optional, - XSD.AnyURI notificationForwardingURI optional, - BatchNotify batchNotify optional, - RateLimit rateLimit optional, - XSD.PositiveInteger preSubscriptionNotify optional, - PendingNotification pendingNotification optional, - XSD.PositiveInteger notificationStoragePriority optional, - XSD.Boolean latestNotify optional, - NotificationContentType notificationContentType, - EventCat notificationEventCat optional, - XSD.AnyURI subscriberURI optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Schedule schedule, - NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + EventNotificationCriteria eventNotificationCriteria optional, + XSD.PositiveInteger expirationCounter optional, + ListOfURIs notificationURI, + XSD.AnyURI groupID optional, + XSD.AnyURI notificationForwardingURI optional, + BatchNotify batchNotify optional, + RateLimit rateLimit optional, + XSD.PositiveInteger preSubscriptionNotify optional, + PendingNotification pendingNotification optional, + XSD.PositiveInteger notificationStoragePriority optional, + XSD.Boolean latestNotify optional, + NotificationContentType notificationContentType, + EventCat notificationEventCat optional, + XSD.AnyURI subscriberURI optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Schedule schedule, + NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6123,20 +6122,20 @@ with { type record EventNotificationCriteria { - Timestamp createdBefore optional, - Timestamp createdAfter optional, - Timestamp modifiedSince optional, - Timestamp unmodifiedSince optional, - XSD.PositiveInteger stateTagSmaller optional, - XSD.NonNegativeInteger stateTagBigger optional, - Timestamp expireBefore optional, - Timestamp expireAfter optional, - XSD.NonNegativeInteger sizeAbove optional, - XSD.PositiveInteger sizeBelow optional, - record length(0 .. 5) of Operation operationMonitor_list, - AttributeList_1 attribute optional, - record length(0 .. 5) of NotificationEventType notificationEventType_list, - MissingData missingData optional + Timestamp createdBefore optional, + Timestamp createdAfter optional, + Timestamp modifiedSince optional, + Timestamp unmodifiedSince optional, + XSD.PositiveInteger stateTagSmaller optional, + XSD.NonNegativeInteger stateTagBigger optional, + Timestamp expireBefore optional, + Timestamp expireAfter optional, + XSD.NonNegativeInteger sizeAbove optional, + XSD.PositiveInteger sizeBelow optional, + record length(0 .. 5) of Operation operationMonitor_list, + AttributeList_1 attribute optional, + record length(0 .. 5) of NotificationEventType notificationEventType_list, + MissingData missingData optional } with { variant "name as uncapitalized"; @@ -6149,8 +6148,8 @@ with { type record BatchNotify { - XSD.NonNegativeInteger number optional, - XSD.Duration duration optional + XSD.NonNegativeInteger number optional, + XSD.Duration duration optional } with { variant "name as uncapitalized"; @@ -6159,8 +6158,8 @@ with { type record RateLimit { - XSD.NonNegativeInteger maxNrOfNotify optional, - XSD.Duration timeWindow optional + XSD.NonNegativeInteger maxNrOfNotify optional, + XSD.Duration timeWindow optional } with { variant "name as uncapitalized"; @@ -6169,30 +6168,30 @@ with { type record SvcFwWrapper { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6208,29 +6207,29 @@ with { type record SvcFwWrapperAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6246,31 +6245,31 @@ with { type record SvcObjWrapper { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription, - AllJoynApp allJoynApp - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription, + AllJoynApp allJoynApp + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6286,30 +6285,30 @@ with { type record SvcObjWrapperAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime optional, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record of union { - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Subscription subscription, - AllJoynAppAnnc allJoynAppAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime optional, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record of union { + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Subscription subscription, + AllJoynAppAnnc allJoynAppAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6325,20 +6324,20 @@ with { type record TimeSeriesInstance { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - AbsRelTimestamp dataGenerationTime, - XSD.AnySimpleType content,//FIXME Use AnySimpleType instead - XSD.NonNegativeInteger sequenceNr optional, - XSD.NonNegativeInteger contentSize + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + AbsRelTimestamp dataGenerationTime, + XSD.AnySimpleType content,//FIXME Use AnySimpleType instead + XSD.NonNegativeInteger sequenceNr optional, + XSD.NonNegativeInteger contentSize } with { variant "name as uncapitalized"; @@ -6350,19 +6349,19 @@ with { type record TimeSeriesInstanceAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - Timestamp expirationTime, - XSD.AnyURI link, - AbsRelTimestamp dataGenerationTime optional, - XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead - XSD.NonNegativeInteger sequenceNr optional, - XSD.NonNegativeInteger contentSize optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + Timestamp expirationTime, + XSD.AnyURI link, + AbsRelTimestamp dataGenerationTime optional, + XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead + XSD.NonNegativeInteger sequenceNr optional, + XSD.NonNegativeInteger contentSize optional } with { variant "name as uncapitalized"; @@ -6373,40 +6372,40 @@ with { type record TimeSeries { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag, - XSD.ID creator, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances, - XSD.NonNegativeInteger currentByteSize, - XSD.NonNegativeInteger periodicInterval optional, - XSD.Boolean missingDataDetect optional, - XSD.NonNegativeInteger missingDataMaxNr optional, - MissingDataList missingDataList optional, - XSD.NonNegativeInteger missingDataCurrentNr optional, - XSD.NonNegativeInteger missingDataDetectTimer optional, - XSD.AnyURI ontologyRef optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - TimeSeriesInstance timeSeriesInstance, - Subscription subscription, - SemanticDescriptor semanticDescriptor - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag, + XSD.ID creator, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances, + XSD.NonNegativeInteger currentByteSize, + XSD.NonNegativeInteger periodicInterval optional, + XSD.Boolean missingDataDetect optional, + XSD.NonNegativeInteger missingDataMaxNr optional, + MissingDataList missingDataList optional, + XSD.NonNegativeInteger missingDataCurrentNr optional, + XSD.NonNegativeInteger missingDataDetectTimer optional, + XSD.AnyURI ontologyRef optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + TimeSeriesInstance timeSeriesInstance, + Subscription subscription, + SemanticDescriptor semanticDescriptor + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6425,39 +6424,39 @@ with { type record TimeSeriesAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances, - XSD.NonNegativeInteger currentByteSize, - XSD.NonNegativeInteger periodicInterval optional, - XSD.NonNegativeInteger missingDataMaxNr optional, - MissingDataList missingDataList optional, - XSD.NonNegativeInteger missingDataCurrentNr optional, - XSD.NonNegativeInteger missingDataDetectTimer optional, - XSD.AnyURI ontologyRef optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - TimeSeriesInstance timeSeriesInstance, - TimeSeriesInstanceAnnc timeSeriesInstanceAnnc, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances, + XSD.NonNegativeInteger currentByteSize, + XSD.NonNegativeInteger periodicInterval optional, + XSD.NonNegativeInteger missingDataMaxNr optional, + MissingDataList missingDataList optional, + XSD.NonNegativeInteger missingDataCurrentNr optional, + XSD.NonNegativeInteger missingDataDetectTimer optional, + XSD.AnyURI ontologyRef optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + TimeSeriesInstance timeSeriesInstance, + TimeSeriesInstanceAnnc timeSeriesInstanceAnnc, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6473,33 +6472,33 @@ with { type record Token { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - TokenID tokenID, - DynAuthJWT tokenObject, - XSD.String version optional, - XSD.ID issuer optional, - XSD.ID holder optional, - Timestamp notBefore, - Timestamp notAfter optional, - XSD.String tokenName optional, - ListOfM2MID audience optional, - TokenPermissions permissions optional, - XSD.String extension_ optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + TokenID tokenID, + DynAuthJWT tokenObject, + XSD.String version optional, + XSD.ID issuer optional, + XSD.ID holder optional, + Timestamp notBefore, + Timestamp notAfter optional, + XSD.String tokenName optional, + ListOfM2MID audience optional, + TokenPermissions permissions optional, + XSD.String extension_ optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6516,33 +6515,33 @@ with { type record TrafficPattern { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.Boolean provideToNSE optional, - PeriodicIndicator periodicIndicator optional, - XSD.UnsignedInt periodicDurationTime optional, - XSD.UnsignedInt periodicIntervalTime optional, - StationaryIndication stationaryIndication optional, - XSD.PositiveInteger dataSizeIndicator optional, - Timestamp validityTime optional, - ListOfM2MID targetNetwork, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - record of Subscription subscription_list, - record length(1) of Schedule schedule_list - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.Boolean provideToNSE optional, + PeriodicIndicator periodicIndicator optional, + XSD.UnsignedInt periodicDurationTime optional, + XSD.UnsignedInt periodicIntervalTime optional, + StationaryIndication stationaryIndication optional, + XSD.PositiveInteger dataSizeIndicator optional, + Timestamp validityTime optional, + ListOfM2MID targetNetwork, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + record of Subscription subscription_list, + record length(1) of Schedule schedule_list + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6565,32 +6564,32 @@ with { type record TrafficPatternAnnc { - ResourceName resourceName, - ResourceType resourceType, - XSD.ID resourceID, - NhURI parentID, - Timestamp creationTime, - Timestamp lastModifiedTime, - Labels labels optional, - AcpType accessControlPolicyIDs, - Timestamp expirationTime, - XSD.AnyURI link, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.Boolean provideToNSE optional, - PeriodicIndicator periodicIndicator optional, - XSD.UnsignedInt periodicDurationTime optional, - XSD.UnsignedInt periodicIntervalTime optional, - StationaryIndication stationaryIndication optional, - XSD.PositiveInteger dataSizeIndicator optional, - Timestamp validityTime optional, - ListOfM2MID targetNetwork optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - record of Subscription subscription_list, - record length(1) of ScheduleAnnc scheduleAnnc_list - } choice_list - } choice optional + ResourceName resourceName, + ResourceType resourceType, + XSD.ID resourceID, + NhURI parentID, + Timestamp creationTime, + Timestamp lastModifiedTime, + Labels labels optional, + AcpType accessControlPolicyIDs, + Timestamp expirationTime, + XSD.AnyURI link, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.Boolean provideToNSE optional, + PeriodicIndicator periodicIndicator optional, + XSD.UnsignedInt periodicDurationTime optional, + XSD.UnsignedInt periodicIntervalTime optional, + StationaryIndication stationaryIndication optional, + XSD.PositiveInteger dataSizeIndicator optional, + Timestamp validityTime optional, + ListOfM2MID targetNetwork optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + record of Subscription subscription_list, + record length(1) of ScheduleAnnc scheduleAnnc_list + } choice_list + } choice optional } with { variant "name as uncapitalized"; @@ -6611,89 +6610,89 @@ with { /* ****************************************** - * oneM2M Abstract Service Primitives + * oneM2M Abstract Service Primitives * ****************************************** */ - /** - * @desc Type for the oneM2M primitives exchange - * @member primitive oneM2M primitive - * @member host IP Address of the destination - * @member xmlNamespace XML Namespace to be used - * @member protocolBinding Protocol binding to be used - * @member serialization Serialization to be used - * @member forcedFields Attributes that need to be processed differently by the test adapter: - * - empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted - * - invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances> - */ - type record MsgOut { - union { - RequestPrimitive requestPrimitive, - ResponsePrimitive responsePrimitive - } primitive, - charstring host optional, - charstring xmlNamespace optional, - charstring protocolBinding optional, - charstring serialization optional, - AttributeAux_list forcedFields optional - } - with { - encode "" - } - - /** - * @desc Type for the oneM2M primitives exchange - * @member primitive oneM2M primitive - */ - type record MsgIn { - union { - RequestPrimitive requestPrimitive, - ResponsePrimitive responsePrimitive - } primitive, - AttributeList_1 nullFields optional - } - with { - encode "" - } - - type record AcRequestPrimitive { - charstring event, - anytype data - } - with { - encode "adapter"; - } - - type record AcResponsePrimitive { - charstring event, - anytype data - } - with { - encode "adapter"; - } - - type record UtTriggerPrimitive { - RequestPrimitive requestPrimitive, - AttributeAux_list forcedFields optional - } - with { - encode "UpperTester" - } - - type ResponsePrimitive UtTriggerAckPrimitive - with { - encode "UpperTester" - } - - type record AttributeAux { - XSD.NCName name, - charstring value_ optional - }; - - type record of AttributeAux AttributeAux_list; + /** + * @desc Type for the oneM2M primitives exchange + * @member primitive oneM2M primitive + * @member host IP Address of the destination + * @member xmlNamespace XML Namespace to be used + * @member protocolBinding Protocol binding to be used + * @member serialization Serialization to be used + * @member forcedFields Attributes that need to be processed differently by the test adapter: + * - empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted + * - invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances> + */ + type record MsgOut { + union { + RequestPrimitive requestPrimitive, + ResponsePrimitive responsePrimitive + } primitive, + charstring host optional, + charstring xmlNamespace optional, + charstring protocolBinding optional, + charstring serialization optional, + AttributeAux_list forcedFields optional + } + with { + encode "" + } + + /** + * @desc Type for the oneM2M primitives exchange + * @member primitive oneM2M primitive + */ + type record MsgIn { + union { + RequestPrimitive requestPrimitive, + ResponsePrimitive responsePrimitive + } primitive, + AttributeList_1 nullFields optional + } + with { + encode "" + } + + type record AcRequestPrimitive { + charstring event, + anytype data + } + with { + encode "adapter"; + } + + type record AcResponsePrimitive { + charstring event, + anytype data + } + with { + encode "adapter"; + } + + type record UtTriggerPrimitive { + RequestPrimitive requestPrimitive, + AttributeAux_list forcedFields optional + } + with { + encode "UpperTester" + } + + type ResponsePrimitive UtTriggerAckPrimitive + with { + encode "UpperTester" + } + + type record AttributeAux { + XSD.NCName name, + charstring value_ optional + }; + + type record of AttributeAux AttributeAux_list; /* ********************************** -* oneM2M Resource primitives -* *********************************** +* oneM2M Resource primitives +* *********************************** */ @@ -6701,2044 +6700,2216 @@ with { /* Additional types */ group OptionalResourceTypes { - - type record AccessControlPolicy_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - SetOfAcrs privileges optional, - SetOfAcrs selfPrivileges optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - type record AccessControlPolicyAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - SetOfAcrs privileges optional, - SetOfAcrs selfPrivileges optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record AE_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.String appName optional, - XSD.String app_ID optional, - XSD.ID aE_ID optional, - PoaList pointOfAccess optional, - XSD.AnyURI ontologyRef optional, - XSD.AnyURI nodeLink optional, - XSD.Boolean requestReachability optional, - Serializations contentSerialization optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Container container, - Group group_, - AccessControlPolicy accessControlPolicy, - Subscription subscription, - PollingChannel pollingChannel, - Schedule schedule, - SemanticDescriptor semanticDescriptor, - TimeSeries timeSeries, - TrafficPattern trafficPattern, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional - } - with { - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (app_ID) "name as 'App-ID'"; - variant (aE_ID) "name as 'AE-ID'"; - //variant (requestReachability) "text 'true' as '1'"; - //variant (requestReachability) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - variant (choice.choice_list[-].group_) "name as 'group'"; - }; - - type record AEAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.String appName optional, - XSD.String app_ID optional, - XSD.ID aE_ID optional, - PoaList pointOfAccess optional, - XSD.AnyURI ontologyRef optional, - XSD.AnyURI nodeLink optional, - XSD.Boolean requestReachability optional, - Serializations contentSerialization optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Container container, - ContainerAnnc containerAnnc, - Group group_, - GroupAnnc groupAnnc, - AccessControlPolicy accessControlPolicy, - AccessControlPolicyAnnc accessControlPolicyAnnc, - Subscription subscription, - ScheduleAnnc scheduleAnnc, - SemanticDescriptor semanticDescriptor, - TimeSeries timeSeries, - TimeSeriesAnnc timeSeriesAnnc, - TrafficPatternAnnc trafficPatternAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional - } - with { - variant "element"; - variant (resourceName) "attribute"; - variant (app_ID) "name as 'App-ID'"; - variant (aE_ID) "name as 'AE-ID'"; - //variant (requestReachability) "text 'true' as '1'"; - //variant (requestReachability) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - variant (choice.choice_list[-].group_) "name as 'group'"; - }; - - type record MgmtCmd_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.String description optional, - CmdType cmdType optional, - ExecReqArgsListType execReqArgs optional, - XSD.Boolean execEnable optional, - NodeID execTarget optional, - ExecModeType execMode optional, - XSD.Duration execFrequency optional, - XSD.Duration execDelay optional, - XSD.NonNegativeInteger execNumber optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ExecInstance execInstance, - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - //variant (execEnable) "text 'true' as '1'"; - //variant (execEnable) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - - type record MgmtResource_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - MgmtDefinition mgmtDefinition optional, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional - } - with { - variant "name as uncapitalized"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - }; - - type record AnnouncedMgmtResource_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MgmtDefinition mgmtDefinition optional, - ListOfURIs objectIDs optional, - ListOfURIs objectPaths optional, - XSD.String description optional - } - with { - variant "name as uncapitalized"; - variant (resourceName) "attribute"; - }; - - type record FlexContainerResource_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID creator optional, - XSD.AnyURI containerDefinition optional, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize optional - } - with { - variant "name as uncapitalized"; - variant (resourceName) "attribute"; - }; - - type record AnnouncedFlexContainerResource_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.AnyURI containerDefinition optional, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize optional - } - with { - variant "name as uncapitalized"; - variant (resourceName) "attribute"; - }; - - type record Container_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID creator optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances optional, - XSD.NonNegativeInteger currentByteSize optional, - XSD.AnyURI locationID optional, - XSD.AnyURI ontologyRef optional, - XSD.Boolean disableRetrieval optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ContentInstance contentInstance, - Container container, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - //variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - //variant (disableRetrieval) "text 'true' as '1'"; - //variant (disableRetrieval) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record ContainerAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances optional, - XSD.NonNegativeInteger currentByteSize optional, - XSD.AnyURI locationID optional, - XSD.AnyURI ontologyRef optional, - XSD.Boolean disableRetrieval optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ContentInstance contentInstance, - ContentInstanceAnnc contentInstanceAnnc, - Container container, - ContainerAnnc containerAnnc, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - //variant (disableRetrieval) "text 'true' as '1'"; - //variant (disableRetrieval) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record ContentInstance_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID creator optional, - ContentInfo contentInfo optional, - XSD.NonNegativeInteger contentSize optional, - ContentRef contentRef optional, - XSD.AnyURI ontologyRef optional, - XSD.AnySimpleType content optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.semanticDescriptor_list) "untagged"; - variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'"; - }; - - type record ContentInstanceAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - XSD.NonNegativeInteger stateTag optional, - ContentInfo contentInfo optional, - XSD.NonNegativeInteger contentSize optional, - XSD.AnyURI ontologyRef optional, - XSD.AnySimpleType content optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.semanticDescriptor_list) "untagged"; - variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'"; - }; - - type record CSEBase_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - CseTypeID cseType optional, - XSD.ID cSE_ID optional, - ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type - PoaList pointOfAccess optional, - XSD.AnyURI nodeLink optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - RemoteCSE remoteCSE, - RemoteCSEAnnc remoteCSEAnnc, - Node node, - AE aE, - Container container, - Group group_, - AccessControlPolicy accessControlPolicy, - Subscription subscription, - MgmtCmd mgmtCmd, - LocationPolicy locationPolicy, - StatsConfig statsConfig, - StatsCollect statsCollect, - Request request, - Delivery delivery, - Schedule schedule, - M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile, - ServiceSubscribedAppRule serviceSubscribedAppRule, - Role role, - XSD.Token token, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional - } - with { - variant "element"; - variant (resourceName) "attribute"; - variant (cSE_ID) "name as 'CSE-ID'"; - variant (supportedResourceType) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - variant (choice.choice_list[-].aE) "name as capitalized"; - variant (choice.choice_list[-].group_) "name as 'group'"; - }; - - type record Delivery_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID source optional, - XSD.ID target optional, - Timestamp lifespan optional, - EventCat eventCat optional, - DeliveryMetaData deliveryMetaData optional, - AggregatedRequest aggregatedRequest optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record GenericInterworkingOperationInstance_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - ListOfNCNames announcedAttribute optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID creator optional, - XSD.AnyURI containerDefinition optional, - XSD.AnyURI ontologyRef optional, - XSD.NonNegativeInteger contentSize optional, - XSD.String operationName optional, - XSD.String operationState optional, - ListOfDataLinks inputDataPointLinks optional, - ListOfDataLinks outputDataPointLinks optional, - ListOfDataLinks inputLinks optional, - ListOfDataLinks outputLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - SemanticDescriptor semanticDescriptor, - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record Group_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.ID creator optional, - MemberType memberType optional, - XSD.NonNegativeInteger currentNrOfMembers optional, - XSD.PositiveInteger maxNrOfMembers optional, - record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty - ListOfURIs membersAccessControlPolicyIDs optional, - XSD.Boolean memberTypeValidated optional, - ConsistencyStrategy consistencyStrategy optional, - XSD.String groupName optional, - XSD.Boolean semanticSupportIndicator optional, - BatchNotify notifyAggregation optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription, - SemanticDescriptor semanticDescriptor - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (memberIDs) "list"; - //variant (memberTypeValidated) "text 'true' as '1'"; - //variant (memberTypeValidated) "text 'false' as '0'"; - //variant (semanticSupportIndicator) "text 'true' as '1'"; - //variant (semanticSupportIndicator) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record GroupAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - MemberType memberType optional, - XSD.NonNegativeInteger currentNrOfMembers optional, - XSD.PositiveInteger maxNrOfMembers optional, - record of XSD.AnyURI memberIDs optional, - ListOfURIs membersAccessControlPolicyIDs optional, - XSD.Boolean memberTypeValidated optional, - ConsistencyStrategy consistencyStrategy optional, - XSD.String groupName optional, - XSD.Boolean semanticSupportIndicator optional, - BatchNotify notifyAggregation optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (memberIDs) "list"; - //variant (memberTypeValidated) "text 'true' as '1'"; - //variant (memberTypeValidated) "text 'false' as '0'"; - //variant (semanticSupportIndicator) "text 'true' as '1'"; - //variant (semanticSupportIndicator) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record LocationPolicy_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - LocationSource locationSource optional, - LocationInformationType locationInformationType optional, - ListOfDuration locationUpdatePeriod optional, - LocationTargetID locationTargetID optional, - XSD.AnyURI locationServer optional, - XSD.AnyURI locationContainerID optional, - XSD.String locationContainerName optional, - XSD.String locationStatus optional, - XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead - GeofenceEventCriteria geofenceEventCriteria optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record LocationPolicyAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - LocationSource locationSource optional, - LocationInformationType locationInformationType optional, - ListOfDuration locationUpdatePeriod optional, - LocationTargetID locationTargetID optional, - XSD.AnyURI locationServer optional, - XSD.AnyURI locationContainerID optional, - XSD.String locationContainerName optional, - XSD.String locationStatus optional, - XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead - GeofenceEventCriteria geofenceEventCriteria optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - }; - - type record M2mServiceSubscriptionProfile_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ServiceSubscribedNode serviceSubscribedNode, - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record Node_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - NodeID nodeID optional, - XSD.ID hostedCSELink optional, - XSD.String mgmtClientAddress optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Memory memory, - Battery battery, - AreaNwkInfo areaNwkInfo, - AreaNwkDeviceInfo areaNwkDeviceInfo, - Firmware firmware, - Software software, - DeviceInfo deviceInfo, - DeviceCapability deviceCapability, - Reboot reboot, - EventLog eventLog, - CmdhPolicy cmdhPolicy, - ActiveCmdhPolicy activeCmdhPolicy, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - TrafficPattern trafficPattern - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record NodeAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - NodeID nodeID optional, - XSD.ID hostedCSELink optional, - XSD.String mgmtClientAddress optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - MemoryAnnc memoryAnnc, - BatteryAnnc batteryAnnc, - AreaNwkInfoAnnc areaNwkInfoAnnc, - AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc, - FirmwareAnnc firmwareAnnc, - SoftwareAnnc softwareAnnc, - DeviceInfoAnnc deviceInfoAnnc, - DeviceCapabilityAnnc deviceCapabilityAnnc, - RebootAnnc rebootAnnc, - EventLogAnnc eventLogAnnc, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - SemanticDescriptorAnnc semanticDescriptorAnnc, - TrafficPatternAnnc trafficPatternAnnc - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record PollingChannel_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - }; - - type record RemoteCSE_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - CseTypeID cseType optional, - PoaList pointOfAccess optional, - XSD.AnyURI cSEBase optional, - XSD.ID cSE_ID optional, - ExternalID m2M_Ext_ID optional, - TriggerRecipientID trigger_Recipient_ID optional, - XSD.Boolean requestReachability optional, - XSD.AnyURI nodeLink optional, - XSD.UnsignedInt triggerReferenceNumber optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - NodeAnnc nodeAnnc, - Container container, - ContainerAnnc containerAnnc, - Group group_, - GroupAnnc groupAnnc, - AccessControlPolicy accessControlPolicy, - AccessControlPolicyAnnc accessControlPolicyAnnc, - Subscription subscription, - PollingChannel pollingChannel, - Schedule schedule, - TimeSeries timeSeries, - TimeSeriesAnnc timeSeriesAnnc, - LocationPolicyAnnc locationPolicyAnnc, - AEAnnc aEAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (cSEBase) "name as capitalized"; - variant (cSE_ID) "name as 'CSE-ID'"; - variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'"; - variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'"; - //variant (requestReachability) "text 'true' as '1'"; - //variant (requestReachability) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - variant (choice.choice_list[-].group_) "name as 'group'"; - variant (choice.choice_list[-].aEAnnc) "name as capitalized"; - }; - - type record RemoteCSEAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - CseTypeID cseType optional, - PoaList pointOfAccess optional, - XSD.AnyURI cSEBase optional, - XSD.ID cSE_ID optional, - XSD.Boolean requestReachability optional, - XSD.AnyURI nodeLink optional, - E2eSecInfo e2eSecInfo optional, - SupportedReleaseVersions supportedReleaseVersions optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - NodeAnnc nodeAnnc, - Container container, - ContainerAnnc containerAnnc, - Group group_, - GroupAnnc groupAnnc, - AccessControlPolicy accessControlPolicy, - AccessControlPolicyAnnc accessControlPolicyAnnc, - Subscription subscription, - PollingChannel pollingChannel, - ScheduleAnnc scheduleAnnc, - LocationPolicyAnnc locationPolicyAnnc, - TimeSeries timeSeries, - TimeSeriesAnnc timeSeriesAnnc, - AEAnnc aEAnnc, - Sg_flexContainerResource_group sg_flexContainerResource, - Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (cSEBase) "name as capitalized"; - variant (cSE_ID) "name as 'CSE-ID'"; - //variant (requestReachability) "text 'true' as '1'"; - //variant (requestReachability) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - variant (choice.choice_list[-].group_) "name as 'group'"; - variant (choice.choice_list[-].aEAnnc) "name as capitalized"; - }; - - type record Request_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - Operation operation optional, - XSD.AnyURI target optional, - XSD.ID originator optional, - RequestID requestID optional, - MetaInformation metaInformation optional, - PrimitiveContent primitiveContent optional, - RequestStatus requestStatus optional, - OperationResult operationResult optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record Schedule_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - ScheduleEntries scheduleElement optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record ScheduleAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ScheduleEntries scheduleElement optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - }; - - type record SemanticDescriptor_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.ID creator optional, - DescriptorRepresentation descriptorRepresentation optional, - Sparql semanticOpExec optional, - XSD.Base64Binary descriptor optional, - XSD.AnyURI ontologyRef optional, - ListOfURIs relatedSemantics optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription_optional subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record SemanticDescriptorAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - DescriptorRepresentation descriptorRepresentation optional, - Sparql semanticOpExec optional, - XSD.Base64Binary descriptor optional, - XSD.AnyURI ontologyRef optional, - ListOfURIs relatedSemantics optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription_optional subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record ServiceSubscribedAppRule_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfM2MID applicableCredIDs optional, - ListOfM2MID allowedApp_IDs optional, - ListOfM2MID allowedAEs optional, - record length(1 .. infinity) of RoleID allowedRole_IDs optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription_optional subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (allowedApp_IDs) "name as 'allowedApp-IDs'"; - variant (allowedRole_IDs) "name as 'allowedRole-IDs'"; - variant (allowedRole_IDs) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record ServiceSubscribedNode_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - NodeID nodeID optional, - XSD.ID cSE_ID optional, - record of DeviceID deviceIdentifier optional, - ListOfURIs ruleLinks optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription_optional subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (cSE_ID) "name as 'CSE-ID'"; - variant (deviceIdentifier) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record StatsCollect_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - XSD.String statsCollectID optional, - XSD.ID collectingEntityID optional, - ListOfM2MID collectedEntityID optional, - StatsRuleStatusType statsRuleStatus optional, - StatModelType statModel optional, - ScheduleEntries collectPeriod optional, - XSD.String eventID optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription_optional subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record StatsConfig_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - EventConfig eventConfig, - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record Subscription_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - EventNotificationCriteria eventNotificationCriteria optional, - XSD.PositiveInteger expirationCounter optional, - ListOfURIs notificationURI optional, - XSD.AnyURI groupID optional, - XSD.AnyURI notificationForwardingURI optional, - BatchNotify batchNotify optional, - RateLimit rateLimit optional, - XSD.PositiveInteger preSubscriptionNotify optional, - PendingNotification pendingNotification optional, - XSD.PositiveInteger notificationStoragePriority optional, - XSD.Boolean latestNotify optional, - NotificationContentType notificationContentType optional, - EventCat notificationEventCat optional, - XSD.AnyURI subscriberURI optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Schedule schedule, - NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - //variant (latestNotify) "text 'true' as '1'"; - //variant (latestNotify) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record TimeSeries_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID creator optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances optional, - XSD.NonNegativeInteger currentByteSize optional, - XSD.NonNegativeInteger periodicInterval optional, - XSD.Boolean missingDataDetect optional, - XSD.NonNegativeInteger missingDataMaxNr optional, - MissingDataList missingDataList optional, - XSD.NonNegativeInteger missingDataCurrentNr optional, - XSD.NonNegativeInteger missingDataDetectTimer optional, - XSD.AnyURI ontologyRef optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - TimeSeriesInstance_optional timeSeriesInstance, - Subscription_optional subscription, - SemanticDescriptor_optional semanticDescriptor - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - //variant (missingDataDetect) "text 'true' as '1'"; - //variant (missingDataDetect) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - - type record TimeSeriesAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.NonNegativeInteger stateTag optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances optional, - XSD.NonNegativeInteger currentByteSize optional, - XSD.NonNegativeInteger periodicInterval optional, - XSD.NonNegativeInteger missingDataMaxNr optional, - MissingDataList missingDataList optional, - XSD.NonNegativeInteger missingDataCurrentNr optional, - XSD.NonNegativeInteger missingDataDetectTimer optional, - XSD.AnyURI ontologyRef optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - TimeSeriesInstance_optional timeSeriesInstance, - TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc, - Subscription_optional subscription, - SemanticDescriptor_optional semanticDescriptor, - SemanticDescriptorAnnc_optional semanticDescriptorAnnc - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - //variant (missingDataDetect) "text 'true' as '1'"; - //variant (missingDataDetect) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record TimeSeriesInstance_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - AbsRelTimestamp dataGenerationTime optional, - XSD.AnySimpleType content optional, - XSD.NonNegativeInteger sequenceNr optional, - XSD.NonNegativeInteger contentSize optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - }; - - - type record TimeSeriesInstanceAnnc_optional - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - Labels labels optional, - Timestamp expirationTime optional, - XSD.AnyURI link optional, - AbsRelTimestamp dataGenerationTime optional, - XSD.AnySimpleType content optional, - XSD.NonNegativeInteger sequenceNr optional, - XSD.NonNegativeInteger contentSize optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - }; - + + type record AccessControlPolicy_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + SetOfAcrs privileges optional, + SetOfAcrs selfPrivileges optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + type record AccessControlPolicyAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + SetOfAcrs privileges optional, + SetOfAcrs selfPrivileges optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record AE_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.String appName optional, + XSD.String app_ID optional, + XSD.ID aE_ID optional, + PoaList pointOfAccess optional, + XSD.AnyURI ontologyRef optional, + XSD.AnyURI nodeLink optional, + XSD.Boolean requestReachability optional, + Serializations contentSerialization optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Container container, + Group group_, + AccessControlPolicy accessControlPolicy, + Subscription subscription, + PollingChannel pollingChannel, + Schedule schedule, + SemanticDescriptor semanticDescriptor, + TimeSeries timeSeries, + TrafficPattern trafficPattern, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional + } + with { + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (app_ID) "name as 'App-ID'"; + variant (aE_ID) "name as 'AE-ID'"; + //variant (requestReachability) "text 'true' as '1'"; + //variant (requestReachability) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + variant (choice.choice_list[-].group_) "name as 'group'"; + }; + + type record AEAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.String appName optional, + XSD.String app_ID optional, + XSD.ID aE_ID optional, + PoaList pointOfAccess optional, + XSD.AnyURI ontologyRef optional, + XSD.AnyURI nodeLink optional, + XSD.Boolean requestReachability optional, + Serializations contentSerialization optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Container container, + ContainerAnnc containerAnnc, + Group group_, + GroupAnnc groupAnnc, + AccessControlPolicy accessControlPolicy, + AccessControlPolicyAnnc accessControlPolicyAnnc, + Subscription subscription, + ScheduleAnnc scheduleAnnc, + SemanticDescriptor semanticDescriptor, + TimeSeries timeSeries, + TimeSeriesAnnc timeSeriesAnnc, + TrafficPatternAnnc trafficPatternAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional + } + with { + variant "element"; + variant (resourceName) "attribute"; + variant (app_ID) "name as 'App-ID'"; + variant (aE_ID) "name as 'AE-ID'"; + //variant (requestReachability) "text 'true' as '1'"; + //variant (requestReachability) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + variant (choice.choice_list[-].group_) "name as 'group'"; + }; + + type record MgmtCmd_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.String description optional, + CmdType cmdType optional, + ExecReqArgsListType execReqArgs optional, + XSD.Boolean execEnable optional, + NodeID execTarget optional, + ExecModeType execMode optional, + XSD.Duration execFrequency optional, + XSD.Duration execDelay optional, + XSD.NonNegativeInteger execNumber optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ExecInstance execInstance, + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + //variant (execEnable) "text 'true' as '1'"; + //variant (execEnable) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + + type record MgmtResource_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + MgmtDefinition mgmtDefinition optional, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional + } + with { + variant "name as uncapitalized"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + }; + + type record AnnouncedMgmtResource_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MgmtDefinition mgmtDefinition optional, + ListOfURIs objectIDs optional, + ListOfURIs objectPaths optional, + XSD.String description optional + } + with { + variant "name as uncapitalized"; + variant (resourceName) "attribute"; + }; + + type record FlexContainerResource_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID creator optional, + XSD.AnyURI containerDefinition optional, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize optional + } + with { + variant "name as uncapitalized"; + variant (resourceName) "attribute"; + }; + + type record AnnouncedFlexContainerResource_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.AnyURI containerDefinition optional, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize optional + } + with { + variant "name as uncapitalized"; + variant (resourceName) "attribute"; + }; + + type record Container_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID creator optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances optional, + XSD.NonNegativeInteger currentByteSize optional, + XSD.AnyURI locationID optional, + XSD.AnyURI ontologyRef optional, + XSD.Boolean disableRetrieval optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ContentInstance contentInstance, + Container container, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + //variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + //variant (disableRetrieval) "text 'true' as '1'"; + //variant (disableRetrieval) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record ContainerAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances optional, + XSD.NonNegativeInteger currentByteSize optional, + XSD.AnyURI locationID optional, + XSD.AnyURI ontologyRef optional, + XSD.Boolean disableRetrieval optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ContentInstance contentInstance, + ContentInstanceAnnc contentInstanceAnnc, + Container container, + ContainerAnnc containerAnnc, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + //variant (disableRetrieval) "text 'true' as '1'"; + //variant (disableRetrieval) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record ContentInstance_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID creator optional, + ContentInfo contentInfo optional, + XSD.NonNegativeInteger contentSize optional, + ContentRef contentRef optional, + XSD.AnyURI ontologyRef optional, + XSD.AnySimpleType content optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.semanticDescriptor_list) "untagged"; + variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'"; + }; + + type record ContentInstanceAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + XSD.NonNegativeInteger stateTag optional, + ContentInfo contentInfo optional, + XSD.NonNegativeInteger contentSize optional, + XSD.AnyURI ontologyRef optional, + XSD.AnySimpleType content optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.semanticDescriptor_list) "untagged"; + variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'"; + }; + + type record CSEBase_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + CseTypeID cseType optional, + XSD.ID cSE_ID optional, + ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type + PoaList pointOfAccess optional, + XSD.AnyURI nodeLink optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + RemoteCSE remoteCSE, + RemoteCSEAnnc remoteCSEAnnc, + Node node, + AE aE, + Container container, + Group group_, + AccessControlPolicy accessControlPolicy, + Subscription subscription, + MgmtCmd mgmtCmd, + LocationPolicy locationPolicy, + StatsConfig statsConfig, + StatsCollect statsCollect, + Request request, + Delivery delivery, + Schedule schedule, + M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile, + ServiceSubscribedAppRule serviceSubscribedAppRule, + Role role, + XSD.Token token, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional + } + with { + variant "element"; + variant (resourceName) "attribute"; + variant (cSE_ID) "name as 'CSE-ID'"; + variant (supportedResourceType) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + variant (choice.choice_list[-].aE) "name as capitalized"; + variant (choice.choice_list[-].group_) "name as 'group'"; + }; + + type record Delivery_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID source optional, + XSD.ID target optional, + Timestamp lifespan optional, + EventCat eventCat optional, + DeliveryMetaData deliveryMetaData optional, + AggregatedRequest aggregatedRequest optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record GenericInterworkingOperationInstance_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + ListOfNCNames announcedAttribute optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID creator optional, + XSD.AnyURI containerDefinition optional, + XSD.AnyURI ontologyRef optional, + XSD.NonNegativeInteger contentSize optional, + XSD.String operationName optional, + XSD.String operationState optional, + ListOfDataLinks inputDataPointLinks optional, + ListOfDataLinks outputDataPointLinks optional, + ListOfDataLinks inputLinks optional, + ListOfDataLinks outputLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + SemanticDescriptor semanticDescriptor, + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record Group_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.ID creator optional, + MemberType memberType optional, + XSD.NonNegativeInteger currentNrOfMembers optional, + XSD.PositiveInteger maxNrOfMembers optional, + record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty + ListOfURIs membersAccessControlPolicyIDs optional, + XSD.Boolean memberTypeValidated optional, + ConsistencyStrategy consistencyStrategy optional, + XSD.String groupName optional, + XSD.Boolean semanticSupportIndicator optional, + BatchNotify notifyAggregation optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription, + SemanticDescriptor semanticDescriptor + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (memberIDs) "list"; + //variant (memberTypeValidated) "text 'true' as '1'"; + //variant (memberTypeValidated) "text 'false' as '0'"; + //variant (semanticSupportIndicator) "text 'true' as '1'"; + //variant (semanticSupportIndicator) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record GroupAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + MemberType memberType optional, + XSD.NonNegativeInteger currentNrOfMembers optional, + XSD.PositiveInteger maxNrOfMembers optional, + record of XSD.AnyURI memberIDs optional, + ListOfURIs membersAccessControlPolicyIDs optional, + XSD.Boolean memberTypeValidated optional, + ConsistencyStrategy consistencyStrategy optional, + XSD.String groupName optional, + XSD.Boolean semanticSupportIndicator optional, + BatchNotify notifyAggregation optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (memberIDs) "list"; + //variant (memberTypeValidated) "text 'true' as '1'"; + //variant (memberTypeValidated) "text 'false' as '0'"; + //variant (semanticSupportIndicator) "text 'true' as '1'"; + //variant (semanticSupportIndicator) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record LocationPolicy_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + LocationSource locationSource optional, + LocationInformationType locationInformationType optional, + ListOfDuration locationUpdatePeriod optional, + LocationTargetID locationTargetID optional, + XSD.AnyURI locationServer optional, + XSD.AnyURI locationContainerID optional, + XSD.String locationContainerName optional, + XSD.String locationStatus optional, + XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead + GeofenceEventCriteria geofenceEventCriteria optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record LocationPolicyAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + LocationSource locationSource optional, + LocationInformationType locationInformationType optional, + ListOfDuration locationUpdatePeriod optional, + LocationTargetID locationTargetID optional, + XSD.AnyURI locationServer optional, + XSD.AnyURI locationContainerID optional, + XSD.String locationContainerName optional, + XSD.String locationStatus optional, + XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead + GeofenceEventCriteria geofenceEventCriteria optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + }; + + type record M2mServiceSubscriptionProfile_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ServiceSubscribedNode serviceSubscribedNode, + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record Node_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + NodeID nodeID optional, + XSD.ID hostedCSELink optional, + XSD.String mgmtClientAddress optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Memory memory, + Battery battery, + AreaNwkInfo areaNwkInfo, + AreaNwkDeviceInfo areaNwkDeviceInfo, + Firmware firmware, + Software software, + DeviceInfo deviceInfo, + DeviceCapability deviceCapability, + Reboot reboot, + EventLog eventLog, + CmdhPolicy cmdhPolicy, + ActiveCmdhPolicy activeCmdhPolicy, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + TrafficPattern trafficPattern + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record NodeAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + NodeID nodeID optional, + XSD.ID hostedCSELink optional, + XSD.String mgmtClientAddress optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + MemoryAnnc memoryAnnc, + BatteryAnnc batteryAnnc, + AreaNwkInfoAnnc areaNwkInfoAnnc, + AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc, + FirmwareAnnc firmwareAnnc, + SoftwareAnnc softwareAnnc, + DeviceInfoAnnc deviceInfoAnnc, + DeviceCapabilityAnnc deviceCapabilityAnnc, + RebootAnnc rebootAnnc, + EventLogAnnc eventLogAnnc, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + SemanticDescriptorAnnc semanticDescriptorAnnc, + TrafficPatternAnnc trafficPatternAnnc + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record PollingChannel_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + }; + + type record RemoteCSE_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + CseTypeID cseType optional, + PoaList pointOfAccess optional, + XSD.AnyURI cSEBase optional, + XSD.ID cSE_ID optional, + ExternalID m2M_Ext_ID optional, + TriggerRecipientID trigger_Recipient_ID optional, + XSD.Boolean requestReachability optional, + XSD.AnyURI nodeLink optional, + XSD.UnsignedInt triggerReferenceNumber optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + NodeAnnc nodeAnnc, + Container container, + ContainerAnnc containerAnnc, + Group group_, + GroupAnnc groupAnnc, + AccessControlPolicy accessControlPolicy, + AccessControlPolicyAnnc accessControlPolicyAnnc, + Subscription subscription, + PollingChannel pollingChannel, + Schedule schedule, + TimeSeries timeSeries, + TimeSeriesAnnc timeSeriesAnnc, + LocationPolicyAnnc locationPolicyAnnc, + AEAnnc aEAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (cSEBase) "name as capitalized"; + variant (cSE_ID) "name as 'CSE-ID'"; + variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'"; + variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'"; + //variant (requestReachability) "text 'true' as '1'"; + //variant (requestReachability) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + variant (choice.choice_list[-].group_) "name as 'group'"; + variant (choice.choice_list[-].aEAnnc) "name as capitalized"; + }; + + type record RemoteCSEAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + CseTypeID cseType optional, + PoaList pointOfAccess optional, + XSD.AnyURI cSEBase optional, + XSD.ID cSE_ID optional, + XSD.Boolean requestReachability optional, + XSD.AnyURI nodeLink optional, + E2eSecInfo e2eSecInfo optional, + SupportedReleaseVersions supportedReleaseVersions optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + NodeAnnc nodeAnnc, + Container container, + ContainerAnnc containerAnnc, + Group group_, + GroupAnnc groupAnnc, + AccessControlPolicy accessControlPolicy, + AccessControlPolicyAnnc accessControlPolicyAnnc, + Subscription subscription, + PollingChannel pollingChannel, + ScheduleAnnc scheduleAnnc, + LocationPolicyAnnc locationPolicyAnnc, + TimeSeries timeSeries, + TimeSeriesAnnc timeSeriesAnnc, + AEAnnc aEAnnc, + Sg_flexContainerResource_group sg_flexContainerResource, + Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (cSEBase) "name as capitalized"; + variant (cSE_ID) "name as 'CSE-ID'"; + //variant (requestReachability) "text 'true' as '1'"; + //variant (requestReachability) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + variant (choice.choice_list[-].group_) "name as 'group'"; + variant (choice.choice_list[-].aEAnnc) "name as capitalized"; + }; + + type record Request_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + Operation operation optional, + XSD.AnyURI target optional, + XSD.ID originator optional, + RequestID requestID optional, + MetaInformation metaInformation optional, + PrimitiveContent primitiveContent optional, + RequestStatus requestStatus optional, + OperationResult operationResult optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record Schedule_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + ScheduleEntries scheduleElement optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record ScheduleAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ScheduleEntries scheduleElement optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + }; + + type record SemanticDescriptor_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.ID creator optional, + DescriptorRepresentation descriptorRepresentation optional, + Sparql semanticOpExec optional, + XSD.Base64Binary descriptor optional, + XSD.AnyURI ontologyRef optional, + ListOfURIs relatedSemantics optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription_optional subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record SemanticDescriptorAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + DescriptorRepresentation descriptorRepresentation optional, + Sparql semanticOpExec optional, + XSD.Base64Binary descriptor optional, + XSD.AnyURI ontologyRef optional, + ListOfURIs relatedSemantics optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription_optional subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record ServiceSubscribedAppRule_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfM2MID applicableCredIDs optional, + ListOfM2MID allowedApp_IDs optional, + ListOfM2MID allowedAEs optional, + record length(1 .. infinity) of RoleID allowedRole_IDs optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription_optional subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (allowedApp_IDs) "name as 'allowedApp-IDs'"; + variant (allowedRole_IDs) "name as 'allowedRole-IDs'"; + variant (allowedRole_IDs) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record ServiceSubscribedNode_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + NodeID nodeID optional, + XSD.ID cSE_ID optional, + record of DeviceID deviceIdentifier optional, + ListOfURIs ruleLinks optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription_optional subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (cSE_ID) "name as 'CSE-ID'"; + variant (deviceIdentifier) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record StatsCollect_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + XSD.String statsCollectID optional, + XSD.ID collectingEntityID optional, + ListOfM2MID collectedEntityID optional, + StatsRuleStatusType statsRuleStatus optional, + StatModelType statModel optional, + ScheduleEntries collectPeriod optional, + XSD.String eventID optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription_optional subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record StatsConfig_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + EventConfig eventConfig, + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record Subscription_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + EventNotificationCriteria eventNotificationCriteria optional, + XSD.PositiveInteger expirationCounter optional, + ListOfURIs notificationURI optional, + XSD.AnyURI groupID optional, + XSD.AnyURI notificationForwardingURI optional, + BatchNotify batchNotify optional, + RateLimit rateLimit optional, + XSD.PositiveInteger preSubscriptionNotify optional, + PendingNotification pendingNotification optional, + XSD.PositiveInteger notificationStoragePriority optional, + XSD.Boolean latestNotify optional, + NotificationContentType notificationContentType optional, + EventCat notificationEventCat optional, + XSD.AnyURI subscriberURI optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Schedule schedule, + NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + //variant (latestNotify) "text 'true' as '1'"; + //variant (latestNotify) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record TimeSeries_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID creator optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances optional, + XSD.NonNegativeInteger currentByteSize optional, + XSD.NonNegativeInteger periodicInterval optional, + XSD.Boolean missingDataDetect optional, + XSD.NonNegativeInteger missingDataMaxNr optional, + MissingDataList missingDataList optional, + XSD.NonNegativeInteger missingDataCurrentNr optional, + XSD.NonNegativeInteger missingDataDetectTimer optional, + XSD.AnyURI ontologyRef optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + TimeSeriesInstance_optional timeSeriesInstance, + Subscription_optional subscription, + SemanticDescriptor_optional semanticDescriptor + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + //variant (missingDataDetect) "text 'true' as '1'"; + //variant (missingDataDetect) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + + type record TimeSeriesAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.NonNegativeInteger stateTag optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances optional, + XSD.NonNegativeInteger currentByteSize optional, + XSD.NonNegativeInteger periodicInterval optional, + XSD.NonNegativeInteger missingDataMaxNr optional, + MissingDataList missingDataList optional, + XSD.NonNegativeInteger missingDataCurrentNr optional, + XSD.NonNegativeInteger missingDataDetectTimer optional, + XSD.AnyURI ontologyRef optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + TimeSeriesInstance_optional timeSeriesInstance, + TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc, + Subscription_optional subscription, + SemanticDescriptor_optional semanticDescriptor, + SemanticDescriptorAnnc_optional semanticDescriptorAnnc + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + //variant (missingDataDetect) "text 'true' as '1'"; + //variant (missingDataDetect) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record TimeSeriesInstance_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + AbsRelTimestamp dataGenerationTime optional, + XSD.AnySimpleType content optional, + XSD.NonNegativeInteger sequenceNr optional, + XSD.NonNegativeInteger contentSize optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + }; + + + type record TimeSeriesInstanceAnnc_optional + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + Labels labels optional, + Timestamp expirationTime optional, + XSD.AnyURI link optional, + AbsRelTimestamp dataGenerationTime optional, + XSD.AnySimpleType content optional, + XSD.NonNegativeInteger sequenceNr optional, + XSD.NonNegativeInteger contentSize optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + }; + }//end group OptionalResourceTypes - - + + group InvalidTypes { - - type record AE_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for AE - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.String appName optional, - XSD.String app_ID optional, - XSD.ID aE_ID optional, - PoaList pointOfAccess optional, - XSD.AnyURI ontologyRef optional, - XSD.AnyURI nodeLink optional, - XSD.Boolean requestReachability optional, - Serializations contentSerialization optional, - E2eSecInfo e2eSecInfo optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Container container, - Group group_, - AccessControlPolicy accessControlPolicy, - Subscription subscription, - PollingChannel pollingChannel, - Schedule schedule, - SemanticDescriptor semanticDescriptor, - TimeSeries timeSeries, - TrafficPattern trafficPattern, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional - } - with { - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (app_ID) "name as 'App-ID'"; - variant (aE_ID) "name as 'AE-ID'"; - //variant (requestReachability) "text 'true' as '1'"; - //variant (requestReachability) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - variant (choice.choice_list[-].group_) "name as 'group'"; - }; + + type record AE_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for AE + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.String appName optional, + XSD.String app_ID optional, + XSD.ID aE_ID optional, + PoaList pointOfAccess optional, + XSD.AnyURI ontologyRef optional, + XSD.AnyURI nodeLink optional, + XSD.Boolean requestReachability optional, + Serializations contentSerialization optional, + E2eSecInfo e2eSecInfo optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Container container, + Group group_, + AccessControlPolicy accessControlPolicy, + Subscription subscription, + PollingChannel pollingChannel, + Schedule schedule, + SemanticDescriptor semanticDescriptor, + TimeSeries timeSeries, + TrafficPattern trafficPattern, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional + } + with { + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (app_ID) "name as 'App-ID'"; + variant (aE_ID) "name as 'AE-ID'"; + //variant (requestReachability) "text 'true' as '1'"; + //variant (requestReachability) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + variant (choice.choice_list[-].group_) "name as 'group'"; + }; - type record ACP_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for ACP - Labels labels optional, - Timestamp expirationTime optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - SetOfAcrs privileges optional, - SetOfAcrs selfPrivileges optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of Subscription subscription_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.subscription_list) "untagged"; - variant (choice.subscription_list[-]) "name as 'subscription'"; - }; - - type record Container_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.Integer stateTag optional, - XSD.ID creator optional, - XSD.Integer maxNrOfInstances optional, - XSD.Integer maxByteSize optional, - XSD.Integer maxInstanceAge optional, - XSD.Integer currentNrOfInstances optional, - XSD.Integer currentByteSize optional, - XSD.AnyURI locationID optional, - XSD.AnyURI ontologyRef optional, - XSD.Boolean disableRetrieval optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - ContentInstance contentInstance, - Container container, - Subscription subscription, - SemanticDescriptor semanticDescriptor, - Sg_flexContainerResource_group sg_flexContainerResource - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - //variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - //variant (disableRetrieval) "text 'true' as '1'"; - //variant (disableRetrieval) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record Group_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Group - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.ID creator optional, - MemberType memberType optional, - XSD.NonNegativeInteger currentNrOfMembers optional, - XSD.PositiveInteger maxNrOfMembers optional, - ListOfURIs memberIDs optional, - ListOfURIs membersAccessControlPolicyIDs optional, - XSD.Boolean memberTypeValidated optional, - ConsistencyStrategy consistencyStrategy optional, - XSD.String groupName optional, - XSD.Boolean semanticSupportIndicator optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription, - SemanticDescriptor semanticDescriptor - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - //variant (memberTypeValidated) "text 'true' as '1'"; - //variant (memberTypeValidated) "text 'false' as '0'"; - //variant (semanticSupportIndicator) "text 'true' as '1'"; - //variant (semanticSupportIndicator) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; + type record ACP_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for ACP + Labels labels optional, + Timestamp expirationTime optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + SetOfAcrs privileges optional, + SetOfAcrs selfPrivileges optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of Subscription subscription_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.subscription_list) "untagged"; + variant (choice.subscription_list[-]) "name as 'subscription'"; + }; + + type record Container_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.Integer stateTag optional, + XSD.ID creator optional, + XSD.Integer maxNrOfInstances optional, + XSD.Integer maxByteSize optional, + XSD.Integer maxInstanceAge optional, + XSD.Integer currentNrOfInstances optional, + XSD.Integer currentByteSize optional, + XSD.AnyURI locationID optional, + XSD.AnyURI ontologyRef optional, + XSD.Boolean disableRetrieval optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + ContentInstance contentInstance, + Container container, + Subscription subscription, + SemanticDescriptor semanticDescriptor, + Sg_flexContainerResource_group sg_flexContainerResource + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + //variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + //variant (disableRetrieval) "text 'true' as '1'"; + //variant (disableRetrieval) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record Group_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Group + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.ID creator optional, + MemberType memberType optional, + XSD.NonNegativeInteger currentNrOfMembers optional, + XSD.PositiveInteger maxNrOfMembers optional, + ListOfURIs memberIDs optional, + ListOfURIs membersAccessControlPolicyIDs optional, + XSD.Boolean memberTypeValidated optional, + ConsistencyStrategy consistencyStrategy optional, + XSD.String groupName optional, + XSD.Boolean semanticSupportIndicator optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription, + SemanticDescriptor semanticDescriptor + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + //variant (memberTypeValidated) "text 'true' as '1'"; + //variant (memberTypeValidated) "text 'false' as '0'"; + //variant (semanticSupportIndicator) "text 'true' as '1'"; + //variant (semanticSupportIndicator) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; - type record PollingChannel_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel - Labels labels optional, - Timestamp expirationTime optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - }; + type record PollingChannel_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel + Labels labels optional, + Timestamp expirationTime optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + }; - type record Schedule_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule - Labels labels optional, - Timestamp expirationTime optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - ScheduleEntries scheduleElement optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; + type record Schedule_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Schedule + Labels labels optional, + Timestamp expirationTime optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + ScheduleEntries scheduleElement optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; - type record Subscription_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - XSD.ID creator optional, - EventNotificationCriteria eventNotificationCriteria optional, - XSD.PositiveInteger expirationCounter optional, - ListOfURIs notificationURI optional, - XSD.AnyURI groupID optional, - XSD.AnyURI notificationForwardingURI optional, - BatchNotify batchNotify optional, - RateLimit rateLimit optional, - XSD.PositiveInteger preSubscriptionNotify optional, - PendingNotification pendingNotification optional, - XSD.PositiveInteger notificationStoragePriority optional, - XSD.Boolean latestNotify optional, - NotificationContentType notificationContentType optional, - EventCat notificationEventCat optional, - XSD.AnyURI subscriberURI optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Schedule schedule, - NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - //variant (latestNotify) "text 'true' as '1'"; - //variant (latestNotify) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; - - type record TimeSeries_update_invalid - { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for TimeSeries - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.NonNegativeInteger stateTag optional, - XSD.ID creator optional, - XSD.NonNegativeInteger maxNrOfInstances optional, - XSD.NonNegativeInteger maxByteSize optional, - XSD.NonNegativeInteger maxInstanceAge optional, - XSD.NonNegativeInteger currentNrOfInstances optional, - XSD.NonNegativeInteger currentByteSize optional, - XSD.NonNegativeInteger periodicInterval optional, - XSD.Boolean missingDataDetect optional, - XSD.NonNegativeInteger missingDataMaxNr optional, - MissingDataList missingDataList optional, - XSD.NonNegativeInteger missingDataCurrentNr optional, - XSD.NonNegativeInteger missingDataDetectTimer optional, - XSD.AnyURI ontologyRef optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - TimeSeriesInstance_optional timeSeriesInstance, - Subscription_optional subscription, - SemanticDescriptor_optional semanticDescriptor - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - //variant (missingDataDetect) "text 'true' as '1'"; - //variant (missingDataDetect) "text 'false' as '0'"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; + type record Subscription_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + XSD.ID creator optional, + EventNotificationCriteria eventNotificationCriteria optional, + XSD.PositiveInteger expirationCounter optional, + ListOfURIs notificationURI optional, + XSD.AnyURI groupID optional, + XSD.AnyURI notificationForwardingURI optional, + BatchNotify batchNotify optional, + RateLimit rateLimit optional, + XSD.PositiveInteger preSubscriptionNotify optional, + PendingNotification pendingNotification optional, + XSD.PositiveInteger notificationStoragePriority optional, + XSD.Boolean latestNotify optional, + NotificationContentType notificationContentType optional, + EventCat notificationEventCat optional, + XSD.AnyURI subscriberURI optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Schedule schedule, + NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + //variant (latestNotify) "text 'true' as '1'"; + //variant (latestNotify) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; + + type record TimeSeries_update_invalid + { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for TimeSeries + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + XSD.NonNegativeInteger stateTag optional, + XSD.ID creator optional, + XSD.NonNegativeInteger maxNrOfInstances optional, + XSD.NonNegativeInteger maxByteSize optional, + XSD.NonNegativeInteger maxInstanceAge optional, + XSD.NonNegativeInteger currentNrOfInstances optional, + XSD.NonNegativeInteger currentByteSize optional, + XSD.NonNegativeInteger periodicInterval optional, + XSD.Boolean missingDataDetect optional, + XSD.NonNegativeInteger missingDataMaxNr optional, + MissingDataList missingDataList optional, + XSD.NonNegativeInteger missingDataCurrentNr optional, + XSD.NonNegativeInteger missingDataDetectTimer optional, + XSD.AnyURI ontologyRef optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + TimeSeriesInstance_optional timeSeriesInstance, + Subscription_optional subscription, + SemanticDescriptor_optional semanticDescriptor + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + //variant (missingDataDetect) "text 'true' as '1'"; + //variant (missingDataDetect) "text 'false' as '0'"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; - type record LocationPolicy_update_invalid { - ResourceName resourceName optional, - ResourceType resourceType optional, - XSD.ID resourceID optional, - NhURI parentID optional, - Timestamp creationTime optional, - Timestamp lastModifiedTime optional, - XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for LocationPolicy - Labels labels optional, - AcpType accessControlPolicyIDs optional, - Timestamp expirationTime optional, - ListOfURIs dynamicAuthorizationConsultationIDs optional, - ListOfURIs announceTo optional, - record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - LocationSource locationSource optional, - ListOfDuration locationUpdatePeriod optional, - LocationTargetID locationTargetID optional, - XSD.AnyURI locationServer optional, - XSD.AnyURI locationContainerID optional, - XSD.String locationContainerName optional, - XSD.String locationStatus optional, - union { - record length(1 .. infinity) of ChildResourceRef childResource_list, - record length(1 .. infinity) of union { - Subscription subscription - } choice_list - } choice optional - } - with { - variant "name as uncapitalized"; - variant "element"; - variant (resourceName) "attribute"; - variant (announcedAttribute) "list"; - variant (choice) "untagged"; - variant (choice.childResource_list) "untagged"; - variant (choice.childResource_list[-]) "name as 'childResource'"; - variant (choice.choice_list) "untagged"; - variant (choice.choice_list[-]) "untagged"; - }; + type record LocationPolicy_update_invalid { + ResourceName resourceName optional, + ResourceType resourceType optional, + XSD.ID resourceID optional, + NhURI parentID optional, + Timestamp creationTime optional, + Timestamp lastModifiedTime optional, + XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for LocationPolicy + Labels labels optional, + AcpType accessControlPolicyIDs optional, + Timestamp expirationTime optional, + ListOfURIs dynamicAuthorizationConsultationIDs optional, + ListOfURIs announceTo optional, + record length(1 .. infinity) of XSD.NCName announcedAttribute optional, + LocationSource locationSource optional, + ListOfDuration locationUpdatePeriod optional, + LocationTargetID locationTargetID optional, + XSD.AnyURI locationServer optional, + XSD.AnyURI locationContainerID optional, + XSD.String locationContainerName optional, + XSD.String locationStatus optional, + union { + record length(1 .. infinity) of ChildResourceRef childResource_list, + record length(1 .. infinity) of union { + Subscription subscription + } choice_list + } choice optional + } + with { + variant "name as uncapitalized"; + variant "element"; + variant (resourceName) "attribute"; + variant (announcedAttribute) "list"; + variant (choice) "untagged"; + variant (choice.childResource_list) "untagged"; + variant (choice.childResource_list[-]) "name as 'childResource'"; + variant (choice.choice_list) "untagged"; + variant (choice.choice_list[-]) "untagged"; + }; }//end group invalidTypes group OtherTypes { - - type enumerated Configurations { - e_cf01, - e_cf02, - e_cf02CseSimuMaster, - e_cf03, - e_cf04 - }; - - type enumerated TestSystemRole { - e_cse, - e_ae - }; - - type NhURI ParentID; - - type record MyResource { - integer parentIndex, - ResourceType resourceType, - PrimitiveContent resource - }; - - type record of MyResource MyResourcesList; - - type record of integer IntegerList; - - type enumerated PrimitiveScope { - e_cseRelative, - e_spRelative, - e_absolute - } - - type enumerated AddressingMethod { - e_nonHierarchical, - e_hierarchical, - e_hybrid - } - - type union Resource_2 { - //ResourceTypes - AEAnnc_optional aEAnnc, - AE_optional aE, - AccessControlPolicy_optional accessControlPolicy, - AccessControlPolicyAnnc_optional accessControlPolicyAnnc, - ContentInstance_optional contentInstance, - ContentInstanceAnnc_optional contentInstanceAnnc, - Container_optional container, - ContainerAnnc_optional containerAnnc, - CSEBase_optional cSEBase, - Group_optional group_, - GroupAnnc_optional groupAnnc, - LocationPolicy_optional locationPolicy, - LocationPolicyAnnc_optional locationPolicyAnnc, - MgmtResource_optional mgmtResource,//MgmtResource - AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource - Node_optional node, - NodeAnnc_optional nodeAnnc, - PollingChannel_optional pollingChannel, - RemoteCSE_optional remoteCSE, - Schedule_optional schedule, - ScheduleAnnc_optional scheduleAnnc, - StatsConfig_optional statsConfig, - StatsCollect_optional statsCollect, - M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile, - ServiceSubscribedAppRule_optional serviceSubscribedAppRule, - Subscription_optional subscription, - TimeSeries_optional timeSeries - } - with { - variant "untagged"; - } - - type record of ResourceType ResourceTypeList_1 - with { - variant "name as uncapitalized"; - variant "list"; - }; + + type enumerated Configurations { + e_cf01, + e_cf02, + e_cf02CseSimuMaster, + e_cf03, + e_cf04 + }; + + type enumerated TestSystemRole { + e_cse, + e_ae + }; + + type NhURI ParentID; + + type record MyResource { + integer parentIndex, + ResourceType resourceType, + PrimitiveContent resource + }; + + type record of MyResource MyResourcesList; + + type record of integer IntegerList; + + type enumerated PrimitiveScope { + e_cseRelative, + e_spRelative, + e_absolute + } + + type enumerated AddressingMethod { + e_nonHierarchical, + e_hierarchical, + e_hybrid + } + + type union Resource_2 { + //ResourceTypes + AEAnnc_optional aEAnnc, + AE_optional aE, + AccessControlPolicy_optional accessControlPolicy, + AccessControlPolicyAnnc_optional accessControlPolicyAnnc, + ContentInstance_optional contentInstance, + ContentInstanceAnnc_optional contentInstanceAnnc, + Container_optional container, + ContainerAnnc_optional containerAnnc, + CSEBase_optional cSEBase, + Group_optional group_, + GroupAnnc_optional groupAnnc, + LocationPolicy_optional locationPolicy, + LocationPolicyAnnc_optional locationPolicyAnnc, + MgmtResource_optional mgmtResource,//MgmtResource + AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource + Node_optional node, + NodeAnnc_optional nodeAnnc, + PollingChannel_optional pollingChannel, + RemoteCSE_optional remoteCSE, + Schedule_optional schedule, + ScheduleAnnc_optional scheduleAnnc, + StatsConfig_optional statsConfig, + StatsCollect_optional statsCollect, + M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile, + ServiceSubscribedAppRule_optional serviceSubscribedAppRule, + Subscription_optional subscription, + TimeSeries_optional timeSeries + } + with { + variant "untagged"; + } + + type record of ResourceType ResourceTypeList_1 + with { + variant "name as uncapitalized"; + variant "list"; + }; +} + +group tsSettings { + +/** + * @desc Authorized protocol bindings + * @member e_http HTTP protocol binding + * @member e_coap CoAP protocol binding + * @member e_mqtt MQTT protocol binding + * @member e_ws WebSocket protocol binding + */ +type enumerated ProtocolBindings { + e_http (0), + e_coap (1), + e_mqtt (2), + e_wsck (3) +} + +/** + * @desc Authorized serialization protocols + * @member e_http Data serialization using HTTP + * @member e_xml Data serialization using XML + * @member e_jsaon Data serialization using JSON + * @member e_text Data serialization using text + * @member e_raw Data serialization using binary formay + */ +type enumerated SerializationProtocols { + e_xml (0), + e_json (1), + e_cbor (2) +} + +type record of charstring SerializationProtocolsLabels; +const SerializationProtocolsLabels c_serializationLabel := { "xml", "json", "cbor" }; + +/** + * @desc Basic description of a Protocol Binding settings + * @member tsAddress Test System IP address + * @member remotePort Remote port (SUT listener port) + * @member localPort Test Adapter listener port (used by mcxPortIn) or, + * The local client port. In this case, the value 'omit' is interpreted as random port number by the Test Adapter + * @member sutAddress SUT IP address, optional. + * If omitted, the SUT IP address defined in SutDesc data structure will be used by the Test Adapter + */ +type record BindingDesc { + charstring tsAddress, + integer remotePort optional, + integer localPort optional, + charstring sutAddress optional +} + +/** + * @desc HTTP binding protocol settings + */ +type record HttpBindingDesc { + ProtocolBindings bindingProtocol (e_http), + BindingDesc bindingDesc +} + +/** + * @desc COAP binding protocol settings + */ +type record CoapBindingDesc { + ProtocolBindings bindingProtocol (e_coap), + BindingDesc bindingDesc +} + +/** + * @desc MQTT binding protocol settings + * @member bindingProtocol + * @member hostingCSE_ID + * @member credentialId + * @member bindingDesc + */ +type record MqttBindingDesc { + ProtocolBindings bindingProtocol (e_mqtt), + BindingDesc bindingDesc, + charstring hostingCSE_ID, + charstring credentialId + // TODO To be completed +} + +/** + * @desc WebSocket binding protocol settings + */ +type record WSBindingDesc { + ProtocolBindings bindingProtocol (e_wsck), + BindingDesc bindingDesc, + charstring requestUri + // TODO To be completed } + +type union BindingProtocolsSelect { + HttpBindingDesc httpBindingDesc, + CoapBindingDesc coapBindingDesc, + MqttBindingDesc mqttBindingDesc, + WSBindingDesc wsBindingDesc +} + +/** + * @desc + * @member binding + * @member serialization + */ +type record PortDesc { + BindingProtocolsSelect binding, + SerializationProtocols serialization +} + +type record SutDesc { + charstring sutAddress +} + +/** + * @desc UpperTester component settinmgs + * @member requestId + * @member tsAddress Test System IP address + * @member tsRemotePort Test System UpperTester listener port + * @member sutAddress SUT IP address + * @member sutRemotePort IUT UpperTester listener port + */ +type record UtDesc { + charstring tsAddress, + integer utApplicationPort, + charstring utApplicationAddress optional, + charstring utApplicationUrl +} + +/** + * @desc AeSimu component settings + * @member mcaPort TTCN-3 'mca' protocol for sending to the SUT + * @member mcaPortIn TTCN-3 'mca' protocol for receiving from the SUT + */ +type record AeSimuComponentDesc { + PortDesc mcaPort, + PortDesc mcaPortIn +} + +/** + * @desc CseSimu component settings + * @member mcaPort TTCN-3 'mca' protocol for sending to the SUT + * @member mcaPortIn TTCN-3 'mca' protocol for receiving from the SUT + * @member mccPort TTCN-3 'mcc' protocol for sending to the SUT + * @member mccPortIn TTCN-3 'mcc' protocol for receiving from the SUT + */ +type record CseSimuComponentDesc { + PortDesc mcaPort, + PortDesc mcaPortIn, + PortDesc mccPort, + PortDesc mccPortIn +} + +/** + * @desc Test System settings + * @member ae1Simu Ae1Simu component settings + * @member ae2Simu Ae2Simu component settings + * @member cse1Simu Cse1Simu component settings + * @member sutDesc SUT settings + * @member utDesc UpperTester component settings + */ +type record TestSystemSettingsDesc { + AeSimuComponentDesc AE1, + AeSimuComponentDesc AE2, + CseSimuComponentDesc CSE1, + SutDesc SUT, + UtDesc UT optional +} + +} +with { + encode ""; +} // End of group tsSettings + } with { encode "XML"; //variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'"; //variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'"; - extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional" + extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional" } diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn index ff1376a3453c1b1ca5f9952d119f15e67518e43a..3f4a56f526b5315ee2698b3018ab10d670f5efdc 100644 --- a/OneM2M_PermutationFunctions.ttcn +++ b/OneM2M_PermutationFunctions.ttcn @@ -53,12 +53,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container creation request received successfuly"); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); } [] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Create Request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -96,12 +96,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container creation request received successfuly"); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); } [] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Create Request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -145,12 +145,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container update request received successfuly"); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_updateContainer())) { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Update Request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -188,12 +188,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container update request received successfuly"); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_updateContainer())) { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Update Request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -236,12 +236,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly"); f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -279,12 +279,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly"); f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -327,12 +327,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container delete request received successfuly"); f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Delete request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -371,12 +371,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container delete request received successfuly"); f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Delete request with unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); stop; } [] tc_ac.timeout { @@ -427,7 +427,7 @@ module OneM2M_PermutationFunctions { [] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected AE registration request"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -477,13 +477,13 @@ module OneM2M_PermutationFunctions { setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!"); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); } [] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{ tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected CREATE request "); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -515,12 +515,12 @@ module OneM2M_PermutationFunctions { setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!"); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); } [] mcaPortIn.receive(mw_request(mw_create)) { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected CREATE request "); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -565,7 +565,7 @@ module OneM2M_PermutationFunctions { [] mcaPortIn.receive(mw_request(mw_update)) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -600,12 +600,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : Container update request is accepted!!"); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_update)) { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -649,12 +649,12 @@ module OneM2M_PermutationFunctions { tc_ac.stop; setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!"); v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive (mw_request(mw_retrieve(?))){ tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -703,12 +703,12 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex); v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including the optional attribute!"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -772,7 +772,8 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex); v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); + tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) { @@ -832,7 +833,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex); v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) { @@ -893,7 +894,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex); v_request.to_ := f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) { @@ -954,7 +955,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex); v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) { @@ -1016,7 +1017,7 @@ module OneM2M_PermutationFunctions { v_addressingMethod := e_nonHierarchical; v_primitiveScope := p_primitiveScope; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { @@ -1073,7 +1074,7 @@ module OneM2M_PermutationFunctions { v_addressingMethod := e_hierarchical; v_primitiveScope := p_primitiveScope; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));tc_ac.start; + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { tc_ac.stop; @@ -1129,7 +1130,7 @@ module OneM2M_PermutationFunctions { v_addressingMethod := e_hierarchical; v_primitiveScope := p_primitiveScope; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex)))));tc_ac.start; + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex)))));tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { tc_ac.stop; @@ -1185,7 +1186,7 @@ module OneM2M_PermutationFunctions { v_addressingMethod := e_hybrid; v_primitiveScope := p_primitiveScope; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));tc_ac.start; + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { tc_ac.stop; @@ -1251,7 +1252,7 @@ module OneM2M_PermutationFunctions { v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest); v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) { @@ -1314,7 +1315,7 @@ module OneM2M_PermutationFunctions { v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest); v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) { @@ -1377,7 +1378,7 @@ module OneM2M_PermutationFunctions { v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest); v_updateRequest.to_ := f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) { @@ -1440,7 +1441,7 @@ module OneM2M_PermutationFunctions { v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest); v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) { @@ -1504,7 +1505,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) { @@ -1564,7 +1565,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) { @@ -1624,7 +1625,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) { @@ -1684,7 +1685,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) { @@ -1748,7 +1749,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1801,7 +1802,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{ @@ -1845,7 +1846,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(p_createAe); v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{ @@ -1891,7 +1892,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(v_resourceType, p_requestPrimitive, -1); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response { @@ -1945,7 +1946,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(int2, p_createRequestPrimitive, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST @@ -2003,7 +2004,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit)); //send back responsePrimitive - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mccPortIn.receive { tc_ac.stop; @@ -2164,7 +2165,7 @@ module OneM2M_PermutationFunctions { // Preamble vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive); - mccPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response { @@ -2217,7 +2218,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response { @@ -2256,7 +2257,7 @@ module OneM2M_PermutationFunctions { var RequestPrimitive v_request; var ResourceType v_resourceType := int16; //remoteCSE var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; - var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control + var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_SETTINGS.CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control if(not(PICS_MN_CSE)) { setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case"); stop; @@ -2449,7 +2450,7 @@ module OneM2M_PermutationFunctions { vc_cse1.start(f_cse_deleteResourceHandler(v_targetResourceIndex)); } - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(v_responseStatusCode))) -> value vc_response { @@ -2490,8 +2491,8 @@ module OneM2M_PermutationFunctions { var integer v_resourceIndex := -1; var integer v_ae2Index := -1; var integer v_acpAuxIndex := -1; - var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"}; - + var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn) }; + // Test control // Test component configuration @@ -2553,7 +2554,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response { @@ -2603,7 +2604,7 @@ module OneM2M_PermutationFunctions { var integer v_resourceIndex := -1; var integer v_ae1Index := -1; var integer v_acpAuxIndex := -1; - var PoaList v_poaList := {"http://" & PX_AE1_ADDRESS & "/"}; + var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn) }; // Test control @@ -2635,7 +2636,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response { @@ -2698,7 +2699,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response { @@ -2775,7 +2776,7 @@ module OneM2M_PermutationFunctions { vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler()); } - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) -> value v_response { @@ -2834,7 +2835,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -2891,7 +2892,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {p_invalidAttribute}))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, {p_invalidAttribute}))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { @@ -2950,7 +2951,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response { @@ -3016,7 +3017,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex); ////Child2 - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -3078,7 +3079,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex); //Child2 - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -3160,9 +3161,9 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex); if(v_myOptionalAttribute == "creator") { - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {{v_myOptionalAttribute, omit}}))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, {{v_myOptionalAttribute, omit}}))); } else { - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); } tc_ac.start; alt { @@ -3227,7 +3228,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response { @@ -3278,7 +3279,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_childResourceType, p_childRequestPrimitive, v_resourceIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -3299,7 +3300,7 @@ module OneM2M_PermutationFunctions { } //Check currentByteSize - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -3353,7 +3354,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); v_request.resultContent := int0;//Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, omit))) -> value v_response { @@ -3409,7 +3410,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); v_request.resultContent := int2;//Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response { @@ -3470,7 +3471,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); v_request.resultContent := int3;//Attributes + Hierarchichal Address - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response { @@ -3527,7 +3528,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex); v_request.resultContent := p_resultContent; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST @@ -3579,7 +3580,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); v_request.resultContent := int1;//Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response { @@ -3636,7 +3637,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); v_request.resultContent := int9;//Modified Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response { @@ -3694,7 +3695,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aEAnncIndex); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response { @@ -3759,7 +3760,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc)); vc_cse1.done; @@ -3812,7 +3813,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex); vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); vc_cse1.done; vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1); @@ -3863,7 +3864,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_parentIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -3930,7 +3931,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -3983,7 +3984,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -4039,7 +4040,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -4095,7 +4096,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi", "ct"}, f_getOriginator(v_resourceIndex))))); tc_ac.start; @@ -4152,7 +4153,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), {"lbl"}, f_getOriginator(v_resourceIndex))))); tc_ac.start; @@ -4205,7 +4206,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), p_attributeList, f_getOriginator(v_resourceIndex))))); tc_ac.start; @@ -4289,7 +4290,7 @@ module OneM2M_PermutationFunctions { } // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; alt { @@ -4385,7 +4386,7 @@ module OneM2M_PermutationFunctions { } // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; alt { @@ -4460,7 +4461,7 @@ module OneM2M_PermutationFunctions { } // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex)))));//from AE ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; alt { @@ -4541,7 +4542,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_getRemoteCseResource(vc_cse1); } - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex)))));//from AE ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; alt { @@ -4622,7 +4623,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_getRemoteCseResource(vc_cse1); } - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi", "ct"}, f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; @@ -4704,7 +4705,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_getRemoteCseResource(vc_cse1); } - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), {"lbl"}, f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; @@ -4782,7 +4783,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_getRemoteCseResource(vc_cse1); } - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex), {"lbl", "at"}, f_getOriginator(v_aeIndex)))));//from AE ID tc_ac.start; @@ -4839,7 +4840,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := p_resultContent; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST @@ -4904,7 +4905,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int1;//Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response { @@ -4973,7 +4974,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int4;//Attributes and child resources - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response { @@ -5043,7 +5044,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int5;//attributes and child resource references - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response { @@ -5112,7 +5113,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int6;//Child resource references - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response { @@ -5181,7 +5182,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int8;//Child resources - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response { @@ -5242,7 +5243,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response { @@ -5303,7 +5304,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response { @@ -5363,7 +5364,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, p_nullFields))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, p_nullFields))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response { @@ -5421,7 +5422,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, p_nullFields))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, p_nullFields))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response { @@ -5486,7 +5487,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -5542,7 +5543,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { @@ -5598,7 +5599,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request,p_nullFields))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request,p_nullFields))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { @@ -5654,7 +5655,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -5706,7 +5707,7 @@ module OneM2M_PermutationFunctions { f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -5757,7 +5758,7 @@ module OneM2M_PermutationFunctions { //Test Body v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { @@ -5813,7 +5814,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response { @@ -5894,7 +5895,7 @@ module OneM2M_PermutationFunctions { //Test Body vc_request.primitive.requestPrimitive := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(vc_request.primitive.requestPrimitive))); //CSEBase + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(vc_request.primitive.requestPrimitive))); //CSEBase tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response { @@ -5951,7 +5952,7 @@ module OneM2M_PermutationFunctions { // Preamble if(p_resourceType != int2) { - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA("HTTP", PX_AE1_ADDRESS, "")});//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); } if(p_resourceType != int1) { @@ -5983,7 +5984,7 @@ module OneM2M_PermutationFunctions { v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)}; } - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -6004,7 +6005,7 @@ module OneM2M_PermutationFunctions { setverdict(pass, __SCOPE__ & ":INFO: Notification for Subscription verification received"); v_responsePrimitive := valueof(m_responseNotification(int2000, omit)); v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); tc_ac.start; repeat; } @@ -6037,8 +6038,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID}; //Test control @@ -6104,9 +6103,7 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID}; //Test control @@ -6145,7 +6142,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -6185,7 +6182,7 @@ module OneM2M_PermutationFunctions { v_updateRequest.primitiveContent.container.labels := {"VALUE_1"}; v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, v_updateRequest); v_updateRequest.resultContent := p_resultContent; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST @@ -6250,7 +6247,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); v_request.resultContent := int0;//Nothing - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, omit))) -> value v_response { @@ -6319,7 +6316,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); v_request.resultContent := int1;//Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, p_contentResponse))) -> value v_response { @@ -6388,7 +6385,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); v_request.resultContent := int9;//Modified Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, p_contentResponse))) -> value v_response { @@ -6458,7 +6455,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { @@ -6546,7 +6543,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.from_ := f_getOriginator(v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -6620,7 +6617,7 @@ module OneM2M_PermutationFunctions { f_checkAeSimuStatus(); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))))); tc_ac.start; alt { @@ -6672,7 +6669,7 @@ module OneM2M_PermutationFunctions { v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))))); tc_ac.start; alt { @@ -6802,7 +6799,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := p_resultContent; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST @@ -6868,7 +6865,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int0;//Nothing - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response { @@ -6938,7 +6935,7 @@ module OneM2M_PermutationFunctions { v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_request.resultContent := int1;//Attributes - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, p_contentResponse))) -> value v_response { @@ -6994,7 +6991,7 @@ module OneM2M_PermutationFunctions { 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); @@ -7006,7 +7003,7 @@ module OneM2M_PermutationFunctions { vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler()); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST @@ -7102,7 +7099,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { @@ -7179,7 +7176,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -7246,7 +7243,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { @@ -7323,7 +7320,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -7386,7 +7383,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { @@ -7473,7 +7470,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { @@ -7546,7 +7543,7 @@ module OneM2M_PermutationFunctions { v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), p_filterCriteria)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -7614,7 +7611,7 @@ module OneM2M_PermutationFunctions { v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response { @@ -7717,7 +7714,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := "UnknowOriginator"; p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -7788,7 +7785,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -7844,7 +7841,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := "testDomain"; p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -7870,7 +7867,7 @@ module OneM2M_PermutationFunctions { v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs)); v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest); v_updateRequest.from_ := "testDomain"; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { @@ -7918,7 +7915,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := "UnknowOriginator"; p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -7976,7 +7973,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -8046,7 +8043,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -8109,7 +8106,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -8167,7 +8164,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -8212,18 +8209,18 @@ module OneM2M_PermutationFunctions { // Preamble v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1); - v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE1_ADDRESS)}, omit}, omit}}; + v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_SETTINGS.AE1.mcaPortIn)}, omit}, omit}}; v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule}; vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource - v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(-, PX_AE1_ADDRESS, -)}); + v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}); // Test Body p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -8277,14 +8274,14 @@ module OneM2M_PermutationFunctions { v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule}; vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource - v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(-, PX_AE1_ADDRESS, -)}); + v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}); // Test Body p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -8340,7 +8337,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { @@ -8401,7 +8398,7 @@ module OneM2M_PermutationFunctions { // Test Body v_request := f_getCreateRequestPrimitive(int3, p_requestPrimitive, v_containerIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(v_request)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(v_request)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -8489,7 +8486,7 @@ module OneM2M_PermutationFunctions { //Retrieve the parent resource index v_AEAnncResourceIndex := f_getLatestLocalResourceIndex(vc_cse1); vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_AEAnncResourceIndex)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -8609,7 +8606,7 @@ module OneM2M_PermutationFunctions { } v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(valueof(v_responsePrimitive)))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(valueof(v_responsePrimitive)))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -8631,7 +8628,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.primitiveContent := v_announcedResource; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -8682,7 +8679,7 @@ module OneM2M_PermutationFunctions { v_containerAnncResourceIndex := f_getLatestLocalResourceIndex(vc_cse1); v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_resourceIndex); vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_containerAnncResourceIndex)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -8805,7 +8802,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.primitiveContent := v_announcedResource; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -8832,7 +8829,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.primitiveContent := v_announcedResource; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -8937,7 +8934,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.primitiveContent := v_announcedResource; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -8964,7 +8961,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.primitiveContent := v_announcedResource; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -9103,7 +9100,7 @@ module OneM2M_PermutationFunctions { v_resourceAnncIndex := f_cse_createResource(p_resourceType,p_createRequestAnnc); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { @@ -9187,8 +9184,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9257,8 +9252,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9341,7 +9334,7 @@ module OneM2M_PermutationFunctions { vc_cse1.start(f_cse_announcementProcedure_deleteHandler()); v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields))); tc_ac.start; alt { @@ -9387,8 +9380,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9429,8 +9420,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9470,7 +9459,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -9496,8 +9485,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9557,8 +9544,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9637,7 +9622,7 @@ module OneM2M_PermutationFunctions { vc_cse1.start(f_cse_announcementProcedure_updateHandler()); v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { @@ -9681,8 +9666,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9722,7 +9705,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -9748,8 +9731,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9789,7 +9770,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -9815,8 +9796,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9856,7 +9835,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -9881,8 +9860,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -9922,7 +9899,7 @@ module OneM2M_PermutationFunctions { v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive.from_ := PX_CSE1_ID; v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ":ERROR: No announcement received"); @@ -9967,7 +9944,7 @@ module OneM2M_PermutationFunctions { vc_cse1.start(f_cse_announcementProcedure_updateHandler()); v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields))); tc_ac.start; alt { @@ -10031,7 +10008,7 @@ module OneM2M_PermutationFunctions { v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1); vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_AEAnncResourceIndex)); v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { @@ -10097,7 +10074,7 @@ module OneM2M_PermutationFunctions { vc_cse1.start(f_cse_announcementProcedure_deleteHandler()); v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -10143,8 +10120,6 @@ module OneM2M_PermutationFunctions { var integer v_latestResourceIndex; var ResponsePrimitive v_responsePrimitive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.announceTo := {PX_CSE_ID}; @@ -10241,7 +10216,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex); p_requestPrimitive.from_ := f_getOriginator(v_aeIndex2); - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) { @@ -10305,7 +10280,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5206))) -> value v_response { @@ -10373,7 +10348,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response { @@ -10401,7 +10376,7 @@ module OneM2M_PermutationFunctions { //Check to see if the resource is present or not if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){ - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { @@ -10473,7 +10448,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponseUri))) -> value v_response { @@ -10517,7 +10492,7 @@ module OneM2M_PermutationFunctions { v_primitiveContent.container := mw_contentContainer_rc1; //v_primitiveContent := omit; } - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponseRequestResource))) -> value v_response{ @@ -10548,7 +10523,7 @@ module OneM2M_PermutationFunctions { setverdict(fail, testcasename() & ": RequestStatus: FAIL"); }else{ //PENDING, FORWARDING or PARTIALLY_COMPLETED f_sleep(PX_TAC/5.0); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))))); repeat; } } @@ -10611,7 +10586,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.responseType := {int2,omit}; //nonBlockingRequestAsynch // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, omit))) -> value v_response { @@ -10690,7 +10665,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response { @@ -10718,7 +10693,7 @@ module OneM2M_PermutationFunctions { //Check to see if the resource is present or not if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){ - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex))))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) { @@ -10772,7 +10747,7 @@ module OneM2M_PermutationFunctions { v_contentResponse.uRI := ?; - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")});//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); if(ispresent(p_parentRequestPrimitive)) { v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex); p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex); @@ -10782,7 +10757,7 @@ module OneM2M_PermutationFunctions { p_requestPrimitive.from_ := f_getOriginator(v_aeIndex); p_requestPrimitive.responseType := {int2, omit}; //nonBlockingRequestAsynch and no notification target list is provided" - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response { @@ -10846,7 +10821,7 @@ module OneM2M_PermutationFunctions { v_contentResponse.uRI := ?; - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")});//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); if(ispresent(p_parentRequestPrimitive)) { v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex); @@ -10860,7 +10835,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response { @@ -10923,11 +10898,11 @@ module OneM2M_PermutationFunctions { v_contentResponse.uRI := ?; - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")});//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi); f_checkAeSimuStatus(); - vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_PROTOCOL_BINDING_AE2, PX_AE2_ADDRESS, "")}))); // AE2 is registred + vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}))); // AE2 is registred f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); @@ -10945,7 +10920,7 @@ module OneM2M_PermutationFunctions { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive)))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response { diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn index c8db4c9c428fde6876197b3a2c9ec34fb08a4dde..496cdfa92eed515d1305f8bd888706e3552c6969 100644 --- a/OneM2M_Testcases_AE_Release_1.ttcn +++ b/OneM2M_Testcases_AE_Release_1.ttcn @@ -539,12 +539,12 @@ module OneM2M_Testcases_AE_Release_1 { v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected AE registration request"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -765,12 +765,12 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive (mw_request(mw_delete(?))) { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected DELETE request"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -828,12 +828,12 @@ module OneM2M_Testcases_AE_Release_1 { setverdict(pass, __SCOPE__ & " : Container creation request is accepted!"); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); } [] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{ tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected CREATE request "); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -888,12 +888,12 @@ module OneM2M_Testcases_AE_Release_1 { setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!"); v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)))); } [] mcaPortIn.receive(mw_request(mw_create)) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Unexpected CREATE request "); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1451,12 +1451,12 @@ module OneM2M_Testcases_AE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & " : retrieve attribute oldest request is accepted!"); v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1513,12 +1513,12 @@ module OneM2M_Testcases_AE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & " : retrieve attribute latest request is accepted!!"); v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1571,12 +1571,12 @@ module OneM2M_Testcases_AE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!"); v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1631,12 +1631,12 @@ module OneM2M_Testcases_AE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!"); v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1697,13 +1697,13 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); tc_ac.stop; } [] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Delete request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1760,13 +1760,13 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); tc_ac.stop; } [] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Delete request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1823,13 +1823,13 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); tc_ac.stop; } [] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Delete request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1888,13 +1888,13 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); tc_ac.stop; } [] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Delete request for unexpected target"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -1958,12 +1958,12 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive { tc_ac.stop; setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -2160,12 +2160,12 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request { tc_ac.stop; setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -2192,12 +2192,12 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive { tc_ac.stop; setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -2207,7 +2207,7 @@ module OneM2M_Testcases_AE_Release_1 { f_checkCseSimuStatus(); //Test behavior - mcaPortIn.send(f_getMsgOutPrimitive(m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex))))); tc_ac.start; alt{ @@ -2271,12 +2271,12 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request { tc_ac.stop; setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -2303,12 +2303,12 @@ module OneM2M_Testcases_AE_Release_1 { v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource)); //send back responsePrimitive - mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive))); } [] mcaPortIn.receive { tc_ac.stop; setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!"); - mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))))); } [] tc_ac.timeout{ setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!"); @@ -2318,7 +2318,7 @@ module OneM2M_Testcases_AE_Release_1 { f_checkCseSimuStatus(); //Test behavior - mcaPortIn.send(f_getMsgOutPrimitive(m_request(m_notifyAggregatedNotification))); + f_send(e_mca_in_port, f_getMsgOutPrimitive(m_request(m_notifyAggregatedNotification))); tc_ac.start; alt{ diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn index 764d21e8bb147fcefb9671d5f0fd7260edfafad7..e58a3af3e770cf45ce68fab92b7d201768be60b7 100644 --- a/OneM2M_Testcases_CSE_Release_1.ttcn +++ b/OneM2M_Testcases_CSE_Release_1.ttcn @@ -34,8 +34,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_DELETE_RESOURCES()); v_ae1.done; @@ -55,7 +53,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); t_ac.start; alt { @@ -104,8 +102,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_cseRelative)); v_ae1.done; @@ -115,8 +111,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_spRelative)); v_ae1.done; @@ -125,8 +119,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GEN_CRE_001_ABS() 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_CRE_001(e_absolute)); v_ae1.done; @@ -144,8 +136,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_cseRelative)); v_ae1.done; @@ -155,8 +145,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_spRelative)); v_ae1.done; @@ -166,8 +154,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_absolute)); v_ae1.done; @@ -188,8 +174,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_cseRelative)); v_ae1.done; @@ -199,8 +183,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_spRelative)); v_ae1.done; @@ -209,8 +191,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GEN_RET_001_ABS() 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_001(e_absolute)); v_ae1.done; @@ -228,8 +208,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GEN_RET_002_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_002(e_cseRelative)); v_ae1.done; @@ -239,8 +217,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_spRelative)); v_ae1.done; @@ -250,8 +226,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_absolute)); v_ae1.done; @@ -271,8 +245,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GEN_UPD_001_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_UPD_001(e_cseRelative)); v_ae1.done; @@ -281,8 +253,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GEN_UPD_001_SPR() 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_UPD_001(e_spRelative)); v_ae1.done; @@ -292,8 +262,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_absolute)); v_ae1.done; @@ -311,8 +279,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_cseRelative)); v_ae1.done; @@ -322,9 +288,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_spRelative)); v_ae1.done; } @@ -333,8 +297,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_absolute)); v_ae1.done; @@ -355,8 +317,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_cseRelative)); v_ae1.done; @@ -366,8 +326,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_spRelative)); v_ae1.done; @@ -377,8 +335,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_001(e_absolute)); v_ae1.done; @@ -396,8 +352,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_cseRelative)); v_ae1.done; @@ -407,8 +361,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_spRelative)); v_ae1.done; @@ -418,8 +370,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_002(e_absolute)); v_ae1.done; @@ -444,8 +394,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_001_CAE() 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_REG_CRE_001(PX_ALLOWED_C_AE_IDS[0])); v_ae1.done; @@ -455,8 +403,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_001_SAE() 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_REG_CRE_001(PX_ALLOWED_S_AE_IDS[0])); v_ae1.done; @@ -474,8 +420,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_002_CAE() 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_REG_CRE_002(PX_ALLOWED_C_AE_IDS[0])); v_ae1.done; @@ -485,8 +429,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_002_SAE() 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_REG_CRE_002(PX_ALLOWED_S_AE_IDS[0])); v_ae1.done; @@ -502,8 +444,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_003() runs on Tester system CseSystem { 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_REG_CRE_003()); v_cse1.done; @@ -563,8 +503,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_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_REG_CRE_004()); @@ -597,7 +535,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) { @@ -634,8 +572,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem { 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_REG_CRE_005()); v_cse1.done; @@ -698,8 +634,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_006() runs on Tester system CseSystem { 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_REG_CRE_006()); @@ -767,8 +701,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_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_REG_CRE_007()); @@ -802,7 +734,7 @@ module OneM2M_Testcases_CSE_Release_1 { vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive)); - mcaPort.send(f_getMsgOutPrimitive(m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1)))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1)))); //Test Body tc_ac.start; @@ -844,8 +776,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_008() runs on Tester system CseSystem { 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_REG_CRE_008()); @@ -902,7 +832,7 @@ module OneM2M_Testcases_CSE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & ": AE Announced UPDATE received"); f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive); - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))); } [] mccPortIn.receive(mw_request(mw_update)) { tc_ac.stop; @@ -930,8 +860,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_009() runs on Tester system CseSystem { 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_REG_CRE_009()); @@ -975,7 +903,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"}; v_request.primitiveContent.aEAnnc.link := PX_CSE1_ID & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID; - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1010,8 +938,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_010() 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_REG_CRE_010()); @@ -1046,7 +972,7 @@ module OneM2M_Testcases_CSE_Release_1 { //TODO Deregister //f_cse_deleteResource(v_aeIndex); v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); //Test Body f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource))); @@ -1094,8 +1020,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_011() 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_REG_CRE_011()); @@ -1123,7 +1047,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1166,8 +1090,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.labels := {"labels"}; v_ae1.start(f_CSE_REG_CRE_012(v_create)); v_ae1.done; @@ -1176,8 +1098,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_create.primitiveContent.aE.appName := "AeAppName"; v_ae1.start(f_CSE_REG_CRE_012(v_create)); @@ -1187,9 +1107,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS}; + v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}; v_ae1.start(f_CSE_REG_CRE_012(v_create)); v_ae1.done; } @@ -1207,9 +1125,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; const AttributeAux c_optionalAttribute := {"labels", omit}; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - + v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"}; v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute)); @@ -1222,8 +1138,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; const AttributeAux c_optionalAttribute := {"cseType", omit}; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_createRequest.primitiveContent.remoteCSE.cseType := int1; @@ -1236,10 +1150,8 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; const AttributeAux c_optionalAttribute := {"pointOfAccess", omit}; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"}; + v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute)); v_cse1.done; @@ -1251,8 +1163,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; const AttributeAux c_optionalAttribute := {"nodeLink", omit}; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID; @@ -1270,8 +1180,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_016() 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_REG_CRE_016()); @@ -1301,7 +1209,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) { @@ -1342,8 +1250,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.aE.app_ID := omit; //Mandatory app_ID field is being set empty v_ae1.start(f_CSE_REG_CRE_017(v_createRequest)); @@ -1355,8 +1261,6 @@ module OneM2M_Testcases_CSE_Release_1 { // Local variables var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM); - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.aE.requestReachability := omit; //Mandatory requestReachability field is being set empty v_ae1.start(f_CSE_REG_CRE_017(v_createRequest)); @@ -1373,8 +1277,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_018() runs on Tester system CseSystem { 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_REG_CRE_018()); @@ -1402,7 +1304,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -1439,8 +1341,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_019() runs on Tester system CseSystem { 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_REG_CRE_019()); @@ -1468,7 +1368,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { @@ -1501,8 +1401,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_021() 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_REG_CRE_021()); @@ -1532,7 +1430,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(v_resourceType, m_createCSEBaseBase, -1); v_request.from_ := f_getOriginator(v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) { @@ -1563,8 +1461,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_022() 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_REG_CRE_022()); @@ -1590,7 +1486,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -1631,8 +1527,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_023() 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_REG_CRE_023()); @@ -1662,7 +1556,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) { @@ -1693,8 +1587,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_024() runs on Tester system CseSystem { 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_REG_CRE_024()); @@ -1750,7 +1642,7 @@ module OneM2M_Testcases_CSE_Release_1 { } v_response.from_ := PX_CSE1_ID; v_response.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response))); tc_ac.start(10.0); repeat; } @@ -1775,8 +1667,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_025() runs on Tester system CseSystem { 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_REG_CRE_025()); @@ -1802,7 +1692,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Preamble v_request := f_getCreateRequestPrimitive(int16, m_createRemoteCSEBase, -1); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); // Test Body tc_ac.start; @@ -1846,8 +1736,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template RequestPrimitive v_request := mw_createRemoteCSE; var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName"; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED"; v_request.primitiveContent.remoteCSE.resourceName := ?; v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action)); @@ -1859,8 +1747,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template RequestPrimitive v_request := mw_createRemoteCSE; var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime"; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345"; v_request.primitiveContent.remoteCSE.expirationTime := ?; v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action)); @@ -1872,8 +1758,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template RequestPrimitive v_request := mw_createRemoteCSE; var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels"; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"}; v_request.primitiveContent.remoteCSE.labels := ?; v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action)); @@ -1885,8 +1769,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template RequestPrimitive v_request := mw_createRemoteCSE; var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess"; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; + v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"}; v_request.primitiveContent.remoteCSE.pointOfAccess := ?; v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action)); @@ -1898,8 +1781,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template RequestPrimitive v_request := mw_createRemoteCSE; var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink"; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED"; v_request.primitiveContent.remoteCSE.nodeLink := ?; v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action)); @@ -1911,8 +1792,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; var template RequestPrimitive v_request := mw_createRemoteCSE; var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType"; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED" v_request.primitiveContent.remoteCSE.cseType := ?; v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action)); @@ -1928,8 +1807,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_CRE_027() runs on Tester system CseSystem { 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_REG_CRE_027()); @@ -1987,8 +1864,7 @@ module OneM2M_Testcases_CSE_Release_1 { var RequestPrimitive v_request; var template PrimitiveContent v_contentResponse; var Labels v_labels_1 := {"VALUE_1"}; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; + v_request := valueof(m_createRemoteCSEBase); v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE v_request.primitiveContent.remoteCSE.labels := v_labels_1; @@ -2008,15 +1884,14 @@ module OneM2M_Testcases_CSE_Release_1 { 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.primitiveContent.remoteCSE.cseType := int2; //MN_CSE - v_request.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"}; + v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; v_contentResponse.remoteCSE.cseType := int2; //MN_CSE - v_contentResponse.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"}; + v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse)); v_cse1.done; @@ -2029,8 +1904,7 @@ module OneM2M_Testcases_CSE_Release_1 { 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.primitiveContent.remoteCSE.cseType := int2; //MN_CSE v_request.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID; @@ -2057,11 +1931,8 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_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_REG_RET_001()); - v_ae1.done; } @@ -2086,7 +1957,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_contentResponse.cSEBase := mw_contentCSEBase_rc1; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID tc_ac.start; alt { @@ -2130,8 +2001,7 @@ module OneM2M_Testcases_CSE_Release_1 { 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.cSEBase := mw_contentCSEBase_rc1; v_contentResponse.cSEBase.cseType := ?; @@ -2143,8 +2013,7 @@ module OneM2M_Testcases_CSE_Release_1 { //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.cSEBase := mw_contentCSEBase_rc1; v_contentResponse.cSEBase.nodeLink := ?; @@ -2162,8 +2031,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_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_REG_RET_003()); v_ae1.done; @@ -2189,7 +2057,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_contentResponse.aE := mw_contentAeBase; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID tc_ac.start; alt { @@ -2236,8 +2104,7 @@ module OneM2M_Testcases_CSE_Release_1 { 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_createRequest.primitiveContent.aE.labels := v_labels_1; v_contentResponse.aE := mw_contentAeBase; @@ -2253,8 +2120,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + v_createRequest.primitiveContent.aE.appName := "AeAppName"; v_contentResponse.aE := mw_contentAeBase; @@ -2269,9 +2135,8 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM); var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_createRequest.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS}; + + v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)}; v_contentResponse.aE := mw_contentAeBase; v_contentResponse.aE.pointOfAccess := ?; @@ -2289,8 +2154,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_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_REG_RET_005()); v_ae1.done; @@ -2318,7 +2182,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_contentResponse_IN.cSEBase := mw_contentCSEBase_rc1; v_contentResponse_IN.cSEBase.cseType := int1; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID tc_ac.start; alt { @@ -2373,9 +2237,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_006() runs on Tester system CseSystem { 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_REG_RET_006()); v_cse1.done; @@ -2447,8 +2309,7 @@ module OneM2M_Testcases_CSE_Release_1 { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; var template PrimitiveContent v_contentResponse; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; + v_createRequest.primitiveContent.remoteCSE.labels := v_labels_1; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; @@ -2464,8 +2325,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; var template PrimitiveContent v_contentResponse; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; + v_createRequest.primitiveContent.remoteCSE.cseType := int1; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; @@ -2481,9 +2341,8 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; var template PrimitiveContent v_contentResponse; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"}; + + v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; v_contentResponse.remoteCSE.pointOfAccess := ?; @@ -2498,8 +2357,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; var template PrimitiveContent v_contentResponse; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; + v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID; v_contentResponse.remoteCSE := mw_contentRemoteCSEBase; @@ -2518,9 +2376,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_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_REG_RET_008()); v_ae1.done; @@ -2547,7 +2403,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_contentResponse.cSEBase := mw_contentCSEBase_rc1; - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID tc_ac.start; alt { @@ -2599,13 +2455,9 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_009() runs on Tester system CseSystem { 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_REG_RET_009()); - v_cse1.done; - } function f_CSE_REG_RET_009() runs on CseSimu { @@ -2655,7 +2507,7 @@ module OneM2M_Testcases_CSE_Release_1 { } v_response.from_ := PX_CSE1_ID; v_response.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response))); } [] mccPortIn.receive(mw_request(?)) { tc_ac.stop; @@ -2680,11 +2532,8 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_RET_010() runs on Tester system CseSystem { 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_REG_RET_010()); - v_cse1.done; } @@ -2751,9 +2600,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_UPD_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_REG_UPD_001()); v_ae1.done; @@ -2782,7 +2629,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest.primitiveContent.cSEBase.labels := v_labels_1; v_request := f_getUpdateRequestPrimitive(int5, c_cseBaseIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) { @@ -2817,9 +2664,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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.labels := {"MyLabel"}; v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest)); @@ -2831,10 +2676,8 @@ module OneM2M_Testcases_CSE_Release_1 { // 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.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"}; + v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest)); v_cse1.done; @@ -2845,9 +2688,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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.nodeLink := c_defaultNodeID; v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest)); @@ -2868,9 +2709,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var AttributeList c_optionalAttribute; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - + v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"}; c_optionalAttribute := {"labels"}; @@ -2884,10 +2723,8 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var AttributeList c_optionalAttribute; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - - v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"}; + + v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)}; c_optionalAttribute := {"pointofAccess"}; v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute)); @@ -2900,9 +2737,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var AttributeList c_optionalAttribute; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; - + v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID; c_optionalAttribute := {"nodeLink"}; @@ -2916,9 +2751,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var AttributeList c_optionalAttribute; 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"; c_optionalAttribute := {"expirationTime"}; @@ -2932,9 +2765,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var AttributeList c_optionalAttribute; 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; c_optionalAttribute := {"requestReachability"}; @@ -2956,9 +2787,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_DEL_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_REG_DEL_001()); v_ae1.done; @@ -2983,7 +2812,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := valueof(m_delete(f_getResourceAddress(), f_getOriginator())); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) { @@ -3014,11 +2843,8 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_DEL_002() runs on Tester system CseSystem { 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_REG_DEL_002()); - v_cse1.done; } @@ -3039,7 +2865,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))); - mccPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mccPort.receive(mw_response(mw_responsePrimitive(int2002))) { @@ -3082,11 +2908,8 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_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_REG_DEL_003()); - v_ae1.done; } @@ -3108,7 +2931,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) { @@ -3144,9 +2967,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_REG_DEL_004() runs on Tester system CseSystem { 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_REG_DEL_004()); v_cse1.done; @@ -3200,7 +3021,7 @@ module OneM2M_Testcases_CSE_Release_1 { } v_response.from_ := PX_CSE1_ID; v_response.to_ := v_request.primitive.requestPrimitive.from_; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response))); } [] mccPortIn.receive(mw_request(?)) { tc_ac.stop; @@ -3238,8 +3059,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; 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.container.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container @@ -3258,8 +3077,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; 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.container.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container @@ -3281,16 +3098,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; 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.container.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase));//Container v_ae1.done; - - if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){ setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided"); @@ -3304,8 +3117,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createGroupBase; 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.group_.resourceName := omit; @@ -3327,8 +3138,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createGroupBase; 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.group_.resourceName := omit; @@ -3350,8 +3159,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createAcpBase; 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.accessControlPolicy.resourceName := omit; @@ -3373,8 +3180,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createAcpBase; 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.accessControlPolicy.resourceName := omit; @@ -3396,8 +3201,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; 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.subscription.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription @@ -3418,8 +3221,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; 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.subscription.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription @@ -3440,8 +3241,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; 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.subscription.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription @@ -3462,8 +3261,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; 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.subscription.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription @@ -3483,8 +3280,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var CseSimu v_cse1 := CseSimu.create("CSE1") alive; - v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1)); - v_cse1.done; v_createRequest.primitiveContent.subscription.resourceName := omit; v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription @@ -3504,8 +3299,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; 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.contentInstance.resourceName := omit; v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance @@ -3534,9 +3327,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int3, m_createContainerBase));//container v_ae1.done; @@ -3558,9 +3349,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int9, m_createGroupBase));//group v_ae1.done; @@ -3581,9 +3370,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int1, m_createAcpBase ));//accessControlPolicy v_ae1.done; @@ -3604,9 +3391,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int23, m_createSubscriptionBase));//Subscription v_ae1.done; @@ -3634,9 +3419,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_003_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_003(int3, m_createContainerBase));//container v_ae1.done; } @@ -3645,9 +3428,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int9, m_createGroupBase));//group v_ae1.done; } @@ -3656,9 +3437,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int1, m_createAcpBase));//accessControlPolicy v_ae1.done; } @@ -3667,9 +3446,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } @@ -3686,9 +3463,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int3, m_createContainerBase));//container v_ae1.done; } @@ -3697,9 +3472,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int9, m_createGroupBase));//group v_ae1.done; } @@ -3708,9 +3481,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int1, m_createAcpBase));//accessControlPolicy v_ae1.done; } @@ -3719,9 +3490,7 @@ module OneM2M_Testcases_CSE_Release_1 { // 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(int23, m_createSubscriptionBase));//Subscription v_ae1.done; } @@ -3739,9 +3508,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid; var AttributeAux v_invalidAttribute; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - + v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1; v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"}; @@ -3754,8 +3521,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid; var AttributeAux v_invalidAttribute; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1; v_invalidAttribute := {name := "maxByteSize", value_ := "-1"}; @@ -3770,8 +3535,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid; var AttributeAux v_invalidAttribute; var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1; v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"}; @@ -3794,8 +3557,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; 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; @@ -3814,8 +3575,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; 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; @@ -3835,8 +3594,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; 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; @@ -3859,8 +3616,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_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_DMR_CRE_007()); @@ -3899,7 +3654,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //ContentInstance 2 v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -3944,8 +3699,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_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_DMR_CRE_008()); @@ -3986,7 +3739,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -4031,8 +3784,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_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_DMR_CRE_009()); @@ -4064,7 +3815,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))))); v_contentResponse.container := mw_contentContainerBase; @@ -4111,8 +3862,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_010() 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_DMR_CRE_010()); @@ -4145,7 +3894,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { @@ -4191,8 +3940,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_011() 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_DMR_CRE_011()); @@ -4225,7 +3972,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { @@ -4275,8 +4022,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"}; v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute)); @@ -4288,8 +4033,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeList c_optionalAttribute := {"labels"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.labels := {"MyLabel"}; v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute)); @@ -4302,8 +4045,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeList c_optionalAttribute := {"maxNrOfInstances"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.maxNrOfInstances := 0; v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute)); @@ -4316,8 +4057,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeList c_optionalAttribute := {"maxByteSize"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.maxByteSize := 0; v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute)); @@ -4330,8 +4069,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeList c_optionalAttribute := {"maxInstanceAge"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.maxInstanceAge := 0; v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute)); @@ -4344,8 +4081,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContainerBase; var AttributeList v_optionalAttribute := {"creator"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.creator := "NullValue"; v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, v_optionalAttribute)); @@ -4358,8 +4093,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeList c_optionalAttribute := {"labels"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"}; v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute)); @@ -4372,8 +4105,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContentInstanceBase; var AttributeList v_optionalAttribute := {"creator"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.contentInstance.creator := "NullValue"; v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, v_optionalAttribute)); @@ -4386,8 +4117,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeList c_optionalAttribute := {"contentInfo"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo"; v_ae1.start(f_CSE_DMR_CRE_012(int4, v_createRequest, c_optionalAttribute)); @@ -4400,8 +4129,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createAcpBase; const AttributeList c_optionalAttribute := {"labels"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"}; v_ae1.start(f_CSE_DMR_CRE_012(int1, v_createRequest, c_optionalAttribute)); @@ -4414,8 +4141,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"}; v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute)); @@ -4427,8 +4152,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeList c_optionalAttribute := {"labels"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.subscription.labels := {"MyLabel"}; v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute)); @@ -4441,8 +4164,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var AttributeList v_optionalAttribute := {"creator"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.subscription.creator := "NullValue"; v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, v_optionalAttribute)); @@ -4459,8 +4180,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_CRE_013() 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_DMR_CRE_013()); @@ -4493,7 +4212,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response { @@ -4535,8 +4254,6 @@ module OneM2M_Testcases_CSE_Release_1 { var ResponsePrimitive v_responsePrimitive; var AeSimu v_ae1 := AeSimu.create("AE1") alive; const integer c_maxByteSize := 512; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_parentResourceRequest.primitiveContent.container.maxByteSize := c_maxByteSize; v_ae1.start(f_CSE_DMR_CRE_014(int3, v_parentResourceRequest, int4, v_childResourceRequest)); @@ -4562,8 +4279,6 @@ module OneM2M_Testcases_CSE_Release_1 { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.container := mw_contentContainer_rc1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_RET_001(int3, m_createContainerBase, v_contentResponse));//Container v_ae1.done; @@ -4574,8 +4289,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.group_ := mw_contentGroup_rc1; v_ae1.start(f_CSE_DMR_RET_001(int9, m_createGroupBase, v_contentResponse));//Group @@ -4588,8 +4301,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.accessControlPolicy := mw_contentAcp_rc1; v_ae1.start(f_CSE_DMR_RET_001(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy @@ -4605,8 +4316,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template PrimitiveContent v_contentResponse; v_contentResponse.subscription := mw_contentSubscription_rc1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_RET_001(int23, m_createSubscriptionBase, v_contentResponse));//Subscription v_ae1.done; @@ -4618,8 +4327,6 @@ module OneM2M_Testcases_CSE_Release_1 { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_contentResponse.contentInstance := mw_contentContentInstance_rc1; v_ae1.start(f_CSE_DMR_RET_001(int4, m_createContentInstanceBase, v_contentResponse));//ContentInstance @@ -4639,8 +4346,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_003_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_RET_003(int3, m_createContainerBase));//Container v_ae1.done; @@ -4649,8 +4354,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_003_GRP() 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_003(int9, m_createGroupBase));//Group v_ae1.done; @@ -4661,8 +4364,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_requestPrimitive := m_createAcpBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61; v_ae1.start(f_CSE_DMR_RET_003(int1, v_requestPrimitive));//AccessControlPolicy @@ -4672,8 +4373,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_003_SUB() 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_003(int23, m_createSubscriptionBase));//Subscription v_ae1.done; @@ -4688,8 +4387,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_010() 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_DMR_RET_010()); @@ -4725,7 +4422,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName; // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))))); tc_ac.start; alt { @@ -4765,8 +4462,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_012() 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_DMR_RET_012()); @@ -4804,7 +4499,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))))); tc_ac.start; alt { @@ -4847,8 +4542,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_rc1; v_ae1.start(f_CSE_DMR_RET_013(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy @@ -4860,8 +4553,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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.aE := mw_contentAeBase; v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM), v_contentResponse));//AE @@ -4873,8 +4564,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_rc1; v_ae1.start(f_CSE_DMR_RET_013(int3, m_createContainerBase, v_contentResponse));//Container @@ -4886,8 +4575,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_rc1; v_ae1.start(f_CSE_DMR_RET_013(int9, m_createGroupBase, v_contentResponse));//Group @@ -4899,8 +4586,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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.remoteCSE := mw_contentRemoteCSEBase; v_ae1.start(f_CSE_DMR_RET_013(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE @@ -4912,8 +4597,6 @@ module OneM2M_Testcases_CSE_Release_1 { // 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_rc1; v_ae1.start(f_CSE_DMR_RET_013(int23, m_createSubscriptionBase, v_contentResponse));//Subscription @@ -4934,8 +4617,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_requestPrimitive := m_createAcpBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61; v_ae1.start(f_CSE_DMR_RET_014(int1, v_requestPrimitive));//AccessControlPolicy @@ -4945,8 +4626,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_014_AE() 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_014(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM)));//AE v_ae1.done; @@ -4955,8 +4634,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_014_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_RET_014(int3, m_createContainerBase));//Container v_ae1.done; @@ -4965,8 +4642,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_014_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_DMR_RET_014(int16, m_createRemoteCSEBase));//RemoteCSE v_ae1.done; @@ -4976,8 +4651,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_014_GRP() 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_014(int9, m_createGroupBase));//Group v_ae1.done; @@ -4986,8 +4659,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_RET_014_SUB() runs on AeSimu 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_014(int23, m_createSubscriptionBase));//Subscription v_ae1.done; @@ -5014,8 +4685,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_updateRequest := m_updateContainerBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.labels := v_labels_1; v_updateRequest.primitiveContent.container.labels := v_labels_2; @@ -5055,8 +4724,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.group_.labels := v_labels_1; v_updateRequest.primitiveContent.group_.labels := v_labels_2; @@ -5096,8 +4763,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1; v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2; @@ -5137,8 +4802,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.subscription.labels := v_labels_1; v_updateRequest.primitiveContent.subscription.labels := v_labels_2; @@ -5185,8 +4848,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; 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_002(int3, m_createContainerBase, v_updateRequest));//Container @@ -5223,8 +4884,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group @@ -5261,8 +4920,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy @@ -5299,8 +4956,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.subscription.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription @@ -5348,8 +5003,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_updateRequest := m_updateContainerBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.labels := v_labels_1; v_updateRequest.primitiveContent.container.labels := v_labels_2; @@ -5396,8 +5049,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createGroupBase; var template RequestPrimitive v_updateRequest := m_updateGroupBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.group_.labels := v_labels_1; v_updateRequest.primitiveContent.group_.labels := v_labels_2; @@ -5442,8 +5093,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createAcpBase; var template RequestPrimitive v_updateRequest := m_updateAcpBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1; v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2; @@ -5488,8 +5137,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.subscription.labels := v_labels_1; v_updateRequest.primitiveContent.subscription.labels := v_labels_2; @@ -5541,8 +5188,6 @@ module OneM2M_Testcases_CSE_Release_1 { var ResponsePrimitive v_responsePrimitive; var AttributeAux_list v_nullFields; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.container.labels := v_labels_1;//Attribute 3 v_updateRequest.primitiveContent.container.expirationTime := "20301231T012345";//Attribute 1 v_updateRequest.primitiveContent.container.maxNrOfInstances := 5;//Attribute 2 @@ -5669,8 +5314,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3 v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {};//Attribute 2 v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfprivileges_2; //Attribute 1 @@ -5733,8 +5376,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3 v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1 v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getCompletePoA()};//Attribute 2 @@ -5794,8 +5435,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_createRequest.primitiveContent.subscription.expirationCounter := 10;//Attribute 3 v_updateRequest.primitiveContent.subscription.expirationTime := "20301231T012345";//Attribute 1 v_updateRequest.primitiveContent.subscription.labels := v_labels_1;//Attribute 2 @@ -5855,8 +5494,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_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_DMR_UPD_005()); @@ -5896,7 +5533,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getUpdateRequestPrimitive(v_resourceType, v_aeIndex, v_updateRequest); v_request.to_ := v_targetResourceAddress; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -5938,8 +5575,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateContainerBase; 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_006(int3, m_createContainerBase, v_updateRequest));//Container @@ -5962,8 +5597,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group @@ -5987,8 +5620,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var template RequestPrimitive v_requestPrimitive := m_createAcpBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59; v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1; @@ -6013,8 +5644,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.subscription.labels := v_labels_1; v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription @@ -6045,8 +5674,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Timestamp v_creationTime := "21001231T012345"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid}; v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime; @@ -6070,8 +5697,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Timestamp v_creationTime := "21001231T012345"; var template RequestPrimitive v_updateRequest := m_updateGroupBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid}; v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime; @@ -6095,8 +5720,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Timestamp v_creationTime := "21001231T012345"; var template RequestPrimitive v_updateRequest := m_updateAcpBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid}; v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime; @@ -6120,8 +5743,6 @@ module OneM2M_Testcases_CSE_Release_1 { var Timestamp v_creationTime := "21001231T012345"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid}; v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime; @@ -6154,8 +5775,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var AttributeAux_list v_nullFields; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_nullFields := {{"maxNrOfMembers", omit}}; v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1; @@ -6181,8 +5800,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var AttributeAux_list v_nullFields; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_nullFields := {{"selfPrivileges", omit}}; v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges; @@ -6207,8 +5824,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var AttributeAux_list v_nullFields; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_nullFields := {{"notificationURI", omit}}; v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"}; @@ -6241,8 +5856,6 @@ module OneM2M_Testcases_CSE_Release_1 { var XSD.PositiveInteger v_expirationCounter := 1; 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_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid}; v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter; @@ -6257,8 +5870,6 @@ module OneM2M_Testcases_CSE_Release_1 { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_createRequest := m_createGroupBase; var template RequestPrimitive v_updateRequest := m_updateGroupBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid}; v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter; @@ -6273,8 +5884,6 @@ module OneM2M_Testcases_CSE_Release_1 { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_createRequest := m_createAcpBase; var template RequestPrimitive v_updateRequest := m_updateAcpBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid}; v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter; @@ -6289,8 +5898,6 @@ module OneM2M_Testcases_CSE_Release_1 { var XSD.NonNegativeInteger v_maxNrOfInstances := 5; var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid}; v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances; @@ -6341,7 +5948,7 @@ module OneM2M_Testcases_CSE_Release_1 { f_cse_updateResource(int3, v_containerIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))))); tc_ac.start; alt { @@ -6421,7 +6028,7 @@ module OneM2M_Testcases_CSE_Release_1 { //Test Body v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { @@ -6506,7 +6113,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest; //<latest> - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { @@ -6591,7 +6198,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest; //<oldest> - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { @@ -6639,8 +6246,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.labels := v_labels_1; v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2; @@ -6671,8 +6276,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.accessControlPolicyIDs := v_accessControlPolicyIDs_1; v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2; @@ -6702,8 +6305,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.labels := v_labels_1; v_updateRequest.primitiveContent.container.labels := v_labels_2; @@ -6733,8 +6334,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.maxByteSize := v_maxByteSize_1; v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2; @@ -6764,8 +6363,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.maxInstanceAge := v_maxInstanceAge_1; v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2; @@ -6795,8 +6392,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.maxNrOfInstances := v_maxNrOfInstances_1; v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2; @@ -6825,8 +6420,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2; @@ -6856,8 +6449,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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.labels := v_labels_1; v_updateRequest.primitiveContent.subscription.labels := v_labels_2; @@ -6893,8 +6484,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.remoteCSE.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE @@ -6963,8 +6552,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink; v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE @@ -6998,8 +6585,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.aE.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE @@ -7033,8 +6618,6 @@ module OneM2M_Testcases_CSE_Release_1 { var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest, true));//AE v_ae1.done; @@ -7068,8 +6651,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.aE.appName := v_appName; v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE v_ae1.done; @@ -7102,8 +6683,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList; v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE v_ae1.done; @@ -7136,8 +6715,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container @@ -7171,8 +6748,6 @@ module OneM2M_Testcases_CSE_Release_1 { var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container v_ae1.done; @@ -7206,8 +6781,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances; v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container @@ -7241,8 +6814,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize; v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container @@ -7276,8 +6847,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge; v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container @@ -7311,8 +6880,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy @@ -7346,8 +6913,6 @@ module OneM2M_Testcases_CSE_Release_1 { var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription v_ae1.done; @@ -7381,8 +6946,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.subscription.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -7415,8 +6978,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.labels := v_labels; v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -7449,8 +7010,6 @@ module OneM2M_Testcases_CSE_Release_1 { var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group v_ae1.done; @@ -7484,8 +7043,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs; v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -7518,8 +7075,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.groupName := v_groupName; v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -7559,8 +7114,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime; v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE @@ -7594,8 +7147,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability; v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE @@ -7627,8 +7178,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime; v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE @@ -7662,8 +7211,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability; v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE @@ -7697,8 +7244,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime; v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container @@ -7732,8 +7277,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime; v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy @@ -7767,8 +7310,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1; v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -7801,8 +7342,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1; v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -7835,8 +7374,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime; v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription @@ -7906,8 +7443,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType; v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription @@ -7941,8 +7476,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime; v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group @@ -7976,8 +7509,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers; v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group @@ -8011,8 +7542,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs; v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group @@ -8055,8 +7584,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_001_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_DEL_001(int3, m_createContainerBase));//Container v_ae1.done; @@ -8069,8 +7596,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_001_GRP() 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(int9, m_createGroupBase));//Group v_ae1.done; @@ -8079,8 +7604,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_001_ACP() 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(int1, m_createAcpBase));//AccessControlPolicy v_ae1.done; @@ -8089,8 +7612,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_001_SUB() 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(int23, m_createSubscriptionBase));//Subscription v_ae1.done; @@ -8099,8 +7620,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_001_CIN() runs on AeSimu 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(int4, m_createContentInstanceBase));//ContentInstance v_ae1.done; @@ -8117,8 +7636,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_002_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_DEL_002(int3, m_createContainerBase));//Container v_ae1.done; @@ -8127,8 +7644,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_002_GRP() 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_002(int9, m_createGroupBase));//Group v_ae1.done; @@ -8137,8 +7652,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_002_ACP() 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_002(int1, m_createAcpBase));//AccessControlPolicy v_ae1.done; @@ -8147,8 +7660,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DMR_DEL_002_SUB() 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_002(int23, m_createSubscriptionBase));//Subscription v_ae1.done; @@ -8199,7 +7710,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))))); tc_ac.start; alt { @@ -8222,7 +7733,7 @@ module OneM2M_Testcases_CSE_Release_1 { - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -8373,7 +7884,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { @@ -8395,7 +7906,7 @@ module OneM2M_Testcases_CSE_Release_1 { f_checkAeSimuStatus(); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))))); tc_ac.start; alt { @@ -8467,7 +7978,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { @@ -8489,7 +8000,7 @@ module OneM2M_Testcases_CSE_Release_1 { f_checkAeSimuStatus(); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))))); tc_ac.start; alt { @@ -8529,8 +8040,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SUB_CRE_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_CRE_002()); @@ -8565,7 +8074,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -8609,8 +8118,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SUB_CRE_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_CRE_003()); @@ -8639,7 +8146,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request.primitiveContent.subscription.notificationURI := {"NotReachableNotificationURI"}; // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED @@ -8683,8 +8190,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SUB_CRE_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_CRE_004()); @@ -8747,8 +8252,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SUB_CRE_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_CRE_005()); @@ -8792,7 +8295,7 @@ module OneM2M_Testcases_CSE_Release_1 { vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -8832,8 +8335,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SUB_UPD_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_UPD_001()); @@ -8879,7 +8380,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request v_request.primitiveContent.aE.labels := v_labels_1; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -8920,8 +8421,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SUB_DEL_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_DEL_001()); @@ -8967,7 +8466,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_notificationContent.notificationEvent := omit; vc_ae2.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_notificationContent)); // check that no notification is received - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { @@ -9022,8 +8521,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_CRE_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_SEC_ACP_CRE_001()); @@ -9062,7 +8559,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -9107,8 +8604,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_CRE_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_SEC_ACP_CRE_002()); @@ -9147,7 +8642,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);// CSE child resource - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -9193,8 +8688,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_CRE_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_SEC_ACP_CRE_003()); @@ -9226,7 +8719,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_contentResponse))) -> value v_response { @@ -9278,8 +8771,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_CRE_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_SEC_ACP_CRE_004()); @@ -9307,7 +8798,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { @@ -9357,8 +8848,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_UPD_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_SEC_ACP_UPD_001()); @@ -9407,7 +8896,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)}; v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -9451,8 +8940,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_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_SEC_ACP_UPD_002()); @@ -9501,7 +8988,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)}; v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { @@ -9550,8 +9037,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_001_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_001(m_createContainerBase)); v_ae1.done; @@ -9561,9 +9046,7 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.aE.labels := v_labels_1; + v_updateRequest.primitiveContent.aE.labels := v_labels_1; v_ae1.start(f_CSE_SEC_ACP_001(v_updateRequest)); v_ae1.done; @@ -9571,8 +9054,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_001_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_001(m_retrieve("Temporary", "Temporary"))); v_ae1.done; @@ -9580,8 +9061,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_001_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_001(m_delete("Temporary", "Temporary"))); v_ae1.done; @@ -9597,8 +9076,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_002_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_002(m_createContainerBase, int2001)); v_ae1.done; @@ -9610,25 +9087,19 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_002(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_002(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_002_UPD testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_002(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; }//end TC_CSE_SEC_ACP_002_RET testcase TC_CSE_SEC_ACP_002_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_002(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9644,8 +9115,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_003_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_003(m_createContainerBase, int2001)); v_ae1.done; @@ -9656,9 +9125,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.aE.labels := v_labels_1; + v_updateRequest.primitiveContent.aE.labels := v_labels_1; v_ae1.start(f_CSE_SEC_ACP_003(v_updateRequest, int2004)); v_ae1.done; @@ -9666,8 +9133,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_003_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_003(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9675,8 +9140,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_003_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_003(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9692,8 +9155,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_004_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_004(m_createContainerBase, int2001)); v_ae1.done; @@ -9704,9 +9165,7 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_updateRequest.primitiveContent.aE.labels := v_labels_1; + v_updateRequest.primitiveContent.aE.labels := v_labels_1; v_ae1.start(f_CSE_SEC_ACP_004(v_updateRequest, int2004)); v_ae1.done; @@ -9714,8 +9173,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_004_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_004(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9723,8 +9180,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_004_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_004(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9740,8 +9195,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_005_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_005(m_createContainerBase, int2001)); v_ae1.done; @@ -9753,16 +9206,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_005(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_005(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_005_UPD testcase TC_CSE_SEC_ACP_005_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_005(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9770,8 +9219,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_005_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_005(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9788,9 +9235,7 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_006_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_006(m_createContainerBase, int2001)); + v_ae1.start(f_CSE_SEC_ACP_006(m_createContainerBase, int2001)); v_ae1.done; }//end TC_CSE_SEC_ACP_006_CRE @@ -9800,16 +9245,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_006(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_006(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_006_UPD testcase TC_CSE_SEC_ACP_006_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_006(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9817,8 +9258,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_006_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_006(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9834,8 +9273,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_007_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_007(m_createContainerBase, int2001)); v_ae1.done; @@ -9847,16 +9284,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_007(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_007(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_007_UPD testcase TC_CSE_SEC_ACP_007_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_007(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9864,8 +9297,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_007_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_007(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9881,8 +9312,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_008_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_008(m_createContainerBase, int2001)); v_ae1.done; @@ -9894,16 +9323,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_008(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_008(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_008_UPD testcase TC_CSE_SEC_ACP_008_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_008(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9911,8 +9336,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_008_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_008(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9928,8 +9351,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_009_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_009(m_createContainerBase, int2001)); v_ae1.done; @@ -9941,16 +9362,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_009(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_009(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_009_UPD testcase TC_CSE_SEC_ACP_009_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_009(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -9958,8 +9375,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_009_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_009(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -9975,8 +9390,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_010_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_010(m_createContainerBase, int2001)); v_ae1.done; @@ -9988,25 +9401,19 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.aE.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_010(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_010(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_010_UPD testcase TC_CSE_SEC_ACP_010_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_010(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; }//end TC_CSE_SEC_ACP_010_RET testcase TC_CSE_SEC_ACP_010_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_010(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -10022,8 +9429,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_011_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_011(m_createContainerBase, int2001)); v_ae1.done; @@ -10035,16 +9440,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.container.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_011(v_updateRequest, int2004)); + v_ae1.start(f_CSE_SEC_ACP_011(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_SEC_ACP_011_UPD testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_011(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -10052,8 +9453,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_011_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_011(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -10069,8 +9468,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_SEC_ACP_012_CRE() runs on Tester system CseSystem { //Create 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_SEC_ACP_012(m_createContainerBase, int62)); v_ae1.done; @@ -10082,16 +9479,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.container.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - v_ae1.start(f_CSE_SEC_ACP_012(v_updateRequest, int59)); + v_ae1.start(f_CSE_SEC_ACP_012(v_updateRequest, int59)); v_ae1.done; }//end TC_CSE_SEC_ACP_012_UPD testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve 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_SEC_ACP_012(m_retrieve("Temporary", "Temporary"), int61)); v_ae1.done; @@ -10099,8 +9492,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_SEC_ACP_012_DEL() runs on Tester system CseSystem { //Delete 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_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55)); v_ae1.done; @@ -10123,8 +9514,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_001()); @@ -10153,7 +9542,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responseDiscovery)){ @@ -10187,8 +9576,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_002()); @@ -10221,7 +9608,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequest.primitiveContent.container.labels := v_labels; v_childResourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_resourceIndex); v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response { @@ -10261,8 +9648,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_003()); @@ -10294,7 +9679,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); //v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1)); v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response { @@ -10334,8 +9719,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_004()); @@ -10366,7 +9749,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); v_request := valueof(m_retrieveDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int2, int1)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response { @@ -10407,8 +9790,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_005()); @@ -10447,7 +9828,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_resourceIndex := f_cse_createResource(c_containerResourceType, v_requestPrimitive, v_aeIndex); v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) { @@ -10481,8 +9862,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_006()); @@ -10514,7 +9893,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1)); } - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -10549,8 +9928,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_007()); @@ -10585,7 +9962,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_invalidFilterCriteria.sizeBelow := 1;//Whatever value, it will be overwritten by forceFields parameter v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), v_invalidFilterCriteria)); v_invalidAttribute := {name := "filterCriteria.sizeBelow", value_ := "-1"}; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {v_invalidAttribute}))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, {v_invalidAttribute}))); tc_ac.start; alt { @@ -10696,8 +10073,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_DIS_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_DIS_009()); @@ -10736,7 +10111,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_resourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex); v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_aeIndex), f_getOriginator(v_resourceIndex), int1, v_labels)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response { @@ -10782,8 +10157,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_001()); @@ -10826,7 +10199,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response { @@ -10871,8 +10244,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_002()); @@ -10914,7 +10285,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response { @@ -10957,8 +10328,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_003()); @@ -10989,7 +10358,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -11026,8 +10395,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_004()); @@ -11056,7 +10423,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -11095,8 +10462,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_005()); @@ -11125,7 +10490,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -11175,8 +10540,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_006()); @@ -11209,7 +10572,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { @@ -11259,8 +10622,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_CRE_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_GMG_CRE_007()); @@ -11293,7 +10654,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response { @@ -11332,8 +10693,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_RET_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_GMG_RET_001()); @@ -11384,7 +10743,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_resourceShortNameLatest; // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1))))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1))))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { @@ -11439,8 +10798,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_UPD_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_GMG_UPD_001()); @@ -11486,7 +10843,7 @@ module OneM2M_Testcases_CSE_Release_1 { // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response { @@ -11521,8 +10878,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_002()); @@ -11561,7 +10916,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); //Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -11617,8 +10972,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_003()); @@ -11653,7 +11006,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -11705,8 +11058,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_004()); @@ -11745,7 +11096,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); // Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -11813,8 +11164,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_005()); @@ -11854,7 +11203,7 @@ module OneM2M_Testcases_CSE_Release_1 { //Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -11924,8 +11273,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_006()); @@ -11963,7 +11310,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); //Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response { @@ -11997,8 +11344,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_007()); @@ -12047,7 +11392,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_memberIDs := v_memberIDs & {f_getResourceId(vc_resourcesList[v_containerIndex_3].resource)}; v_request.primitiveContent.group_.memberIDs := v_memberIDs; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response { @@ -12091,8 +11436,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_008()); @@ -12131,7 +11474,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); //Test Body - mcaPort.send(f_getMsgOutPrimitive(m_request(v_updateRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response { @@ -12175,8 +11518,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_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_GMG_UPD_009()); @@ -12229,7 +11570,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_updateRequest.primitiveContent.group_.memberIDs := {v_memberId_1, v_memberId_2}; v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -12289,8 +11630,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_UPD_010() 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_GMG_UPD_010()); @@ -12349,7 +11688,7 @@ module OneM2M_Testcases_CSE_Release_1 { v_request.to_ := f_getResourceAddress(v_remoteCSEIndex); //Content set to <remoteCSE> resource containing onlineStatus := false; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -12388,8 +11727,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_GMG_001_CRE() runs on Tester system CseSystem { //Create 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_GMG_001(m_createContainerBase, int2001)); v_ae1.done; @@ -12401,16 +11738,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.container.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_GMG_001(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_GMG_001_UPD testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve 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_GMG_001(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -12418,8 +11751,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_001_DEL() runs on Tester system CseSystem { //Delete 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_GMG_001(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -12435,8 +11766,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_GMG_002_CRE() runs on Tester system CseSystem { //Create 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_GMG_002(m_createContainerBase, int62)); //c_RUDNDi v_ae1.done; @@ -12448,16 +11777,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.container.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_GMG_002(v_updateRequest, int59));//c_CRDNDi v_ae1.done; }//end TC_CSE_GMG_002_UPD testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve 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_GMG_002(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi v_ae1.done; @@ -12465,8 +11790,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_002_DEL() runs on Tester system CseSystem { //Delete 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_GMG_002(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi v_ae1.done; @@ -12482,8 +11805,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_GMG_003_CRE() runs on Tester system CseSystem { //Create 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_GMG_003(m_createContainerBase, int2001)); v_ae1.done; @@ -12495,16 +11816,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.container.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_GMG_003(v_updateRequest, int2004)); v_ae1.done; }//end TC_CSE_GMG_003_UPD testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve 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_GMG_003(m_retrieve("Temporary", "Temporary"), int2000)); v_ae1.done; @@ -12512,8 +11829,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_003_DEL() runs on Tester system CseSystem { //Delete 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_GMG_003(m_delete("Temporary", "Temporary"), int2002)); v_ae1.done; @@ -12529,8 +11844,6 @@ module OneM2M_Testcases_CSE_Release_1 { */ testcase TC_CSE_GMG_004_CRE() runs on Tester system CseSystem { //Create 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_GMG_004(m_createContainerBase, int62)); //c_RUDNDi v_ae1.done; @@ -12542,16 +11855,12 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; v_updateRequest.primitiveContent.container.labels := v_labels_1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_GMG_004(v_updateRequest, int59));//c_CRDNDi v_ae1.done; }//end TC_CSE_GMG_004_UPD testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve 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_GMG_004(m_retrieve("Temporary", "Temporary"), int61));//c_CUDNDi v_ae1.done; @@ -12559,8 +11868,6 @@ module OneM2M_Testcases_CSE_Release_1 { testcase TC_CSE_GMG_004_DEL() runs on Tester system CseSystem { //Delete 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_GMG_004(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi v_ae1.done; @@ -12579,8 +11886,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template PrimitiveContent v_contentResponse; v_contentResponse.container := mw_contentContainer_rc1; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse)); v_ae1.done; }//end TC_CSE_GMG_005_CRE @@ -12591,8 +11896,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var template PrimitiveContent v_contentResponse; var Labels v_labels_1:= {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_contentResponse.container := mw_contentContainerBase; v_contentResponse.container.labels := ?; v_updateRequest.primitiveContent.container.labels := v_labels_1; @@ -12605,8 +11908,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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_contentContainerBase; v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse)); @@ -12617,8 +11918,6 @@ module OneM2M_Testcases_CSE_Release_1 { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template PrimitiveContent v_contentResponse; v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse)); v_ae1.done; }//end TC_CSE_GMG_005_DEL @@ -12635,8 +11934,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse)); @@ -12648,8 +11945,6 @@ module OneM2M_Testcases_CSE_Release_1 { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var template PrimitiveContent v_contentResponse; var Labels v_labels_1:= {"VALUE_1"}; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; v_contentResponse.container := mw_contentContainerBase; v_contentResponse.container.labels := ?; v_updateRequest.primitiveContent.container.labels := v_labels_1; @@ -12662,8 +11957,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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_contentContainerBase; v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse)); @@ -12674,8 +11967,6 @@ module OneM2M_Testcases_CSE_Release_1 { 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_contentContainerBase;// TODO see with wath should it be matched v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse)); diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn index 3227eeb646e3f5a0ec657635f283f6c69a906c3b..7c6d6cc439a875342c53eef67f2651a97081d80b 100644 --- a/OneM2M_Testcases_CSE_Release_2.ttcn +++ b/OneM2M_Testcases_CSE_Release_2.ttcn @@ -43,7 +43,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID)); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); t_ac.start; alt { @@ -3090,7 +3090,7 @@ module OneM2M_Testcases_CSE_Release_2 { vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler()); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, omit))) -> value v_response { @@ -3238,7 +3238,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Test Body v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -3315,7 +3315,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Test Body v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { @@ -3498,7 +3498,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -3583,7 +3583,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -3673,7 +3673,7 @@ module OneM2M_Testcases_CSE_Release_2 { f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -3766,7 +3766,7 @@ module OneM2M_Testcases_CSE_Release_2 { f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); - mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))))); tc_ac.start; alt { @@ -3852,7 +3852,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Test Body vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -4091,7 +4091,7 @@ module OneM2M_Testcases_CSE_Release_2 { // Test Body vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { @@ -4180,7 +4180,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request - mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_deleteRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { @@ -4266,7 +4266,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request - mcaPort.send(f_getMsgOutPrimitive(m_request(v_deleteRequest))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_deleteRequest))); tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { @@ -4391,7 +4391,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex); v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1))); v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID))); @@ -4430,7 +4430,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;//requestIdentifier of req2 v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2)); v_req3.from_ := f_getOriginator(v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req3))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3))); tc_ac.start; alt { @@ -4507,7 +4507,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_req2.from_ := PX_CSE1_ID; v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1))); tc_ac.start; alt { @@ -4540,7 +4540,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;//requestIdentifier of req2 v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2)); v_req3.from_ := f_getOriginator(v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req3))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3))); tc_ac.start; alt { @@ -4612,7 +4612,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex); v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1))); v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID))); @@ -4649,7 +4649,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier; v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2)); v_req3.from_ := f_getOriginator(v_aeIndex); - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req3))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3))); tc_ac.start; alt { @@ -4739,7 +4739,7 @@ module OneM2M_Testcases_CSE_Release_2 { //Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex))); v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 }; - mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response_rsp1))); + f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response_rsp1))); } [] tc_ac.timeout { setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel"); @@ -4851,7 +4851,7 @@ module OneM2M_Testcases_CSE_Release_2 { v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); v_req1.requestExpirationTimestamp := { alt_1 := 10000}; - mcaPort.send(f_getMsgOutPrimitive(m_request(v_req1))); + f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1))); tc_ac.start; alt {