diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 890da61ed3d4ccf14e4e7bbb8c757602db44bbfe..47099322b59cdc1e2bf46f9de08ccd4e7e38039d 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -32,27 +32,27 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
var charstring v_binding_in;
- var integer v_port := 0;
+ var charstring v_host;
vc_config := e_cf01;
vc_testSystemRole := e_ae;
// Map
- 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:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort; // FIXME Use mcxPortyy.sutAddress if present instead of PX_TS_SETTINGS.SUT.sutAddress
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_binding := "MQTT";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
@@ -64,8 +64,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
+ 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)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
@@ -90,27 +90,27 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
var charstring v_binding_in;
- var integer v_port := 0;
+ var charstring v_host;
vc_config := e_cf01;
vc_testSystemRole := e_ae;
// Map
- 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:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE2.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE2.mcaPortIn);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_binding := "MQTT";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
@@ -122,8 +122,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
+ 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)] };
//Initialze the IUT
@@ -136,30 +136,30 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
- var integer v_port := 0;
+ var charstring v_host;
vc_config := e_cf02;
vc_testSystemRole := e_ae;
vc_cse1 := CseSimu.create("CSE1") alive;
// Map
- map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort, PX_TS_SETTINGS.SUT.sutAddress);
+ map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_binding := "MQTT";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
@@ -183,29 +183,29 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
var charstring v_binding_in;
- var integer v_port := 0;
+ var charstring v_host;
var PrimitiveContent v_cSEBaseResource;
vc_config := e_cf02;
vc_testSystemRole := e_cse;
vc_cseType := p_cseType;
// Map
- 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:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
+ map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_port := PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort;
v_binding := "MQTT";
+ v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort;
v_binding := "WSCK";
+ v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
@@ -217,8 +217,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_binding_in, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
+ 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)] };
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
@@ -235,7 +235,7 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
var charstring v_binding_in;
- var integer v_port := 0;
+ var charstring v_host;
var PrimitiveContent v_cSEBaseResource;
vc_config := e_cf02CseSimuMaster;
vc_testSystemRole := e_cse;
@@ -247,22 +247,22 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- 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:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
+ map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_port := PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort;
v_binding := "MQTT";
+ v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort;
v_binding := "WSCK";
+ v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
@@ -274,8 +274,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
+ 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)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf02_cse1());
@@ -296,27 +296,27 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
var charstring v_binding_in;
- var integer v_port := 0;
+ var charstring v_host;
vc_config := e_cf02CseSimuMaster;
vc_testSystemRole := e_ae;
// Map
- 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:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_binding := "MQTT";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
@@ -328,8 +328,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
+ 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)] };
//Initialze the IUT
@@ -343,7 +343,7 @@ module OneM2M_Functions {
// Variables
var charstring v_binding;
var PrimitiveContent v_cSEBaseResource;
- var integer v_port := 0;
+ var charstring v_host;
vc_config := e_cf03;
vc_testSystemRole := e_cse;
vc_cseType := p_cseType;
@@ -353,25 +353,24 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- 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:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.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)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_binding := "MQTT";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
v_binding := "WSCK";
- v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
+ v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
@@ -394,7 +393,7 @@ module OneM2M_Functions {
var charstring v_binding;
var charstring v_binding_in;
var PrimitiveContent v_cSEBaseResource;
- var integer v_port := 0;
+ var charstring v_host;
vc_config := e_cf04;
vc_testSystemRole := e_cse;
vc_cseType := p_cseType;
@@ -403,22 +402,22 @@ module OneM2M_Functions {
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
// Map
- 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:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
+ map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
map(self:acPort, system:acPort);
if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
v_binding := "HTTP";
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort;
+ 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_binding := "COAP";
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort;
+ 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_port := PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort;
v_binding := "MQTT";
+ v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
} else {
- v_port := PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort;
v_binding := "WSCK";
+ v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
}
if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
v_binding_in := "HTTP";
@@ -430,8 +429,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
+ 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)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf04());
@@ -958,7 +957,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1023,10 +1022,10 @@ module OneM2M_Functions {
//TODO Test, to be removed
v_request.to_ := f_getResourceAddress();
- 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}))));
+ f_send(e_mca_port, m_request(v_request));
+ //f_send(e_mca_port, m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})));
} else {
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_createAe(p_appId))));
+ f_send(e_mca_port, m_request(m_createAe(p_appId)));
}
tc_ac.start;
alt {
@@ -1163,7 +1162,7 @@ module OneM2M_Functions {
v_request.from_ := f_getOriginator(vc_resourcesIndexToBeDeleted[i]);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1255,8 +1254,7 @@ module OneM2M_Functions {
v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(v_resourceIndex, vc_testSystemRole)));
- //mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1286,8 +1284,7 @@ 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)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1318,8 +1315,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
log(__SCOPE__&": INFO: Deregistration performed successfully");
}
[] tc_ac.timeout {
@@ -1355,7 +1351,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1427,7 +1423,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(int1, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1472,7 +1468,7 @@ module OneM2M_Functions {
v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(v_request), p_nullFields)));
+ f_send(e_mca_port, m_request(valueof(v_request), p_nullFields));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1504,7 +1500,7 @@ module OneM2M_Functions {
*/
function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex)))));
+ f_send(e_mca_port, 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 {
@@ -1541,7 +1537,7 @@ module OneM2M_Functions {
v_request := valueof(p_requestPrimitive);
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1572,7 +1568,7 @@ module OneM2M_Functions {
*/
function f_cse_operationResource(template RequestPrimitive p_requestPrimitive) runs on AeSimu return PrimitiveContent{
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -1603,7 +1599,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1640,7 +1636,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex)))));
+ f_send(e_mca_port, 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))) {
@@ -1677,7 +1673,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))};
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
@@ -1711,7 +1707,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
}
@@ -1729,7 +1725,7 @@ module OneM2M_Functions {
v_request := f_getUpdateRequestPrimitive(p_resourceType, p_targetIndex, p_requestUpdatePrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
}
@@ -1841,13 +1837,13 @@ module OneM2M_Functions {
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
if(getverdict == pass) {
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_httpResponse(v_responsePrimitive));
} else {
v_responsePrimitive.responseStatusCode := int4000;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_httpResponse(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_httpResponse(v_responsePrimitive));
}
- //mcaPort.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive))); // TODO have to be deleted
+ //mcaPort.send(m_response(v_responsePrimitive)); // TODO have to be deleted
} //end f_subscriptionVerificationHandler
@@ -1872,7 +1868,7 @@ module OneM2M_Functions {
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
}
@@ -1911,7 +1907,7 @@ module OneM2M_Functions {
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive{
tc_ac.stop;
@@ -1956,7 +1952,7 @@ module OneM2M_Functions {
}
if(isvalue(v_responsePrimitive)) {
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
@@ -1993,7 +1989,7 @@ module OneM2M_Functions {
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
@@ -2006,7 +2002,7 @@ module OneM2M_Functions {
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
v_notificationsReceived := v_notificationsReceived + 1;
if(v_notificationsReceived < p_numberOfAggregatedNotification) {
tc_ac.start;
@@ -2041,7 +2037,7 @@ module OneM2M_Functions {
tc_ac.stop;
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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");
}
@@ -2097,7 +2093,7 @@ module OneM2M_Functions {
//p_requestPrimitive.from_ := PX_CSE1_ID;
p_requestPrimitive.from_ := f_getOriginator(vc_remoteCseIndex, e_cse);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mcc_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responseNotify(int2000))) -> value vc_response {
@@ -2178,12 +2174,12 @@ module OneM2M_Functions {
}
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, 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));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -2211,7 +2207,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(f_getAnnouncedResourceType(p_resourceType), p_requestPrimitive, vc_remoteCseIndex);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -2263,12 +2259,12 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__ & ":INFO: Expected UPDATE Announcement received");
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, 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));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -2304,12 +2300,12 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__ & ":INFO: Expected DELETE Announcement received");
f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, 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));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -2341,8 +2337,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No creation for resource received");
@@ -2394,8 +2389,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mcc_in_port, m_response(v_response));
}
[] tc_ac.timeout {
@@ -2416,8 +2410,7 @@ module OneM2M_Functions {
*/
function f_cse_updateAnnouncedResource(in RequestPrimitive p_requestPrimitive) runs on CseSimu {
- //mccPort.send(f_getMsgOutPrimitive(m_request(p_requestPrimitive)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(p_requestPrimitive)));
+ f_send(e_mcc_port, m_request(p_requestPrimitive));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -2465,8 +2458,7 @@ module OneM2M_Functions {
} else {
setverdict(inconc, __SCOPE__&":INFO: Unexpected resource update");
}
- //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] tc_ac.timeout {
@@ -2501,8 +2493,7 @@ module OneM2M_Functions {
} else {
setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
}
- //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] tc_ac.timeout {
@@ -2525,8 +2516,7 @@ 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)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_requestPrimitive)));
+ f_send(e_mcc_port, m_request(v_requestPrimitive));
tc_ac.start;
alt {
@@ -2571,8 +2561,7 @@ module OneM2M_Functions {
} else {
setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
}
- //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] tc_ac.timeout {
@@ -2592,8 +2581,7 @@ 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)))));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex)))));
+ f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
@@ -2631,8 +2619,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
- //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)))));
+ f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
tc_ac.start;
alt {
@@ -2676,8 +2663,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(int16, p_requestPrimitive, -1);
- //mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
@@ -2741,8 +2727,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ 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);
v_resourceIndex := vc_remoteCseIndex;
@@ -2780,8 +2765,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] mccPortIn.receive(mw_request(?)) {
tc_ac.stop;
@@ -3270,8 +3254,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
- //mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -3311,8 +3294,7 @@ module OneM2M_Functions {
f_processCreateRequestPrimitive(p_requestPrimitive.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)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
@@ -3335,7 +3317,7 @@ module OneM2M_Functions {
//Send response
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
log(__SCOPE__&": WARNING: Unexpected Notification message received");
repeat;
}
@@ -3343,7 +3325,7 @@ module OneM2M_Functions {
//Send response
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
log(__SCOPE__&": WARNING: Unexpected Notification for Subscription Verification message received");
repeat;
}
@@ -3394,8 +3376,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)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat;
}
@@ -3405,11 +3386,9 @@ 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}})));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}})));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}}));
} else {
- //mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
tc_ac.start(10.0);
repeat;
@@ -3419,8 +3398,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat;
}
@@ -3429,8 +3407,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat;
}
@@ -3441,8 +3418,7 @@ 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)));
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mcc_in_port, m_response(v_response));
tc_ac.start(10.0);
repeat;
}
@@ -3470,7 +3446,7 @@ module OneM2M_Functions {
//Send response in any case
v_response := valueof(m_responseNotification(int2000, omit));
v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mca_in_port, m_response(v_response));
tc_ac.start(10.0);
repeat;
}
@@ -3549,7 +3525,7 @@ module OneM2M_Functions {
v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
@@ -3595,11 +3571,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) {
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))));
+ f_send(e_mca_in_port, m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
setverdict(pass, __SCOPE__&":INFO: Container created successfuly");
}
else {
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))));
+ f_send(e_mca_in_port, m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
setverdict(inconc, __SCOPE__&":INFO: Container creation failed");
}
}
@@ -3642,11 +3618,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) {
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))));
+ f_send(e_mca_in_port, m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
setverdict(pass, __SCOPE__&":INFO: Polling Channel created successfuly");
}
else {
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))));
+ f_send(e_mca_in_port, m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
setverdict(inconc, __SCOPE__&":INFO: Polling Channel creation failed");
}
}
@@ -3691,7 +3667,7 @@ module OneM2M_Functions {
//Send response in any case
v_response := valueof(m_responseNotification(int2000, omit));
v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mca_in_port, m_response(v_response));
tc_ac.start(10.0);
repeat;
}
@@ -3699,7 +3675,7 @@ module OneM2M_Functions {
v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat;
}
@@ -3731,15 +3707,6 @@ module OneM2M_Functions {
group GetSetFunctions {
-
- /**
- * @desc Get MsgOut primitive
- * @param MsgOut MsgOut primitive
- */
-
- function f_getMsgOutPrimitive(template MsgOut p_msgOut) runs on Tester return MsgOut { // TODO To be removed
- return valueof(p_msgOut);
- }
/**
* @desc Build a reception template from the primitiveContent sent in previous request primitive
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 48ee51f964bfa520f6fc67048714773a21704738..a5ee74682ce801e09901d5dc50da23999376be00 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -119,7 +119,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3031, // Test Adapter client port (for debug purpose only)
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -133,7 +133,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := 9010,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -149,7 +149,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3032, // Test Adapter client port (for debug purpose only)
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -163,7 +163,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := omit,
localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -179,7 +179,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3131,
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -193,7 +193,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= omit,
localPort := 3141,
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -207,7 +207,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4131,
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
@@ -221,14 +221,13 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4141,
- sutAddress := omit
+ sutAddress := "192.168.56.103"
}
}
},
serialization := e_xml
}
},
- SUT := { sutAddress := "192.168.56.103" },
UT := omit
};
diff --git a/LibOneM2M/OneM2M_Ports.ttcn b/LibOneM2M/OneM2M_Ports.ttcn
index fedd647300c4b7a5fd342604b058b7d0b575b4f3..b318eb61bf1ecf78b1a79b77e1894a7a93caf04e 100644
--- a/LibOneM2M/OneM2M_Ports.ttcn
+++ b/LibOneM2M/OneM2M_Ports.ttcn
@@ -31,7 +31,7 @@ module OneM2M_Ports {
MsgIn;
out
MsgOut;
- map param (in PortDesc p_portDesc, in charstring p_sutAddress);
+ map param (in PortDesc p_portDesc);
};
/**
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 80dcac237e823fc1c2064179b3d1f58b7746eb7f..3244d97bf37b896593f7f6a7e7721b60af59663d 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -8780,7 +8780,7 @@ type record BindingDesc {
charstring tsAddress,
integer remotePort optional,
integer localPort optional,
- charstring sutAddress optional
+ charstring sutAddress
}
/**
@@ -8846,18 +8846,12 @@ type record SutDesc {
}
/**
- * @desc UpperTester component settinmgs
+ * @desc UpperTester component settings
* @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
+ * @member url Test System IP address
*/
type record UtDesc {
- charstring tsAddress,
- integer utApplicationPort,
- charstring utApplicationAddress optional,
- charstring utApplicationUrl
+ charstring url
}
/**
@@ -8896,7 +8890,6 @@ type record TestSystemSettingsDesc {
AeSimuComponentDesc AE1,
AeSimuComponentDesc AE2,
CseSimuComponentDesc CSE1,
- SutDesc SUT,
UtDesc UT optional
}
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 0fc25c4b1cdad6ad415dc12dbd6c32d3266e6a28..07c3a0d44f2d0883f2519ab467fc3031d78faa92 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
stop;
}
[] tc_ac.timeout {
@@ -422,12 +422,12 @@ module OneM2M_PermutationFunctions {
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, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -560,12 +560,12 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : AE 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, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_update)) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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);
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_update)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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));
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive (mw_request(mw_retrieve(?))){
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve request for unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including the optional attribute!");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -833,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
@@ -894,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
@@ -955,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
@@ -1017,7 +1017,7 @@ module OneM2M_PermutationFunctions {
v_addressingMethod := e_nonHierarchical;
v_primitiveScope := p_primitiveScope;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, 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))) {
@@ -1074,7 +1074,8 @@ module OneM2M_PermutationFunctions {
v_addressingMethod := e_hierarchical;
v_primitiveScope := p_primitiveScope;
- 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;
+ f_send(e_mca_port, 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;
@@ -1130,7 +1131,8 @@ module OneM2M_PermutationFunctions {
v_addressingMethod := e_hierarchical;
v_primitiveScope := p_primitiveScope;
- 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;
+ f_send(e_mca_port, 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;
@@ -1186,7 +1188,8 @@ module OneM2M_PermutationFunctions {
v_addressingMethod := e_hybrid;
v_primitiveScope := p_primitiveScope;
- 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;
+ f_send(e_mca_port, 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;
@@ -1252,7 +1255,7 @@ module OneM2M_PermutationFunctions {
v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1315,7 +1318,7 @@ module OneM2M_PermutationFunctions {
v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1378,7 +1381,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1441,7 +1444,7 @@ module OneM2M_PermutationFunctions {
v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1505,7 +1508,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1565,7 +1568,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1625,7 +1628,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1685,7 +1688,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1749,7 +1752,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1802,7 +1805,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
@@ -1846,7 +1849,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(p_createAe);
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
@@ -1892,7 +1895,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(v_resourceType, p_requestPrimitive, -1);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -1946,7 +1949,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(int2, p_createRequestPrimitive, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -2004,7 +2007,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] mccPortIn.receive {
tc_ac.stop;
@@ -2073,7 +2076,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_send(InterfaceIds:e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));
+ f_send(InterfaceIds:e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2119,7 +2122,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex := f_cse_createResource(int2, p_createRequestPrimitive, -1);
- f_send(InterfaceIds:e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
+ f_send(InterfaceIds:e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2165,7 +2168,7 @@ module OneM2M_PermutationFunctions {
// Preamble
vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+ f_send(e_mcc_port, 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 {
@@ -2218,7 +2221,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -2450,7 +2453,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_deleteResourceHandler(v_targetResourceIndex));
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responseStatusCode))) -> value vc_response {
@@ -2554,7 +2557,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -2636,7 +2639,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -2699,7 +2702,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -2776,7 +2779,7 @@ module OneM2M_PermutationFunctions {
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) -> value v_response {
@@ -2835,7 +2838,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -2892,7 +2895,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, {p_invalidAttribute})));
+ f_send(e_mca_port, m_request(v_request, {p_invalidAttribute}));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -2951,7 +2954,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -3017,7 +3020,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex); ////Child2
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3079,7 +3082,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex); //Child2
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3161,9 +3164,9 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
if(v_myOptionalAttribute == "creator") {
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, {{v_myOptionalAttribute, omit}})));
+ f_send(e_mca_port, m_request(v_request, {{v_myOptionalAttribute, omit}}));
} else {
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
}
tc_ac.start;
alt {
@@ -3228,7 +3231,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
@@ -3279,7 +3282,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3300,7 +3303,7 @@ module OneM2M_PermutationFunctions {
}
//Check currentByteSize
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -3354,7 +3357,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
v_request.resultContent := int0;//Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, omit))) -> value v_response {
@@ -3410,7 +3413,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
v_request.resultContent := int2;//Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3471,7 +3474,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
v_request.resultContent := int3;//Attributes + Hierarchichal Address
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3528,7 +3531,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
v_request.resultContent := p_resultContent;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -3580,7 +3583,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
v_request.resultContent := int1;//Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3637,7 +3640,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
v_request.resultContent := int9;//Modified Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3695,7 +3698,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aEAnncIndex);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -3760,7 +3763,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
vc_cse1.done;
@@ -3813,7 +3816,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
vc_cse1.done;
vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
@@ -3864,7 +3867,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_parentIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -3931,7 +3934,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -3984,7 +3987,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -4040,7 +4043,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -4096,8 +4099,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
- {"pi", "ct"}, f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+ {"pi", "ct"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -4153,8 +4156,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl"}, f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl"}, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -4206,8 +4209,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- p_attributeList, f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ p_attributeList, f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -4290,7 +4293,7 @@ module OneM2M_PermutationFunctions {
}
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4386,7 +4389,7 @@ module OneM2M_PermutationFunctions {
}
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4461,7 +4464,7 @@ module OneM2M_PermutationFunctions {
}
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port, m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4542,7 +4545,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4623,8 +4626,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
- {"pi", "ct"}, f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port,m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+ {"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4705,8 +4708,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl"}, f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4783,8 +4786,8 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
- {"lbl", "at"}, f_getOriginator(v_aeIndex)))));//from AE ID
+ f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+ {"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
tc_ac.start;
alt {
@@ -4840,7 +4843,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := p_resultContent;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -4905,7 +4908,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int1;//Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -4974,7 +4977,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5044,7 +5047,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5113,7 +5116,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5182,7 +5185,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5243,7 +5246,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5304,7 +5307,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5364,7 +5367,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, p_nullFields)));
+ f_send(e_mca_port, m_request(v_request, p_nullFields));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5422,7 +5425,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, p_nullFields)));
+ f_send(e_mca_port, m_request(v_request, p_nullFields));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5487,7 +5490,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -5543,7 +5546,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -5599,7 +5602,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request,p_nullFields)));
+ f_send(e_mca_port, m_request(v_request, p_nullFields));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -5655,7 +5658,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -5707,7 +5710,7 @@ module OneM2M_PermutationFunctions {
f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -5758,7 +5761,7 @@ module OneM2M_PermutationFunctions {
//Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -5814,7 +5817,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5895,7 +5898,7 @@ module OneM2M_PermutationFunctions {
//Test Body
vc_request.primitive.requestPrimitive := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(vc_request.primitive.requestPrimitive))); //CSEBase
+ f_send(e_mca_port, m_request(vc_request.primitive.requestPrimitive)); //CSEBase
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5984,7 +5987,7 @@ module OneM2M_PermutationFunctions {
v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -6005,7 +6008,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;
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
}
@@ -6142,7 +6145,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_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -6182,7 +6185,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;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -6247,7 +6250,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int0;//Nothing
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, omit))) -> value v_response {
@@ -6316,7 +6319,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int1;//Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, p_contentResponse))) -> value v_response {
@@ -6385,7 +6388,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int9;//Modified Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, p_contentResponse))) -> value v_response {
@@ -6455,7 +6458,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -6543,7 +6546,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.from_ := f_getOriginator(v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6617,7 +6620,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
+ f_send(e_mca_port, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
tc_ac.start;
alt {
@@ -6669,7 +6672,7 @@ module OneM2M_PermutationFunctions {
v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
+ f_send(e_mca_port, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
tc_ac.start;
alt {
@@ -6799,7 +6802,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := p_resultContent;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -6865,7 +6868,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int0;//Nothing
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response {
@@ -6935,7 +6938,7 @@ module OneM2M_PermutationFunctions {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int1;//Attributes
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, p_contentResponse))) -> value v_response {
@@ -7003,7 +7006,7 @@ module OneM2M_PermutationFunctions {
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -7099,7 +7102,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7176,7 +7179,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -7243,7 +7246,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7320,7 +7323,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -7383,7 +7386,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7470,7 +7473,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -7543,7 +7546,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -7611,7 +7614,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
@@ -7714,7 +7717,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := "UnknowOriginator";
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -7785,7 +7788,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -7841,7 +7844,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := "testDomain";
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -7867,7 +7870,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";
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -7915,7 +7918,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := "UnknowOriginator";
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -7973,7 +7976,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8043,7 +8046,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8106,7 +8109,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8164,7 +8167,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8220,7 +8223,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8281,7 +8284,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8337,7 +8340,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8398,7 +8401,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(int3, p_requestPrimitive, v_containerIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(v_request))));
+ f_send(e_mca_port, m_request(valueof(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8486,7 +8489,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -8606,7 +8609,7 @@ module OneM2M_PermutationFunctions {
}
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(valueof(v_responsePrimitive))));
+ f_send(e_mcc_in_port, m_response(valueof(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -8628,7 +8631,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.primitiveContent := v_announcedResource;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -8679,7 +8682,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -8802,7 +8805,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.primitiveContent := v_announcedResource;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -8829,7 +8832,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.primitiveContent := v_announcedResource;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -8934,7 +8937,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.primitiveContent := v_announcedResource;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -8961,7 +8964,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.primitiveContent := v_announcedResource;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -9100,7 +9103,7 @@ module OneM2M_PermutationFunctions {
v_resourceAnncIndex := f_cse_createResource(p_resourceType,p_createRequestAnnc);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -9334,7 +9337,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_deleteHandler());
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
+ f_send(e_mca_port, m_request(v_updateRequest, p_nullFields));
tc_ac.start;
alt {
@@ -9459,7 +9462,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_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -9622,7 +9625,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_updateHandler());
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
@@ -9705,7 +9708,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_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -9770,7 +9773,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_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -9835,7 +9838,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_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -9899,7 +9902,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_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
@@ -9944,7 +9947,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_updateHandler());
v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest, p_nullFields)));
+ f_send(e_mca_port, m_request(v_updateRequest, p_nullFields));
tc_ac.start;
alt {
@@ -10008,7 +10011,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
@@ -10074,7 +10077,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_announcementProcedure_deleteHandler());
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -10216,7 +10219,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex2);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -10280,7 +10283,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5206))) -> value v_response {
@@ -10348,7 +10351,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
@@ -10376,7 +10379,7 @@ module OneM2M_PermutationFunctions {
//Check to see if the resource is present or not
if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
+ f_send(e_mca_port, 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))) {
@@ -10448,7 +10451,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponseUri))) -> value v_response {
@@ -10492,7 +10495,7 @@ module OneM2M_PermutationFunctions {
v_primitiveContent.container := mw_contentContainer_rc1;
//v_primitiveContent := omit;
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
+ f_send(e_mca_port, 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{
@@ -10523,7 +10526,7 @@ module OneM2M_PermutationFunctions {
setverdict(fail, testcasename() & ": RequestStatus: FAIL");
}else{ //PENDING, FORWARDING or PARTIALLY_COMPLETED
f_sleep(PX_TAC/5.0);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
repeat;
}
}
@@ -10586,7 +10589,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.responseType := {int2,omit}; //nonBlockingRequestAsynch
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, omit))) -> value v_response {
@@ -10665,7 +10668,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
@@ -10693,7 +10696,7 @@ module OneM2M_PermutationFunctions {
//Check to see if the resource is present or not
if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(v_response.primitive.responsePrimitive.primitiveContent.uRI, f_getOriginator(v_aeIndex)))));
+ f_send(e_mca_port, 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))) {
@@ -10757,7 +10760,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.responseType := {int2, omit}; //nonBlockingRequestAsynch and no notification target list is provided"
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
@@ -10835,7 +10838,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
@@ -10920,7 +10923,7 @@ module OneM2M_PermutationFunctions {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
+ f_send(e_mca_port, 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 a7d91e600f001af5dca96ae96e65c43504d677ae..ddd3e4c44b961440bd53051dd342661a5fe1ffe7 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -489,12 +489,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
//send back responsePrimitive
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -693,12 +693,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive (mw_request(mw_delete(?))) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected DELETE request");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -754,12 +754,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -812,12 +812,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive))));
+ f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1313,12 +1313,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));
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1373,12 +1373,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));
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1429,12 +1429,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));
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1487,12 +1487,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));
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1551,13 +1551,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1612,13 +1612,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1673,13 +1673,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1736,13 +1736,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1804,12 +1804,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -1990,12 +1990,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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!!");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -2022,12 +2022,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -2037,7 +2037,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_checkCseSimuStatus();
//Test behavior
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex)))));
+ f_send(e_mca_in_port, m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex))));
tc_ac.start;
alt{
@@ -2099,12 +2099,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, 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!!");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -2131,12 +2131,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
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
+ f_send(e_mca_in_port, 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!");
@@ -2146,7 +2146,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_checkCseSimuStatus();
//Test behavior
- f_send(e_mca_in_port, f_getMsgOutPrimitive(m_request(m_notifyAggregatedNotification)));
+ f_send(e_mca_in_port, 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 23afd359b54a27b701630d4e4422770af9dd503d..081c08ac56526c1224f841177ba5ea8b4333e984 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -53,7 +53,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
t_ac.start;
alt {
@@ -535,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) {
@@ -734,7 +734,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1))));
+ f_send(e_mca_port, m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, "S"),-1)));
//Test Body
tc_ac.start;
@@ -832,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);
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mccPortIn.receive(mw_request(mw_update)) {
tc_ac.stop;
@@ -903,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;
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
@@ -972,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)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
//Test Body
f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
@@ -1047,7 +1047,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1209,7 +1209,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) {
@@ -1304,7 +1304,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -1368,7 +1368,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -1430,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -1486,7 +1486,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1556,7 +1556,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) {
@@ -1642,7 +1642,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mcc_in_port, m_response(v_response));
tc_ac.start(10.0);
repeat;
}
@@ -1692,7 +1692,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Preamble
v_request := f_getCreateRequestPrimitive(int16, m_createRemoteCSEBase, -1);
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
// Test Body
tc_ac.start;
@@ -1957,7 +1957,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2057,7 +2057,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_contentResponse.aE := mw_contentAeBase;
- 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
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2182,7 +2182,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse_IN.cSEBase := mw_contentCSEBase_rc1;
v_contentResponse_IN.cSEBase.cseType := int1;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2264,7 +2264,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- f_send(InterfaceIds:e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+ f_send(InterfaceIds:e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2403,7 +2403,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex)))));//TODO Maybe PX_SUPER_AE_ID
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
@@ -2507,7 +2507,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mcc_in_port, m_response(v_response));
}
[] mccPortIn.receive(mw_request(?)) {
tc_ac.stop;
@@ -2558,7 +2558,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- f_send(InterfaceIds:e_mcc_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)))));
+ f_send(InterfaceIds:e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2629,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -2812,7 +2812,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(), f_getOriginator()));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -2865,7 +2865,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
- f_send(e_mcc_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -2931,7 +2931,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3021,7 +3021,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
v_response.from_ := PX_CSE1_ID;
v_response.to_ := v_request.primitive.requestPrimitive.from_;
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response)));
+ f_send(e_mcc_in_port, m_response(v_response));
}
[] mccPortIn.receive(mw_request(?)) {
tc_ac.stop;
@@ -3654,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3739,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3815,7 +3815,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
v_contentResponse.container := mw_contentContainerBase;
@@ -3894,7 +3894,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -3972,7 +3972,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -4212,7 +4212,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
@@ -4422,7 +4422,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -4499,7 +4499,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -5531,7 +5531,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getUpdateRequestPrimitive(v_resourceType, v_aeIndex, v_updateRequest);
v_request.to_ := v_targetResourceAddress;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -5944,7 +5944,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
tc_ac.start;
alt {
@@ -6022,7 +6022,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -6105,7 +6105,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest; //<latest>
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -6188,7 +6188,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest; //<oldest>
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -7695,7 +7695,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
+ f_send(e_mca_port, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
tc_ac.start;
alt {
@@ -7718,7 +7718,7 @@ module OneM2M_Testcases_CSE_Release_1 {
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -7865,7 +7865,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -7887,7 +7887,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2)))));
+ f_send(e_mca_port, m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
tc_ac.start;
alt {
@@ -7957,7 +7957,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -7979,7 +7979,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1)))));
+ f_send(e_mca_port, m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
tc_ac.start;
alt {
@@ -8053,7 +8053,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8125,7 +8125,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request.primitiveContent.subscription.notificationURI := {"NotReachableNotificationURI"};
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED
@@ -8274,7 +8274,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8359,7 +8359,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;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -8445,7 +8445,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -8538,7 +8538,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8621,7 +8621,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);// CSE child resource
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8698,7 +8698,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_contentResponse))) -> value v_response {
@@ -8777,7 +8777,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -8875,7 +8875,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -8967,7 +8967,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -9521,7 +9521,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)){
@@ -9587,7 +9587,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9658,7 +9658,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9728,7 +9728,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9807,7 +9807,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -9872,7 +9872,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
}
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -9941,7 +9941,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"};
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request, {v_invalidAttribute})));
+ f_send(e_mca_port, m_request(v_request, {v_invalidAttribute}));
tc_ac.start;
alt {
@@ -10085,7 +10085,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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10173,7 +10173,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -10259,7 +10259,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response {
@@ -10332,7 +10332,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10397,7 +10397,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10464,7 +10464,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10546,7 +10546,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10628,7 +10628,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_createRequest)));
+ f_send(e_mca_port, m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
@@ -10717,7 +10717,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_resourceShortNameLatest;
// Test Body
- 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
+ f_send(e_mca_port, 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 {
@@ -10817,7 +10817,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response {
@@ -10890,7 +10890,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
//Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -10980,7 +10980,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response
+ f_send(e_mca_port, 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 {
@@ -11070,7 +11070,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
// Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));// TODO see if the memberTypeValidated is present in the update response
+ f_send(e_mca_port, 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 {
@@ -11177,7 +11177,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11284,7 +11284,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
//Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
@@ -11366,7 +11366,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;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -11448,7 +11448,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
//Test Body
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_updateRequest)));
+ f_send(e_mca_port, m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -11544,7 +11544,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11662,7 +11662,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request.to_ := f_getResourceAddress(v_remoteCSEIndex);
//Content set to <remoteCSE> resource containing onlineStatus := false;
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 69e140ba18b7dae8586fcbd8929921c1823eb5c7..9e8263edad26819a609faa5364eb93b90b599509 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));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
t_ac.start;
alt {
@@ -2760,7 +2760,7 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, omit))) -> value v_response {
@@ -2900,7 +2900,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -2975,7 +2975,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -3154,7 +3154,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -3237,7 +3237,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -3325,7 +3325,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -3416,7 +3416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
@@ -3500,7 +3500,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -3733,7 +3733,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
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -3820,7 +3820,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_deleteRequest)));
+ f_send(e_mca_port, m_request(v_deleteRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -3904,7 +3904,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_deleteRequest)));
+ f_send(e_mca_port, m_request(v_deleteRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -4027,7 +4027,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)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
+ f_send(e_mca_port, m_request(v_req1));
v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
@@ -4066,7 +4066,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3)));
+ f_send(e_mca_port, m_request(v_req3));
tc_ac.start;
alt {
@@ -4141,7 +4141,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)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
+ f_send(e_mca_port, m_request(v_req1));
tc_ac.start;
alt {
@@ -4174,7 +4174,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3)));
+ f_send(e_mca_port, m_request(v_req3));
tc_ac.start;
alt {
@@ -4244,7 +4244,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)));
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
+ f_send(e_mca_port, m_request(v_req1));
v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
@@ -4281,7 +4281,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);
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3)));
+ f_send(e_mca_port, m_request(v_req3));
tc_ac.start;
alt {
@@ -4369,7 +4369,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 };
- f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response_rsp1)));
+ f_send(e_mcc_in_port, m_response(v_response_rsp1));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
@@ -4472,7 +4472,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};
- f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
+ f_send(e_mca_port, m_request(v_req1));
tc_ac.start;
alt {