Commit d91c49e3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'TS_PIXITS_ENHANCEMENT_BUGGY' of https://git.onem2m.org/TST/ATS...

Merge branch 'TS_PIXITS_ENHANCEMENT_BUGGY' of https://git.onem2m.org/TST/ATS into TS_PIXITS_ENHANCEMENT_BUGGY
parents 784724ac 29d64ec9
......@@ -64,8 +64,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(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(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, 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)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
......@@ -122,8 +122,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(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(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, 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)] };
//Initialze the IUT
......@@ -159,7 +159,7 @@ module OneM2M_Functions {
v_port := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
}
vc_myInterfaces[enum2int(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, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), 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);
......@@ -217,8 +217,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(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(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, 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)] };
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
......@@ -274,8 +274,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(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(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, 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)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf02_cse1());
......@@ -328,8 +328,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(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(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, 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)] };
//Initialze the IUT
......@@ -370,7 +370,8 @@ module OneM2M_Functions {
v_port := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort;
}
vc_myInterfaces[enum2int(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, PX_TS_SETTINGS.SUT.sutAddress & ":" & int2str(v_port), 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);
......@@ -429,8 +430,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
vc_myInterfaces[enum2int(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(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, 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)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf04());
......
......@@ -121,10 +121,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 := {
......@@ -151,10 +151,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 := {
......@@ -174,17 +174,17 @@ module OneM2M_Pixits {
mcaPort := {
binding := {
coapBindingDesc := {
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3031,
sutAddress := omit
}
bindingProtocol := e_coap,
bindingDesc := {
tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3031,
sutAddress := omit
}
},
serialization := e_xml
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
coapBindingDesc := {
......@@ -202,17 +202,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