diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7ee882cbd6af024c29163169c7b95a4f5bcc1c18..ee0d92a78c77e5700a876122138d463b638fecdb 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -315,6 +315,153 @@ module OneM2M_Functions {
//Initialize the IUT
} // end f_cf04Up
+
+ /**
+ * @desc Ports mapping and default behaviour activation for Config 06
+ */
+ function f_cf06Up() runs on AeSimu system CseSystem {
+
+ // Variables
+ var charstring v_binding;
+ var charstring v_binding_in;
+ var charstring v_host;
+ vc_config := e_cf06;
+ vc_testSystemRole := e_ae;
+
+ // Map
+ map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:acPort, system:acPort);
+ if(PX_UT_IMPLEMENTED) {
+ map(self:utPort, system:utPort);
+ }
+
+ f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+
+ activate(a_default());
+ vc_aeSimu := activate(a_cse_cf06_ae1());
+
+ //Create DAS
+ vc_das := AeSimu.create("DAS") alive;
+ vc_das.start(f_cf06UpDas());
+ vc_das.done;
+
+ } // end f_cf06Up
+
+ /**
+ @desc Ports mapping and default behaviour activation for Config 06 on the DAS
+ */
+ function f_cf06UpDas() runs on AeSimu system CseSystem {
+
+ // Variables
+ var charstring v_binding;
+ var charstring v_binding_in;
+ var charstring v_host;
+ vc_config := e_cf06;
+ vc_testSystemRole := e_das;
+
+ // Map
+ map(self:mcaPort, system:mcaPort) param (PX_TS_DAS.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_DAS.mcaPortIn);
+ map(self:acPort, system:acPort);
+
+ f_setProtocolBinding(PX_TS_DAS.mcaPort, PX_TS_DAS.mcaPortIn, v_binding, v_host, v_binding_in);
+
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_DAS.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_DAS.mcaPortIn.serialization };
+
+ activate(a_default());
+ vc_aeSimu := activate(a_cse_cf06_das());
+
+ } // end f_cf02UpCse1
+
+ /**
+ * @desc Ports mapping and default behaviour activation for Config 06 (reversed)
+ */
+ function f_cf06UpDasSimuMaster() runs on AeSimu system CseSystem {
+
+ // Variables
+ var charstring v_binding;
+ var charstring v_binding_in;
+ var charstring v_host;
+ vc_config := e_cf06DasSimuMaster;
+ vc_testSystemRole := e_das;
+
+ // Map
+ map(self:mcaPort, system:mcaPort) param (PX_TS_DAS.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_DAS.mcaPortIn);
+ map(self:acPort, system:acPort);
+
+ f_setProtocolBinding(PX_TS_DAS.mcaPort, PX_TS_DAS.mcaPortIn, v_binding, v_host, v_binding_in);
+
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_DAS.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_DAS.mcaPortIn.serialization };
+
+ activate(a_default());
+ vc_aeSimu := activate(a_cse_cf06_das());
+
+ //Create AE
+ vc_ae1 := AeSimu.create("AE1") alive;
+ vc_ae1.start(f_cf06UpAe1());
+ vc_ae1.done;
+
+ } // end f_cf06UpDasSimuMaster
+
+ /**
+ @desc Ports mapping and default behaviour activation for Config 06 (reversed) on the AE1
+ */
+ function f_cf06UpAe1() runs on AeSimu system CseSystem {
+
+ // Variables
+ var charstring v_binding;
+ var charstring v_binding_in;
+ var charstring v_host;
+ vc_config := e_cf06DasSimuMaster;
+ vc_testSystemRole := e_ae;
+
+ // Map
+ map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
+ map(self:acPort, system:acPort);
+ if(PX_UT_IMPLEMENTED) {
+ map(self:utPort, system:utPort);
+ }
+
+ if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
+ v_binding := "HTTP";
+ v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
+ v_binding := "COAP";
+ v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
+ } else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
+ v_binding := "MQTT";
+ v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+ } else {
+ v_binding := "WSCK";
+ v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
+ }
+
+ if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
+ v_binding_in := "HTTP";
+ } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
+ v_binding_in := "COAP";
+ } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
+ v_binding_in := "MQTT";
+ } else {
+ v_binding_in := "WSCK";
+ }
+
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, PX_TS_AE1.mcaPort.serialization };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, PX_TS_AE1.mcaPortIn.serialization };
+
+ activate(a_default());
+ vc_aeSimu := activate(a_cse_cf06_ae1());
+
+ } // end f_cf02UpAe1
+
/**
* @desc Ports unmapping
@@ -401,93 +548,6 @@ module OneM2M_Functions {
}
}// end f_cf04Down
-
-
- /**
- * @desc Ports mapping and default behaviour activation for Config 06
- */
- function f_cf06Up() runs on AeSimu {
-
- // Variables
- vc_config := e_cf06;
- vc_testSystemRole := e_ae;
-
- //Create DAS
- vc_das := AeSimu.create("DAS") alive;
- vc_das.start(f_cf06UpDas());
- vc_das.done;
-
- // Map
- map(self:mcaPort, system:mcaPort);
- map(self:mcaPortIn, system:mcaPortIn);
- map(self:acPort, system:acPort);
- if(PX_UT_IMPLEMENTED) {
- map(self:utPort, system:utPort);
- }
- activate(a_default());
- vc_aeSimu := activate(a_cse_cf06_ae1());
-
- } // end f_cf06Up
-
- /**
- @desc Ports mapping and default behaviour activation for Config 06 on the DAS
- */
- function f_cf06UpDas() runs on AeSimu {
-
- // Variables
- vc_config := e_cf06;
- vc_testSystemRole := e_das;
-
- // Map
- map(self:mcaPort, system:mcaPort);
- map(self:mcaPortIn, system:mcaPortIn);
- map(self:acPort, system:acPort);
-
- } // end f_cf02UpCse1
-
- /**
- * @desc Ports mapping and default behaviour activation for Config 06 (reversed)
- */
- function f_cf06UpDasSimuMaster() runs on AeSimu {
-
- // Variables
- vc_config := e_cf06DasSimuMaster;
- vc_testSystemRole := e_das;
-
- //Create AE
- vc_ae2 := AeSimu.create("AE2") alive;
- vc_ae2.start(f_cf06UpAe2());
- vc_ae2.done;
-
- // Map
- map(self:mcaPort, system:mcaPort);
- map(self:mcaPortIn, system:mcaPortIn);
- map(self:acPort, system:acPort);
- if(PX_UT_IMPLEMENTED) {
- map(self:utPort, system:utPort);
- }
- activate(a_default());
- vc_aeSimu := activate(a_cse_cf06_das());
-
- } // end f_cf06UpDasSimuMaster
-
- /**
- @desc Ports mapping and default behaviour activation for Config 06 (reversed) on the AE2
- */
- function f_cf06UpAe2() runs on AeSimu {
-
- // Variables
- vc_config := e_cf06DasSimuMaster;
- vc_testSystemRole := e_ae;
-
- // Map
- map(self:mcaPort, system:mcaPort);
- map(self:mcaPortIn, system:mcaPortIn);
- map(self:acPort, system:acPort);
-
- //Initialze the IUT
-
- } // end f_cf02UpAe1
/**
* @desc Ports unmapping for Config 06
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index e058379368413bd23f9bd52dec7dcc849aae403d..9e289197fee93510a3fdd9992fb0be67e08bb9bd 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -138,6 +138,12 @@ module OneM2M_Pixits {
group TesterParameters {
/**
+ * @desc Port numbering convention
+ *
+ * "3" = mca interface, "4" = mcc interface & CseSimu = "1", AeSimu = "0" & "3" = client, "4" server" & "2" = Primary/secondary AE/CSE components or "3" for DAS
+ */
+
+ /**
* @desc Test System settings
*/
modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
@@ -163,7 +169,7 @@ module OneM2M_Pixits {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
- remotePort := 8080,
+ remotePort := omit,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1"
}
@@ -230,7 +236,7 @@ module OneM2M_Pixits {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
- remotePort:= 8080,
+ remotePort:= omit,
localPort := 3141,
sutAddress := "127.0.0.1"
}
@@ -258,7 +264,7 @@ module OneM2M_Pixits {
bindingProtocol := e_http ,
bindingDesc := {
tsAddress := "127.0.0.1",
- remotePort:= 8080,
+ remotePort:= omit,
localPort := 4141,
sutAddress := "127.0.0.1"
}
@@ -270,11 +276,39 @@ module OneM2M_Pixits {
modulepar UtDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
- /**
- * @desc DAU IP address and listening port
- */
- modulepar charstring PX_DAU_ADDRESS := "127.0.0.1:3142";
-
+ modulepar AeSimuComponentDesc PX_TS_DAS := { // DAS component settings
+ aeIdStem := "",
+ appId := "",
+ mcaPort := {
+ binding := {
+ httpBindingDesc := {
+ bindingProtocol := e_http,
+ bindingDesc := {
+ tsAddress := "127.0.0.1",
+ remotePort := 8080, // SUT CoAP/HTTP port
+ localPort := 3033, // Test Adapter client port (for debug purpose only)
+ sutAddress := "127.0.0.1"
+ }
+ }
+ },
+ serialization := "xml"
+ },
+ mcaPortIn := {
+ binding := {
+ httpBindingDesc := {
+ bindingProtocol := e_http,
+ bindingDesc := {
+ tsAddress := "127.0.0.1",
+ remotePort := omit,
+ localPort := 3043, // Test Adapter listener port (AeSimu acts as server)
+ sutAddress := "127.0.0.1"
+ }
+ }
+ },
+ serialization := "xml"
+ }
+ };
+
}
group ExecutionParameters {
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index dcb5356ae5d0ec271ce122cb8db468547f621495..9b204a3a444be707c11d0b80ec52361f420a22da 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -73,6 +73,7 @@ module OneM2M_TestSystem {
//DAS
var AeSimu vc_das;
+ var AeSimu vc_ae1;
};
type component CseSimu extends Tester {
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index c11f6f1abccbebdef69cdc3bbe8a9b8a9deaac33..84d43653db88c52e9c951891792be67ed76ba5a5 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -13,7 +13,7 @@ module OneM2M_TypesAndValues {
import from XSD all;
import from OneM2M_Types all;
- import from OneM2M_Types_HAIM all;
+ import from OneM2M_Types_homeDevice all;
group ResourceNames {
/* Constants */