diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 5d7dbc785e8b11bdefcb753b6da0fb2186589e49..ccfc8c2ca55553269ae9061d35cff5f3df03d867 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -38,14 +38,14 @@ module OneM2M_Functions {
vc_aeSimuDesc := PX_TS_AE1;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
- f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
@@ -78,14 +78,14 @@ module OneM2M_Functions {
vc_aeSimuDesc := PX_TS_AE2;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_AE2.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE2.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
- f_setProtocolBinding(PX_TS_AE2.mcaPort, PX_TS_AE2.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE2.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE2.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
//Initialze the IUT
@@ -105,11 +105,11 @@ module OneM2M_Functions {
vc_config := e_cf02;
vc_testSystemRole := e_ae;
vc_cse1 := CseSimu.create("CSE1") alive;
- vc_aeSimuDesc := PX_TS_AE1;
+ vc_aeSimuDesc := vc_aeSimuDesc;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_UT);
@@ -117,8 +117,8 @@ module OneM2M_Functions {
f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
activate(a_default());
vc_aeSimu := activate(a_cse_cf02_ae1());
@@ -269,14 +269,14 @@ module OneM2M_Functions {
vc_aeSimuDesc := PX_TS_AE1;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
- f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
//Initialze the IUT
@@ -464,17 +464,17 @@ module OneM2M_Functions {
vc_aeSimuDesc := PX_TS_AE1;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort);
}
- f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
activate(a_default());
vc_aeSimu := activate(a_cse_cf06_ae1());
@@ -500,14 +500,14 @@ module OneM2M_Functions {
vc_dasSimuDesc := PX_TS_DAS;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_DAS.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_DAS.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_dasSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_dasSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
- f_setProtocolBinding(PX_TS_DAS.mcaPort, PX_TS_DAS.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_dasSimuDesc.mcaPort, vc_dasSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_DAS.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_DAS.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_dasSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_dasSimuDesc.mcaPortIn.serialization };
activate(a_default());
vc_aeSimu := activate(a_cse_cf06_das());
@@ -528,14 +528,14 @@ module OneM2M_Functions {
vc_dasSimuDesc := PX_TS_DAS;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_DAS.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_DAS.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_dasSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_dasSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
- f_setProtocolBinding(PX_TS_DAS.mcaPort, PX_TS_DAS.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_dasSimuDesc.mcaPort, vc_dasSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_DAS.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_DAS.mcaPortIn.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_dasSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_dasSimuDesc.mcaPortIn.serialization };
activate(a_default());
vc_aeSimu := activate(a_cse_cf06_das());
@@ -561,39 +561,17 @@ module OneM2M_Functions {
vc_aeSimuDesc := PX_TS_AE1;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort);
}
- if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
- v_binding := "HTTP";
- v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
- v_binding := "COAP";
- v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
- v_binding := "MQTT";
- v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
- } else {
- v_binding := "WSCK";
- v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
- }
-
- if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
- v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
- v_binding_in := "COAP";
- } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
- v_binding_in := "MQTT";
- } else {
- v_binding_in := "WSCK";
- }
-
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+ f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
+
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
activate(a_default());
vc_aeSimu := activate(a_cse_cf06_ae1());
@@ -1221,7 +1199,7 @@ module OneM2M_Functions {
//Activate defaults when running on a PTC
f_cse_activateDefaults_ae();
- v_request := valueof(m_createAe(PX_TS_AE1.appId, p_accessControlPolicyIDs, PX_TS_AE1.aeIdStem, c_defaultAe1ResourceName, p_poaList));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, p_accessControlPolicyIDs, vc_aeSimuDesc.aeIdStem, c_defaultAe1ResourceName, p_poaList));
v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
@@ -1338,7 +1316,7 @@ module OneM2M_Functions {
var integer v_serviceSubscribedAppRuleIndex := -1;
- v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_TS_AE1.appId}, valueof(p_allowedAEs)));
+ v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {vc_aeSimuDesc.appId}, valueof(p_allowedAEs)));
return v_serviceSubscribedAppRuleIndex;
@@ -1357,7 +1335,7 @@ module OneM2M_Functions {
var template RequestPrimitive m_request := m_createM2mServiceSubscriptionProfileBase;
//TODO Create/Update serviceSubscribedNode //m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode := m_contentServiceSubscribedNode;
- v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_TS_AE1.appId}, valueof(p_allowedAEs)));
+ v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {vc_aeSimuDesc.appId}, valueof(p_allowedAEs)));
m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode.ruleLinks := {f_getResourceAddress(v_serviceSubscribedAppRuleIndex)};
v_serviceSubscribedProfileIndex := f_cse_createResource(int11, m_request);
@@ -2853,7 +2831,7 @@ module OneM2M_Functions {
v_response := valueof(m_responsePrimitive(int2001,vc_request.primitive.requestPrimitive.requestIdentifier));
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
- v_response.from_ := PX_TS_CSE1.cseId;
+ v_response.from_ := vc_cseSimuDesc.cseId;
v_response.to_ := vc_request.primitive.requestPrimitive.from_;
f_send(e_mccPortIn, m_response(v_response));
}
@@ -3232,12 +3210,12 @@ module OneM2M_Functions {
vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
- v_response.from_ := PX_TS_CSE1.cseId;
+ v_response.from_ := vc_cseSimuDesc.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
f_send(e_mccPortIn, m_response(v_response));
- vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mcaPortIn, "")))), int16, -1, false);
+ vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(vc_cseSimuDesc.mcaPortIn, "")))), int16, -1, false);
v_resourceIndex := vc_remoteCseIndex;
v_remoteCSERegistered:=true;
tc_ac.start(10.0);
@@ -5335,7 +5313,7 @@ module OneM2M_Functions {
return v_poa;
}
- function f_getPortAddress(in PortDesc p_portDesc := PX_TS_CSE1.mcaPortIn) return charstring {
+ function f_getPortAddress(in PortDesc p_portDesc) return charstring {
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
return p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
} else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
@@ -5526,20 +5504,20 @@ module OneM2M_Functions {
* @return Resource address for the given resource
* @verdict
*/
- function f_getLocalResourceAddress(integer p_targetResourceIndex := 0, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
+ function f_getLocalResourceAddress(integer p_targetResourceIndex := vc_cSEBaseIndex, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
var XSD.ID v_resourceAddress;
if(p_primitiveScope == e_cseRelative) {
if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == 0) {
- return PX_TS_CSE1.cseResourceId;
+ return vc_cseSimuDesc.cseResourceId;
} else {
return f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
}
} else {
if(p_targetResourceIndex == 0) {
- return PX_TS_CSE1.cseName;
+ return vc_cseSimuDesc.cseName;
} else {
v_resourceAddress := f_getLocalResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -5549,14 +5527,14 @@ module OneM2M_Functions {
} else if (p_primitiveScope == e_spRelative) {
if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == 0) {
- return PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseResourceId;
+ return vc_cseSimuDesc.cseId & "/" & vc_cseSimuDesc.cseResourceId;
} else {
- v_resourceAddress := PX_TS_CSE1.cseId & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := vc_cseSimuDesc.cseId & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == 0) {
- return PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName;
+ return vc_cseSimuDesc.cseId & "/" & vc_cseSimuDesc.cseName;
} else {
v_resourceAddress := f_getLocalResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -5565,14 +5543,14 @@ module OneM2M_Functions {
} else if (p_primitiveScope == e_absolute) {
if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == 0) {
- return PX_TS_CSE1.spId & PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseResourceId;
+ return vc_cseSimuDesc.spId & vc_cseSimuDesc.cseId & "/" & vc_cseSimuDesc.cseResourceId;
} else {
- v_resourceAddress := PX_TS_CSE1.spId & PX_TS_CSE1.cseId & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := vc_cseSimuDesc.spId & vc_cseSimuDesc.cseId & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == 0) {
- return PX_TS_CSE1.spId & PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName;
+ return vc_cseSimuDesc.spId & vc_cseSimuDesc.cseId & "/" & vc_cseSimuDesc.cseName;
} else {
v_resourceAddress := f_getLocalResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
@@ -6678,7 +6656,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource creation rejected");
}
}
- vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
+ vc_response.primitive.responsePrimitive.from_ := vc_cseSimuDesc.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_localResourceIndex;
@@ -6714,7 +6692,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource update rejected");
}
}
- vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
+ vc_response.primitive.responsePrimitive.from_ := vc_cseSimuDesc.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_targetLocalResourceIndex;
@@ -6749,7 +6727,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource retrieve rejected");
}
}
- vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
+ vc_response.primitive.responsePrimitive.from_ := vc_cseSimuDesc.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_targetLocalResourceIndex;
@@ -6783,7 +6761,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource deletion rejected");
}
}
- vc_response.primitive.responsePrimitive.from_ := PX_TS_CSE1.cseId;
+ vc_response.primitive.responsePrimitive.from_ := vc_cseSimuDesc.cseId;
vc_response.primitive.responsePrimitive.to_ := p_request.from_;
return v_targetLocalResourceIndex;
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index f53d827a19682f6d83d1a2259d853a944ffa5af8..72e940034dfac9d9be95d1a2e924d83697c6bf52 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2019,7 +2019,7 @@ module OneM2M_PermutationFunctions {
f_sleepIgnoreDef(PX_TCONFIG_IUT);
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, PX_CSE_ID & "/" & v_aeIdStem));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, PX_CSE_ID & "/" & v_aeIdStem));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -2072,7 +2072,7 @@ module OneM2M_PermutationFunctions {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, v_aeIdStem));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, v_aeIdStem));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -2603,7 +2603,7 @@ module OneM2M_PermutationFunctions {
// Preamble
- v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()}));
+ v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA(vc_cseSimuDesc.mccPortIn)}));
vc_ae1.start(f_cse_preamble_registerAe());
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
@@ -3981,7 +3981,7 @@ module OneM2M_PermutationFunctions {
// Preamble
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
- v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(-, PX_TS_CSE1.cseId, omit, -), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
+ v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(-, vc_cseSimuDesc.cseId, omit, -), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
// Test Body
@@ -6426,7 +6426,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if(p_resourceType != int2) {
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
}
if(p_resourceType != int1) {
@@ -6620,7 +6620,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
+ v_responsePrimitive.from_ := vc_cseSimuDesc.cseId;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mccPortIn, m_response(v_responsePrimitive));
}
@@ -8649,11 +8649,11 @@ module OneM2M_PermutationFunctions {
// Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
- v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_AE1.mcaPortIn)}, omit}, omit}};
+ v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(vc_aeSimuDesc.mcaPortIn)}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -8714,7 +8714,7 @@ module OneM2M_PermutationFunctions {
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -9010,7 +9010,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var XSD.AnyURI v_remoteCSEAnncAddress;
- var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()});
+ var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(PX_TS_CSE1.cseId, -, -, -, -, {f_getCompletePoA()});
var template RequestPrimitive v_updateRemoteCse := mw_updateRemoteCSE;
//v_createRemoteCse.primitiveContent.remoteCSE.descendantCSEs := {PX_TS_CSE2.cseId};
@@ -9105,7 +9105,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
var template RequestPrimitive v_createContainer := m_createContainerBase;
var template RequestPrimitive v_createContainerAnnc := mw_createContainerAnnc;
- var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()});
+ var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(PX_TS_CSE1.cseId, -, -, -, -, {f_getCompletePoA()});
var template RequestPrimitive v_updateRemoteCse := mw_updateRemoteCSE;
//v_createRemoteCse.primitiveContent.remoteCSE.descendantCSEs := {PX_TS_CSE2.cseId};
@@ -9198,7 +9198,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var XSD.AnyURI v_remoteCSEAnncAddress;
var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
- var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()});
+ var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(PX_TS_CSE1.cseId, -, -, -, -, {f_getCompletePoA()});
var template RequestPrimitive v_updateRemoteCse := mw_updateRemoteCSE;
//v_createRemoteCse.primitiveContent.remoteCSE.descendantCSEs := {PX_TS_CSE2.cseId};
@@ -9831,7 +9831,7 @@ module OneM2M_PermutationFunctions {
var XSD.AnyURI v_remoteCSEAnncAddress;
var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
var template RequestPrimitive v_createRequestRemoteCseAnnc := m_createRemoteCSEAnncBase;
- var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()});
+ var template RequestPrimitive v_createRemoteCse := m_createRemoteCSE_poa(PX_TS_CSE1.cseId, -, -, -, -, {f_getCompletePoA()});
var template RequestPrimitive v_updateRemoteCse := mw_updateRemoteCSE;
//v_createRemoteCse.primitiveContent.remoteCSE.descendantCSEs := {PX_TS_CSE2.cseId};
@@ -11081,7 +11081,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(vc_aeSimuDesc.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);
@@ -11154,7 +11154,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
@@ -11230,7 +11230,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
f_checkAeSimuStatus();
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 65af86006fd009701ea7eb192614f9a281cc5eb1..31ba76192a8421c6b8a09762b878bc5e8c6403bf 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -1988,8 +1988,8 @@ module OneM2M_Testcases_AE_Release_1 {
v_aeLocalIndex := f_ae_preamble_registerAe();
//Test behavior
- v_req := valueof(m_notifyNotification("", m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
- v_req.from_ := PX_TS_CSE1.cseId;
+ v_req := valueof(m_notifyNotification("", m_contentNotification_subscriptionVerification(vc_cseSimuDesc.cseId)));
+ v_req.from_ := vc_cseSimuDesc.cseId;
f_send(e_mcaPort, m_request(v_req));
@@ -2044,7 +2044,7 @@ module OneM2M_Testcases_AE_Release_1 {
//Test behavior
v_req := valueof(m_notifyAggregatedNotification);
- v_req.from_ := PX_TS_CSE1.cseId;
+ v_req.from_ := vc_cseSimuDesc.cseId;
f_send(e_mcaPort, m_request(v_req));
@@ -2128,7 +2128,7 @@ module OneM2M_Testcases_AE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
- v_response_rsp1.from_ := PX_TS_CSE1.cseId;
+ v_response_rsp1.from_ := vc_cseSimuDesc.cseId;
v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
v_request_req2 := valueof(m_notify(f_getLocalResourceAddress(v_pollingChannelIndex)));
diff --git a/OneM2M_Testcases_AE_Release_3.ttcn b/OneM2M_Testcases_AE_Release_3.ttcn
index 7aa4890c4a77aff50941145a2b8d57f901f00cff..21298017e7e49679e6759ef6941c0ee2a33480a8 100644
--- a/OneM2M_Testcases_AE_Release_3.ttcn
+++ b/OneM2M_Testcases_AE_Release_3.ttcn
@@ -1427,8 +1427,8 @@ module OneM2M_Testcases_AE_Release_3 {
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_ := "20331231T012345";
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,{"1","24",myAbsRelTimestamp,{int1},{int10}}}; //expired sharedReceiverESPrimRandObject
- v_poa:= f_getCompletePoA(PX_TS_CSE1.mccPortIn, "");
- v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE1));
+ v_poa:= f_getCompletePoA(vc_cseSimuDesc.mccPortIn, "");
+ v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, vc_cseSimuDesc));
v_receiverRemoteCseIndex := f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16);
// Test Body
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index b45d6c2e673171fbe2d0a65510cdc2086dc5f0ee..c5b1f58f2dab99ff193dbc3006f3722f3a636098 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -540,7 +540,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
//v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
+ v_request := f_getCreateRequestPrimitive(int2, m_createAe(vc_aeSimuDesc.appId, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
@@ -745,7 +745,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive));
- f_send(e_mcaPort, m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, "S"),-1)));
+ f_send(e_mcaPort, m_request(f_getCreateRequestPrimitive(int2, m_createAe(vc_aeSimuDesc.appId, omit, "S"),-1)));
//Test Body
tc_ac.start;
@@ -912,7 +912,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO
v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
- v_request.primitiveContent.aEAnnc.link := PX_TS_CSE1.cseId & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID;
+ v_request.primitiveContent.aEAnnc.link := vc_cseSimuDesc.cseId & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID;
f_send(e_mccPort, m_request(v_request));
tc_ac.start;
@@ -976,7 +976,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler());
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, PX_ALLOWED_S_AE_IDS[0]));
+ v_aeIndex := f_cse_createResource(int2, m_createAe(vc_aeSimuDesc.appId, omit, PX_ALLOWED_S_AE_IDS[0]));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
@@ -992,7 +992,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_updateHandler(v_updateAeAnnc));
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
@@ -1059,7 +1059,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, "C"));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, "C"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1237,7 +1237,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_sleepIgnoreDef(PX_TCONFIG_IUT);
// Test Body
- v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, -, PX_TS_AE1.aeIdStem, -, -));
+ v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, -, vc_aeSimuDesc.aeIdStem, -, -));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
@@ -1457,7 +1457,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, "S"));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, "S"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1588,7 +1588,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, "C"));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, "C"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1658,7 +1658,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, vc_resourcesList[v_aeIndex].resource.aE.aE_ID));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, vc_resourcesList[v_aeIndex].resource.aE.aE_ID));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1746,7 +1746,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_response.primitiveContent := vc_localResourcesList[vc_localRemoteCseIndex].resource;
v_cseRegistered := true;
}
- v_response.from_ := PX_TS_CSE1.cseId;
+ v_response.from_ := vc_cseSimuDesc.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mccPortIn, m_response(v_response));
tc_ac.start(10.0);
@@ -2060,7 +2060,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Test Body
- v_request := valueof(m_createAEAnnc(-, -, omit, PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]));
+ v_request := valueof(m_createAEAnnc(-, -, omit, vc_cseSimuDesc.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
@@ -2075,7 +2075,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_aeAnncIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10002);
setverdict(pass, __SCOPE__ & ": AEAnnc successfully created.");
- if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.link != PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]) {
+ if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.link != vc_cseSimuDesc.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]) {
setverdict(fail, __SCOPE__ & ": Link attribute not correct");
}
if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.labels != {"Credential-ID:None"}) {
@@ -2133,7 +2133,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/" & PX_ALLOWED_S_AE_IDS[0], -, -, -)));
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, PX_ALLOWED_S_AE_IDS[0]));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, PX_ALLOWED_S_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
f_send(e_mcaPort, m_request(v_request));
@@ -2277,7 +2277,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, ""));
+ v_request := valueof(m_createAe(vc_aeSimuDesc.appId, omit, ""));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -2894,7 +2894,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
}
- v_response.from_ := PX_TS_CSE1.cseId;
+ v_response.from_ := vc_cseSimuDesc.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mccPortIn, m_response(v_response));
}
@@ -3408,7 +3408,7 @@ module OneM2M_Testcases_CSE_Release_1 {
setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
v_response := valueof(m_responsePrimitive(int2002,v_request.primitive.requestPrimitive.requestIdentifier));
}
- v_response.from_ := PX_TS_CSE1.cseId;
+ v_response.from_ := vc_cseSimuDesc.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mccPortIn, m_response(v_response));
}
@@ -3459,7 +3459,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, "S"));//c_CRUDNDi);
+ v_aeIndex := f_cse_createResource(int2, m_createAe(vc_aeSimuDesc.appId, omit, "S"));//c_CRUDNDi);
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
@@ -3602,7 +3602,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, "S"));
+ v_aeIndex := f_cse_createResource(int2, m_createAe(vc_aeSimuDesc.appId, omit, "S"));
vc_cse1.start(f_cse_announcementProcedure_createHandler());
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index ba06ad6a7b590f0f7e56ebde5229724fb3b7fac5..c6d6943797c2b3a0eac942a34a2efd5a83c47e90 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2376,7 +2376,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63);
- v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem, c_defaultAe1ResourceName, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")}), -1); // AE1 is registred
+ v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(vc_aeSimuDesc.appId, -, vc_aeSimuDesc.aeIdStem, c_defaultAe1ResourceName, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn, "")}), -1); // AE1 is registred
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, omit), -1)); // AE2 is registred
@@ -3700,7 +3700,7 @@ module OneM2M_Testcases_CSE_Release_2 {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Polling request received successfuly");
v_response_rsp1 := valueof(m_responsePrimitive(int2000,v_request_req1.primitive.requestPrimitive.requestIdentifier));
- v_response_rsp1.from_ := PX_TS_CSE1.cseId;
+ v_response_rsp1.from_ := vc_cseSimuDesc.cseId;
v_response_rsp1.to_ := v_request_req1.primitive.requestPrimitive.from_;
//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 339cb2ff848d12bf1aefd41a8b165a8582f6cb4d..5b56a048f3fcb3704b4d0fcc2d6906de37a282a2 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -13293,7 +13293,7 @@ module OneM2M_Testcases_CSE_Release_3 {
setverdict(pass, __SCOPE__ & ": Retrieve request for Reference Ontology received.");
v_response := valueof(m_responsePrimitive(int2000,v_request.primitive.requestPrimitive.requestIdentifier));
v_response.primitiveContent := vc_localResourcesList[v_remoteOntologyResourceIndex].resource;
- v_response.from_ := PX_TS_CSE1.cseId;
+ v_response.from_ := vc_cseSimuDesc.cseId;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
f_send(e_mccPortIn, m_response(v_response));
}