diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 47099322b59cdc1e2bf46f9de08ccd4e7e38039d..3bec814de3de3e8f433e05e552583a236eca2687 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -37,35 +37,35 @@ module OneM2M_Functions {
vc_testSystemRole := e_ae;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
+ if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
+ 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_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
+ 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_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ 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_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.coapBindingDesc)) {
+ } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
v_binding_in := "COAP";
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.mqttBindingDesc)) {
+ } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
v_binding_in := "MQTT";
} else {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
@@ -95,35 +95,35 @@ module OneM2M_Functions {
vc_testSystemRole := e_ae;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE2.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE2.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (PX_TS_AE2.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE2.mcaPortIn);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_AE2.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) {
+ v_host := PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_AE2.mcaPort.binding.coapBindingDesc)) {
v_binding := "COAP";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_AE2.mcaPort.binding.mqttBindingDesc)) {
v_binding := "MQTT";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_AE2.mcaPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.coapBindingDesc)) {
+ } else if (ischosen(PX_TS_AE2.mcaPortIn.binding.coapBindingDesc)) {
v_binding_in := "COAP";
- } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.mqttBindingDesc)) {
+ } else if (ischosen(PX_TS_AE2.mcaPortIn.binding.mqttBindingDesc)) {
v_binding_in := "MQTT";
} else {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
//Initialze the IUT
@@ -142,27 +142,27 @@ module OneM2M_Functions {
vc_cse1 := CseSimu.create("CSE1") alive;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
+ map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
+ 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_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
+ 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_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ 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_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
if(PX_UT_IMPLEMENTED) {
- map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
+ map(self:utPort, system:utPort) param (PX_TS_UT);
}
activate(a_default());
vc_aeSimu := activate(a_cse_cf02_ae1());
@@ -190,35 +190,35 @@ module OneM2M_Functions {
vc_cseType := p_cseType;
// Map
- map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
- map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
+ map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
+ map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
v_binding := "COAP";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
v_binding := "MQTT";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
+ } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
v_binding_in := "COAP";
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
+ } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
v_binding_in := "MQTT";
} else {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
@@ -247,35 +247,35 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
- map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
+ map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
+ map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
v_binding := "COAP";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
v_binding := "MQTT";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
+ } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
v_binding_in := "COAP";
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
+ } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
v_binding_in := "MQTT";
} else {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf02_cse1());
@@ -301,35 +301,35 @@ module OneM2M_Functions {
vc_testSystemRole := e_ae;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn);
+ map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
+ 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_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.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_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.coapBindingDesc)) {
+ } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
v_binding_in := "COAP";
- } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.mqttBindingDesc)) {
+ } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
v_binding_in := "MQTT";
} else {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
//Initialze the IUT
@@ -353,27 +353,27 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPort);//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)) {
+ if (ischosen(PX_TS_AE2.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) {
+ v_host := PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_AE2.mcaPort.binding.coapBindingDesc)) {
v_binding := "COAP";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_AE2.mcaPort.binding.mqttBindingDesc)) {
v_binding := "MQTT";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
if(PX_UT_IMPLEMENTED) {
- map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
+ map(self:utPort, system:utPort) param (PX_TS_UT);
}
activate(a_default());
vc_cseSimu := activate(a_cse_cf03());
@@ -402,35 +402,35 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
- map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
+ map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
+ map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
map(self:acPort, system:acPort);
- if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
v_binding := "COAP";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) {
+ v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
v_binding := "MQTT";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
+ if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
+ } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
v_binding_in := "COAP";
- } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
+ } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
v_binding_in := "MQTT";
} else {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf04());
@@ -1116,7 +1116,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(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -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_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
p_ae2Index := f_getResourceFromAeSimu(vc_ae2);
@@ -2671,7 +2671,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(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")))), vc_cSEBaseIndex, int16); // FIXME To be review not sure we have to use CSE1
+ v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource(f_getCompletePoA(PX_TS_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)) {
@@ -2729,7 +2729,7 @@ module OneM2M_Functions {
v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
f_send(e_mcc_in_port, m_response(v_response));
- vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mcaPortIn, "")))), int16, -1, false);
+ vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mcaPortIn, "")))), int16, -1, false);
v_resourceIndex := vc_remoteCseIndex;
v_remoteCSERegistered:=true;
tc_ac.start(10.0);
@@ -2827,7 +2827,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_TS_SETTINGS.CSE1.mccPortIn, "")};
+ v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")};
v_myResource.cSEBase.cseType := vc_cseType;
v_myResource.cSEBase.supportedReleaseVersions := {"2a"};
@@ -4357,7 +4357,7 @@ module OneM2M_Functions {
* @param p_announcementTargetResource Announcement Target Resource
* @return p_annoucementTargetPoA Announcemenet Target PoA
*/
- function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mccPortIn, charstring p_announcementTargetResource := "") return charstring {
+ function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_CSE1.mccPortIn, charstring p_announcementTargetResource := "") return charstring {
var charstring v_poa;
log(">>> f_getCompletePoA: ", p_portDesc);
@@ -4388,7 +4388,7 @@ module OneM2M_Functions {
return v_poa;
}
- function f_getPortAddress(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mcaPortIn) return charstring {
+ function f_getPortAddress(in PortDesc p_portDesc := PX_TS_CSE1.mcaPortIn) return charstring {
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
return p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
} else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index a5ee74682ce801e09901d5dc50da23999376be00..ed45e9aea8695ade8e15be2b6d75346ab3bc9bb9 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -109,127 +109,125 @@ module OneM2M_Pixits {
/**
* @desc Test System settings
*/
- modulepar TestSystemSettingsDesc PX_TS_SETTINGS := {
- AE1 := { // AE1 component settings
- mcaPort := {
- binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
- bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort := 9010, // SUT CoAP/HTTP port
- localPort := 3031, // Test Adapter client port (for debug purpose only)
- sutAddress := "192.168.56.103"
- }
- }
- },
- serialization := e_xml
- },
- mcaPortIn := {
- binding := {
- coapBindingDesc := {
+ modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
+ mcaPort := {
+ binding := {
+ coapBindingDesc := {
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
- remotePort := 9010,
- localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
+ remotePort := 9010, // SUT CoAP/HTTP port
+ localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103"
}
- }
- },
- serialization := e_xml
- }
+ }
+ },
+ 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 := 3032, // Test Adapter client port (for debug purpose only)
- sutAddress := "192.168.56.103"
- }
+ mcaPortIn := {
+ binding := {
+ coapBindingDesc := {
+ bindingProtocol := e_coap,
+ bindingDesc := {
+ tsAddress := "192.168.56.102",
+ remotePort := 9010,
+ localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
+ sutAddress := "192.168.56.103"
}
- },
- serialization := e_xml
+ }
},
- mcaPortIn := {
- binding := {
- coapBindingDesc := {
+ serialization := e_xml
+ }
+ };
+ modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
+ mcaPort := {
+ binding := {
+ coapBindingDesc := {
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
- remotePort := omit,
- localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
+ remotePort := 9010, // SUT CoAP/HTTP port
+ localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103"
}
- }
- },
- serialization := e_xml
- }
+ }
+ },
+ serialization := e_xml
},
- CSE1 := { // CSE1 component settings
- mcaPort := {
- binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
- bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= 9010,
- localPort := 3131,
- sutAddress := "192.168.56.103"
- }
+ mcaPortIn := {
+ binding := {
+ coapBindingDesc := {
+ bindingProtocol := e_coap,
+ bindingDesc := {
+ tsAddress := "192.168.56.102",
+ remotePort := omit,
+ localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
+ sutAddress := "192.168.56.103"
}
- },
- serialization := e_xml
+ }
},
- mcaPortIn := {
- binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
- bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= omit,
- localPort := 3141,
- sutAddress := "192.168.56.103"
- }
+ serialization := e_xml
+ }
+ };
+ modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
+ mcaPort := {
+ binding := {
+ coapBindingDesc := {
+ bindingProtocol := e_coap,
+ bindingDesc := {
+ tsAddress := "192.168.56.102",
+ remotePort:= 9010,
+ localPort := 3131,
+ sutAddress := "192.168.56.103"
}
- },
- serialization := e_xml
+ }
},
- mccPort := {
- binding := {
- httpBindingDesc := {
- bindingProtocol := e_http,
- bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= 9011,
- localPort := 4131,
- sutAddress := "192.168.56.103"
- }
+ serialization := e_xml
+ },
+ mcaPortIn := {
+ binding := {
+ coapBindingDesc := {
+ bindingProtocol := e_coap,
+ bindingDesc := {
+ tsAddress := "192.168.56.102",
+ remotePort:= omit,
+ localPort := 3141,
+ sutAddress := "192.168.56.103"
}
- },
- serialization := e_xml
+ }
},
- mccPortIn := {
- binding := {
- httpBindingDesc := {
- bindingProtocol := e_http ,
- bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= 9011,
- localPort := 4141,
- sutAddress := "192.168.56.103"
- }
+ serialization := e_xml
+ },
+ mccPort := {
+ binding := {
+ httpBindingDesc := {
+ bindingProtocol := e_http,
+ bindingDesc := {
+ tsAddress := "192.168.56.102",
+ remotePort:= 9011,
+ localPort := 4131,
+ sutAddress := "192.168.56.103"
}
- },
- serialization := e_xml
- }
+ }
+ },
+ serialization := e_xml
},
- UT := omit
+ mccPortIn := {
+ binding := {
+ httpBindingDesc := {
+ bindingProtocol := e_http ,
+ bindingDesc := {
+ tsAddress := "192.168.56.102",
+ remotePort:= 9011,
+ localPort := 4141,
+ sutAddress := "192.168.56.103"
+ }
+ }
+ },
+ serialization := e_xml
+ }
};
+ modulepar UtDesc PX_TS_UT := { url := "http://192.168.55.103:43000/" };
modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml";
modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID";
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index c62314b1a8fa378e758c10dcd02f0ef5e9a6ea9c..dbf76024289c01cd669f7630f90d0e04a1381989 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -4146,7 +4146,7 @@ module OneM2M_Templates {
resourceType := int16,//M
resourceID := PX_CSE1_RESOURCE_ID,//M
pointOfAccess := { p_pointOfAccess }, //O
- cSEBase := f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
+ cSEBase := f_getCompletePoA(PX_TS_CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
cSE_ID := PX_CSE1_ID,//M
requestReachability := true//M
};
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 3244d97bf37b896593f7f6a7e7721b60af59663d..a75cdc70f9adf73e38ad5cfc04fc54f437b4c6bc 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -8878,21 +8878,6 @@ type record CseSimuComponentDesc {
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,
- UtDesc UT optional
-}
-
}
with {
encode "";
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 07c3a0d44f2d0883f2519ab467fc3031d78faa92..12603fd3cad1941791f71a866872126684957cb1 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2260,7 +2260,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 " & f_getPortAddress(PX_TS_SETTINGS.CSE1.mccPortIn) & " 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_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;
@@ -2494,7 +2494,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
- var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn) };
+ var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE2.mcaPortIn) };
// Test control
@@ -2607,7 +2607,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var integer v_ae1Index := -1;
var integer v_acpAuxIndex := -1;
- var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn) };
+ var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE1.mcaPortIn) };
// Test control
@@ -5955,7 +5955,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if(p_resourceType != int2) {
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
}
if(p_resourceType != int1) {
@@ -6994,7 +6994,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(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -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_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2);
@@ -8212,11 +8212,11 @@ module OneM2M_PermutationFunctions {
// Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
- v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_SETTINGS.AE1.mcaPortIn)}, omit}, omit}};
+ v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_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_TS_SETTINGS.AE1.mcaPortIn)});
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -8277,7 +8277,7 @@ 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_TS_SETTINGS.AE1.mcaPortIn)});
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -10750,7 +10750,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_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);
@@ -10824,7 +10824,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
@@ -10901,11 +10901,11 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
- v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_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_TS_SETTINGS.AE2.mcaPortIn, "")}))); // 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_AE2.mcaPortIn, "")}))); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 081c08ac56526c1224f841177ba5ea8b4333e984..d50ccb8cbedc3146eb319fe1e04f39eb34c72052 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -1107,7 +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_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)};
+ v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_ae1.start(f_CSE_REG_CRE_012(v_create));
v_ae1.done;
}
@@ -1151,7 +1151,7 @@ module OneM2M_Testcases_CSE_Release_1 {
const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
+ v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done;
@@ -1887,11 +1887,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_createRemoteCSEBase);
v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE
- v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
+ v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
- v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
+ v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
@@ -2136,7 +2136,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_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)};
+ v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_contentResponse.aE := mw_contentAeBase;
v_contentResponse.aE.pointOfAccess := ?;
@@ -2342,7 +2342,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
var template PrimitiveContent v_contentResponse;
- v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
+ v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
v_contentResponse.remoteCSE.pointOfAccess := ?;
@@ -2677,7 +2677,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
+ v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
v_cse1.done;
@@ -2724,7 +2724,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AttributeList c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
+ v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
c_optionalAttribute := {"pointofAccess"};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
@@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var PoaList v_poaList := {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn)};
+ var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -6667,7 +6667,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var PoaList v_poaList := {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn)};
+ var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 9e8263edad26819a609faa5364eb93b90b599509..8e47172bb5de0cb17cecec19a7fbf38d2f21d79a 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2748,7 +2748,7 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -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_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2);