Commit f9becf10 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Adapting OneM2M_Testcases_CSE_Release_2 file to the new Test System PIXIT


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent a7dd1ad7
......@@ -59,8 +59,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
......@@ -112,8 +112,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] };
vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
//Initialze the IUT
......@@ -122,7 +122,7 @@ module OneM2M_Functions {
/**
* @desc Ports mapping and default behaviour activation for Config 02
*/
function f_cf02Up(in CseTypeID p_cseType := int2) runs on AeSimu system AeSystem {
function f_cf02Up(in CseTypeID p_cseType := int2) runs on AeSimu system CseSystem {
// Variables
var charstring v_binding;
......@@ -144,7 +144,7 @@ module OneM2M_Functions {
v_binding := "WSCK";
}
vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, 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);
......@@ -197,8 +197,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
......@@ -249,8 +249,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf02_cse1());
......@@ -298,8 +298,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
//Initialze the IUT
......@@ -335,7 +335,7 @@ module OneM2M_Functions {
v_binding := "WSCK";
}
vc_myInterfaces[enum2int(e_mca_in_port)] := { mcaPortIn, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
......@@ -389,8 +389,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf04());
......
......@@ -126,10 +126,10 @@ module OneM2M_Pixits {
localPort := 3131, // Test Adapter client port (for debug purpose only)
sutAddress := omit
}
}
},
serialization := e_xml
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
httpBindingDesc := {
......@@ -156,10 +156,10 @@ module OneM2M_Pixits {
localPort := 3132, // Test Adapter client port (for debug purpose only)
sutAddress := omit
}
}
},
serialization := e_xml
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
coapBindingDesc := {
......@@ -179,16 +179,17 @@ module OneM2M_Pixits {
mcaPort := {
binding := {
coapBindingDesc := {
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3031
}
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3031,
sutAddress := omit
}
},
serialization := e_xml
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
coapBindingDesc := {
......@@ -206,17 +207,17 @@ module OneM2M_Pixits {
mccPort := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4031,
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4031,
sutAddress := omit
}
}
},
serialization := e_xml
}
},
serialization := e_xml
},
mccPortIn := {
binding := {
coapBindingDesc := {
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment