Commit 48f4244749742ceebe5f487a35c0e32f5ce3c53e

Authored by Yann Garcia
1 parent 36c1b68e

Reorganize Test System PIXIT PX_TS_SETTINGS.

... ... @@ -37,35 +37,35 @@ module OneM2M_Functions {
37 37 vc_testSystemRole := e_ae;
38 38  
39 39 // Map
40   - map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
41   - map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn);
  40 + map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
  41 + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
42 42 map(self:acPort, system:acPort);
43 43  
44   - if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
  44 + if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
45 45 v_binding := "HTTP";
46   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
47   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
  46 + v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
  47 + } else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
48 48 v_binding := "COAP";
49   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
50   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
  49 + v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
  50 + } else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
51 51 v_binding := "MQTT";
52   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  52 + v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
53 53 } else {
54 54 v_binding := "WSCK";
55   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
  55 + v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
56 56 }
57   - if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) {
  57 + if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
58 58 v_binding_in := "HTTP";
59   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.coapBindingDesc)) {
  59 + } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
60 60 v_binding_in := "COAP";
61   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.mqttBindingDesc)) {
  61 + } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
62 62 v_binding_in := "MQTT";
63 63 } else {
64 64 v_binding_in := "WSCK";
65 65 }
66 66  
67   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
68   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
  67 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
  68 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
69 69  
70 70 activate(a_default());
71 71 vc_aeSimu := activate(a_cse_cf01());
... ... @@ -95,35 +95,35 @@ module OneM2M_Functions {
95 95 vc_testSystemRole := e_ae;
96 96  
97 97 // Map
98   - map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE2.mcaPort);
99   - map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE2.mcaPortIn);
  98 + map(self:mcaPort, system:mcaPort) param (PX_TS_AE2.mcaPort);
  99 + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE2.mcaPortIn);
100 100 map(self:acPort, system:acPort);
101 101  
102   - if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc)) {
  102 + if (ischosen(PX_TS_AE2.mcaPort.binding.httpBindingDesc)) {
103 103 v_binding := "HTTP";
104   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
105   - } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) {
  104 + v_host := PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
  105 + } else if (ischosen(PX_TS_AE2.mcaPort.binding.coapBindingDesc)) {
106 106 v_binding := "COAP";
107   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
108   - } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) {
  107 + v_host := PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
  108 + } else if (ischosen(PX_TS_AE2.mcaPort.binding.mqttBindingDesc)) {
109 109 v_binding := "MQTT";
110   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  110 + v_host := PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
111 111 } else {
112 112 v_binding := "WSCK";
113   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
  113 + v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
114 114 }
115   - if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.httpBindingDesc)) {
  115 + if (ischosen(PX_TS_AE2.mcaPortIn.binding.httpBindingDesc)) {
116 116 v_binding_in := "HTTP";
117   - } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.coapBindingDesc)) {
  117 + } else if (ischosen(PX_TS_AE2.mcaPortIn.binding.coapBindingDesc)) {
118 118 v_binding_in := "COAP";
119   - } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPortIn.binding.mqttBindingDesc)) {
  119 + } else if (ischosen(PX_TS_AE2.mcaPortIn.binding.mqttBindingDesc)) {
120 120 v_binding_in := "MQTT";
121 121 } else {
122 122 v_binding_in := "WSCK";
123 123 }
124 124  
125   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPort.serialization)] };
126   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
  125 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
  126 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
127 127  
128 128 //Initialze the IUT
129 129  
... ... @@ -142,27 +142,27 @@ module OneM2M_Functions {
142 142 vc_cse1 := CseSimu.create("CSE1") alive;
143 143  
144 144 // Map
145   - map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
  145 + map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
146 146 map(self:acPort, system:acPort);
147 147  
148   - if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) {
  148 + if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) {
149 149 v_binding := "HTTP";
150   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
151   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
  150 + v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
  151 + } else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
152 152 v_binding := "COAP";
153   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
154   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
  153 + v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
  154 + } else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
155 155 v_binding := "MQTT";
156   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  156 + v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
157 157 } else {
158 158 v_binding := "WSCK";
159   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
  159 + v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
160 160 }
161 161  
162   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
  162 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
163 163  
164 164 if(PX_UT_IMPLEMENTED) {
165   - map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
  165 + map(self:utPort, system:utPort) param (PX_TS_UT);
166 166 }
167 167 activate(a_default());
168 168 vc_aeSimu := activate(a_cse_cf02_ae1());
... ... @@ -190,35 +190,35 @@ module OneM2M_Functions {
190 190 vc_cseType := p_cseType;
191 191  
192 192 // Map
193   - map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
194   - map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
  193 + map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
  194 + map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
195 195 map(self:acPort, system:acPort);
196 196  
197   - if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
  197 + if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
198 198 v_binding := "HTTP";
199   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
200   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) {
  199 + v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
  200 + } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
201 201 v_binding := "COAP";
202   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
203   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) {
  202 + v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
  203 + } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
204 204 v_binding := "MQTT";
205   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  205 + v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
206 206 } else {
207 207 v_binding := "WSCK";
208   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
  208 + v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
209 209 }
210   - if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
  210 + if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
211 211 v_binding_in := "HTTP";
212   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
  212 + } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
213 213 v_binding_in := "COAP";
214   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
  214 + } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
215 215 v_binding_in := "MQTT";
216 216 } else {
217 217 v_binding_in := "WSCK";
218 218 }
219 219  
220   - vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
221   - vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
  220 + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
  221 + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
222 222  
223 223 v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
224 224 vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
... ... @@ -247,35 +247,35 @@ module OneM2M_Functions {
247 247 vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
248 248  
249 249 // Map
250   - map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
251   - map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
  250 + map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
  251 + map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
252 252 map(self:acPort, system:acPort);
253 253  
254   - if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
  254 + if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
255 255 v_binding := "HTTP";
256   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
257   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) {
  256 + v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
  257 + } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
258 258 v_binding := "COAP";
259   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
260   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) {
  259 + v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
  260 + } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
261 261 v_binding := "MQTT";
262   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  262 + v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
263 263 } else {
264 264 v_binding := "WSCK";
265   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
  265 + v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
266 266 }
267   - if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
  267 + if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
268 268 v_binding_in := "HTTP";
269   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
  269 + } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
270 270 v_binding_in := "COAP";
271   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
  271 + } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
272 272 v_binding_in := "MQTT";
273 273 } else {
274 274 v_binding_in := "WSCK";
275 275 }
276 276  
277   - vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
278   - vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
  277 + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
  278 + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
279 279  
280 280 activate(a_default());
281 281 vc_cseSimu := activate(a_cse_cf02_cse1());
... ... @@ -301,35 +301,35 @@ module OneM2M_Functions {
301 301 vc_testSystemRole := e_ae;
302 302  
303 303 // Map
304   - map(self:mcaPort, system:mcaPort) param (PX_TS_SETTINGS.AE1.mcaPort);
305   - map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPortIn);
  304 + map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
  305 + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
306 306 map(self:acPort, system:acPort);
307 307  
308   - if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc)) {
  308 + if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) {
309 309 v_binding := "HTTP";
310   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
311   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc)) {
  310 + v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
  311 + } else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
312 312 v_binding := "COAP";
313   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
314   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc)) {
  313 + v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
  314 + } else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
315 315 v_binding := "MQTT";
316   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  316 + v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
317 317 } else {
318 318 v_binding := "WSCK";
319   - v_host := PX_TS_SETTINGS.AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
  319 + v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
320 320 }
321   - if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.httpBindingDesc)) {
  321 + if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
322 322 v_binding_in := "HTTP";
323   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.coapBindingDesc)) {
  323 + } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
324 324 v_binding_in := "COAP";
325   - } else if (ischosen(PX_TS_SETTINGS.AE1.mcaPortIn.binding.mqttBindingDesc)) {
  325 + } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
326 326 v_binding_in := "MQTT";
327 327 } else {
328 328 v_binding_in := "WSCK";
329 329 }
330 330  
331   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPort.serialization)] };
332   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE1.mcaPortIn.serialization)] };
  331 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_port)] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
  332 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
333 333  
334 334 //Initialze the IUT
335 335  
... ... @@ -353,27 +353,27 @@ module OneM2M_Functions {
353 353 vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
354 354  
355 355 // Map
356   - map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_SETTINGS.AE1.mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
  356 + map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
357 357 map(self:acPort, system:acPort);
358 358  
359   - if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc)) {
  359 + if (ischosen(PX_TS_AE2.mcaPort.binding.httpBindingDesc)) {
360 360 v_binding := "HTTP";
361   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
362   - } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc)) {
  361 + v_host := PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
  362 + } else if (ischosen(PX_TS_AE2.mcaPort.binding.coapBindingDesc)) {
363 363 v_binding := "COAP";
364   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
365   - } else if (ischosen(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc)) {
  364 + v_host := PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
  365 + } else if (ischosen(PX_TS_AE2.mcaPort.binding.mqttBindingDesc)) {
366 366 v_binding := "MQTT";
367   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  367 + v_host := PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
368 368 } else {
369 369 v_binding := "WSCK";
370   - v_host := PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
  370 + v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
371 371 }
372 372  
373   - vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.AE2.mcaPortIn.serialization)] };
  373 + vc_myInterfaces[enum2int(InterfaceIds:e_mca_in_port)] := { mcaPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
374 374  
375 375 if(PX_UT_IMPLEMENTED) {
376   - map(self:utPort, system:utPort) param (PX_TS_SETTINGS.UT);
  376 + map(self:utPort, system:utPort) param (PX_TS_UT);
377 377 }
378 378 activate(a_default());
379 379 vc_cseSimu := activate(a_cse_cf03());
... ... @@ -402,35 +402,35 @@ module OneM2M_Functions {
402 402 vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
403 403  
404 404 // Map
405   - map(self:mccPort, system:mccPort) param (PX_TS_SETTINGS.CSE1.mccPort);
406   - map(self:mccPortIn, system:mccPortIn) param (PX_TS_SETTINGS.CSE1.mccPortIn);
  405 + map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
  406 + map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
407 407 map(self:acPort, system:acPort);
408 408  
409   - if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc)) {
  409 + if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
410 410 v_binding := "HTTP";
411   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
412   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc)) {
  411 + v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
  412 + } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
413 413 v_binding := "COAP";
414   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
415   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc)) {
  414 + v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
  415 + } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
416 416 v_binding := "MQTT";
417   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
  417 + v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
418 418 } else {
419 419 v_binding := "WSCK";
420   - v_host := PX_TS_SETTINGS.CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_SETTINGS.CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
  420 + v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
421 421 }
422   - if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.httpBindingDesc)) {
  422 + if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
423 423 v_binding_in := "HTTP";
424   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.coapBindingDesc)) {
  424 + } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
425 425 v_binding_in := "COAP";
426   - } else if (ischosen(PX_TS_SETTINGS.CSE1.mccPortIn.binding.mqttBindingDesc)) {
  426 + } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
427 427 v_binding_in := "MQTT";
428 428 } else {
429 429 v_binding_in := "WSCK";
430 430 }
431 431  
432   - vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPort.serialization)] };
433   - vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_SETTINGS.CSE1.mccPortIn.serialization)] };
  432 + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_port)] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
  433 + vc_myInterfaces[enum2int(InterfaceIds:e_mcc_in_port)] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
434 434  
435 435 activate(a_default());
436 436 vc_cseSimu := activate(a_cse_cf04());
... ... @@ -1116,7 +1116,7 @@ module OneM2M_Functions {
1116 1116 vc_ae2.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63));
1117 1117 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
1118 1118  
1119   - vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -1)); // AE2 is registred
  1119 + vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
1120 1120 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
1121 1121  
1122 1122 p_ae2Index := f_getResourceFromAeSimu(vc_ae2);
... ... @@ -2671,7 +2671,7 @@ module OneM2M_Functions {
2671 2671 setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
2672 2672 f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
2673 2673 vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
2674   - v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")))), vc_cSEBaseIndex, int16); // FIXME To be review not sure we have to use CSE1
  2674 + v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")))), vc_cSEBaseIndex, int16); // FIXME To be review not sure we have to use CSE1
2675 2675 vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
2676 2676 }
2677 2677 [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
... ... @@ -2729,7 +2729,7 @@ module OneM2M_Functions {
2729 2729 v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
2730 2730 f_send(e_mcc_in_port, m_response(v_response));
2731 2731  
2732   - vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_SETTINGS.CSE1.mcaPortIn, "")))), int16, -1, false);
  2732 + vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mcaPortIn, "")))), int16, -1, false);
2733 2733 v_resourceIndex := vc_remoteCseIndex;
2734 2734 v_remoteCSERegistered:=true;
2735 2735 tc_ac.start(10.0);
... ... @@ -2827,7 +2827,7 @@ module OneM2M_Functions {
2827 2827 v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;
2828 2828 v_myResource.cSEBase.cSE_ID := PX_CSE1_ID;
2829 2829 v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
2830   - v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "")};
  2830 + v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")};
2831 2831 v_myResource.cSEBase.cseType := vc_cseType;
2832 2832 v_myResource.cSEBase.supportedReleaseVersions := {"2a"};
2833 2833  
... ... @@ -4357,7 +4357,7 @@ module OneM2M_Functions {
4357 4357 * @param p_announcementTargetResource Announcement Target Resource
4358 4358 * @return p_annoucementTargetPoA Announcemenet Target PoA
4359 4359 */
4360   - function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mccPortIn, charstring p_announcementTargetResource := "") return charstring {
  4360 + function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_CSE1.mccPortIn, charstring p_announcementTargetResource := "") return charstring {
4361 4361 var charstring v_poa;
4362 4362  
4363 4363 log(">>> f_getCompletePoA: ", p_portDesc);
... ... @@ -4388,7 +4388,7 @@ module OneM2M_Functions {
4388 4388 return v_poa;
4389 4389 }
4390 4390  
4391   - function f_getPortAddress(in PortDesc p_portDesc := PX_TS_SETTINGS.CSE1.mcaPortIn) return charstring {
  4391 + function f_getPortAddress(in PortDesc p_portDesc := PX_TS_CSE1.mcaPortIn) return charstring {
4392 4392 if (ischosen(p_portDesc.binding.httpBindingDesc)) {
4393 4393 return p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
4394 4394 } else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
... ...
... ... @@ -109,127 +109,125 @@ module OneM2M_Pixits {
109 109 /**
110 110 * @desc Test System settings
111 111 */
112   - modulepar TestSystemSettingsDesc PX_TS_SETTINGS := {
113   - AE1 := { // AE1 component settings
114   - mcaPort := {
115   - binding := {
116   - coapBindingDesc := {
117   - bindingProtocol := e_coap,
118   - bindingDesc := {
119   - tsAddress := "192.168.56.102",
120   - remotePort := 9010, // SUT CoAP/HTTP port
121   - localPort := 3031, // Test Adapter client port (for debug purpose only)
122   - sutAddress := "192.168.56.103"
123   - }
124   - }
125   - },
126   - serialization := e_xml
127   - },
128   - mcaPortIn := {
129   - binding := {
130   - coapBindingDesc := {
  112 + modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
  113 + mcaPort := {
  114 + binding := {
  115 + coapBindingDesc := {
131 116 bindingProtocol := e_coap,
132 117 bindingDesc := {
133 118 tsAddress := "192.168.56.102",
134   - remotePort := 9010,
135   - localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
  119 + remotePort := 9010, // SUT CoAP/HTTP port
  120 + localPort := 3031, // Test Adapter client port (for debug purpose only)
136 121 sutAddress := "192.168.56.103"
137 122 }
138   - }
139   - },
140   - serialization := e_xml
141   - }
  123 + }
  124 + },
  125 + serialization := e_xml
142 126 },
143   - AE2 := { // AE2 component settings
144   - mcaPort := {
145   - binding := {
146   - coapBindingDesc := {
147   - bindingProtocol := e_coap,
148   - bindingDesc := {
149   - tsAddress := "192.168.56.102",
150   - remotePort := 9010, // SUT CoAP/HTTP port
151   - localPort := 3032, // Test Adapter client port (for debug purpose only)
152   - sutAddress := "192.168.56.103"
153   - }
  127 + mcaPortIn := {
  128 + binding := {
  129 + coapBindingDesc := {
  130 + bindingProtocol := e_coap,
  131 + bindingDesc := {
  132 + tsAddress := "192.168.56.102",
  133 + remotePort := 9010,
  134 + localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
  135 + sutAddress := "192.168.56.103"
154 136 }
155   - },
156   - serialization := e_xml
  137 + }
157 138 },
158   - mcaPortIn := {
159   - binding := {
160   - coapBindingDesc := {
  139 + serialization := e_xml
  140 + }
  141 + };
  142 + modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
  143 + mcaPort := {
  144 + binding := {
  145 + coapBindingDesc := {
161 146 bindingProtocol := e_coap,
162 147 bindingDesc := {
163 148 tsAddress := "192.168.56.102",
164   - remotePort := omit,
165   - localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
  149 + remotePort := 9010, // SUT CoAP/HTTP port
  150 + localPort := 3032, // Test Adapter client port (for debug purpose only)
166 151 sutAddress := "192.168.56.103"
167 152 }
168   - }
169   - },
170   - serialization := e_xml
171   - }
  153 + }
  154 + },
  155 + serialization := e_xml
172 156 },
173   - CSE1 := { // CSE1 component settings
174   - mcaPort := {
175   - binding := {
176   - coapBindingDesc := {
177   - bindingProtocol := e_coap,
178   - bindingDesc := {
179   - tsAddress := "192.168.56.102",
180   - remotePort:= 9010,
181   - localPort := 3131,
182   - sutAddress := "192.168.56.103"
183   - }
  157 + mcaPortIn := {
  158 + binding := {
  159 + coapBindingDesc := {
  160 + bindingProtocol := e_coap,
  161 + bindingDesc := {
  162 + tsAddress := "192.168.56.102",
  163 + remotePort := omit,
  164 + localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
  165 + sutAddress := "192.168.56.103"
184 166 }
185   - },
186   - serialization := e_xml
  167 + }
187 168 },
188   - mcaPortIn := {
189   - binding := {
190   - coapBindingDesc := {
191   - bindingProtocol := e_coap,
192   - bindingDesc := {
193   - tsAddress := "192.168.56.102",
194   - remotePort:= omit,
195   - localPort := 3141,
196   - sutAddress := "192.168.56.103"
197   - }
  169 + serialization := e_xml
  170 + }
  171 + };
  172 + modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
  173 + mcaPort := {
  174 + binding := {
  175 + coapBindingDesc := {
  176 + bindingProtocol := e_coap,
  177 + bindingDesc := {
  178 + tsAddress := "192.168.56.102",
  179 + remotePort:= 9010,
  180 + localPort := 3131,
  181 + sutAddress := "192.168.56.103"
198 182 }
199   - },
200   - serialization := e_xml
  183 + }
201 184 },
202   - mccPort := {
203   - binding := {
204   - httpBindingDesc := {
205   - bindingProtocol := e_http,
206   - bindingDesc := {
207   - tsAddress := "192.168.56.102",
208   - remotePort:= 9011,
209   - localPort := 4131,
210   - sutAddress := "192.168.56.103"
211   - }
  185 + serialization := e_xml
  186 + },
  187 + mcaPortIn := {
  188 + binding := {
  189 + coapBindingDesc := {
  190 + bindingProtocol := e_coap,
  191 + bindingDesc := {
  192 + tsAddress := "192.168.56.102",
  193 + remotePort:= omit,
  194 + localPort := 3141,
  195 + sutAddress := "192.168.56.103"
212 196 }
213   - },
214   - serialization := e_xml
  197 + }
215 198 },
216   - mccPortIn := {
217   - binding := {
218   - httpBindingDesc := {
219   - bindingProtocol := e_http ,
220   - bindingDesc := {
221   - tsAddress := "192.168.56.102",
222   - remotePort:= 9011,
223   - localPort := 4141,
224   - sutAddress := "192.168.56.103"
225   - }
  199 + serialization := e_xml
  200 + },
  201 + mccPort := {
  202 + binding := {
  203 + httpBindingDesc := {
  204 + bindingProtocol := e_http,
  205 + bindingDesc := {
  206 + tsAddress := "192.168.56.102",
  207 + remotePort:= 9011,
  208 + localPort := 4131,
  209 + sutAddress := "192.168.56.103"
226 210 }
227   - },
228   - serialization := e_xml
229   - }
  211 + }
  212 + },
  213 + serialization := e_xml
230 214 },
231   - UT := omit
  215 + mccPortIn := {
  216 + binding := {
  217 + httpBindingDesc := {
  218 + bindingProtocol := e_http ,
  219 + bindingDesc := {
  220 + tsAddress := "192.168.56.102",
  221 + remotePort:= 9011,
  222 + localPort := 4141,
  223 + sutAddress := "192.168.56.103"
  224 + }
  225 + }
  226 + },
  227 + serialization := e_xml
  228 + }
232 229 };
  230 + modulepar UtDesc PX_TS_UT := { url := "http://192.168.55.103:43000/" };
233 231  
234 232 modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml";
235 233 modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID";
... ...
... ... @@ -4146,7 +4146,7 @@ module OneM2M_Templates {
4146 4146 resourceType := int16,//M
4147 4147 resourceID := PX_CSE1_RESOURCE_ID,//M
4148 4148 pointOfAccess := { p_pointOfAccess }, //O
4149   - cSEBase := f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
  4149 + cSEBase := f_getCompletePoA(PX_TS_CSE1.mccPortIn, "") & PX_CSE1_ID & "/" & PX_CSE1_NAME,//M
4150 4150 cSE_ID := PX_CSE1_ID,//M
4151 4151 requestReachability := true//M
4152 4152 };
... ...
... ... @@ -8878,21 +8878,6 @@ type record CseSimuComponentDesc {
8878 8878 PortDesc mccPortIn
8879 8879 }
8880 8880  
8881   -/**
8882   - * @desc Test System settings
8883   - * @member ae1Simu Ae1Simu component settings
8884   - * @member ae2Simu Ae2Simu component settings
8885   - * @member cse1Simu Cse1Simu component settings
8886   - * @member sutDesc SUT settings
8887   - * @member utDesc UpperTester component settings
8888   - */
8889   -type record TestSystemSettingsDesc {
8890   - AeSimuComponentDesc AE1,
8891   - AeSimuComponentDesc AE2,
8892   - CseSimuComponentDesc CSE1,
8893   - UtDesc UT optional
8894   -}
8895   -
8896 8881 }
8897 8882 with {
8898 8883 encode "";
... ...
... ... @@ -2260,7 +2260,7 @@ module OneM2M_PermutationFunctions {
2260 2260 var RequestPrimitive v_request;
2261 2261 var ResourceType v_resourceType := int16; //remoteCSE
2262 2262 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
2263   - var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_SETTINGS.CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
  2263 + var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
2264 2264 if(not(PICS_MN_CSE)) {
2265 2265 setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
2266 2266 stop;
... ... @@ -2494,7 +2494,7 @@ module OneM2M_PermutationFunctions {
2494 2494 var integer v_resourceIndex := -1;
2495 2495 var integer v_ae2Index := -1;
2496 2496 var integer v_acpAuxIndex := -1;
2497   - var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn) };
  2497 + var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE2.mcaPortIn) };
2498 2498  
2499 2499 // Test control
2500 2500  
... ... @@ -2607,7 +2607,7 @@ module OneM2M_PermutationFunctions {
2607 2607 var integer v_resourceIndex := -1;
2608 2608 var integer v_ae1Index := -1;
2609 2609 var integer v_acpAuxIndex := -1;
2610   - var PoaList v_poaList := { f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn) };
  2610 + var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE1.mcaPortIn) };
2611 2611  
2612 2612 // Test control
2613 2613  
... ... @@ -5955,7 +5955,7 @@ module OneM2M_PermutationFunctions {
5955 5955  
5956 5956 // Preamble
5957 5957 if(p_resourceType != int2) {
5958   - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
  5958 + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
5959 5959 }
5960 5960  
5961 5961 if(p_resourceType != int1) {
... ... @@ -6994,7 +6994,7 @@ module OneM2M_PermutationFunctions {
6994 6994 vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
6995 6995 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
6996 6996  
6997   - vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -1)); // AE2 is registred
  6997 + vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
6998 6998 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
6999 6999  
7000 7000 v_ae2Index := f_getLatestResource(vc_ae2);
... ... @@ -8212,11 +8212,11 @@ module OneM2M_PermutationFunctions {
8212 8212  
8213 8213 // Preamble
8214 8214 v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
8215   - v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_SETTINGS.AE1.mcaPortIn)}, omit}, omit}};
  8215 + v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_AE1.mcaPortIn)}, omit}, omit}};
8216 8216 v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
8217 8217 vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
8218 8218  
8219   - v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)});
  8219 + v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
8220 8220  
8221 8221 // Test Body
8222 8222 p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
... ... @@ -8277,7 +8277,7 @@ module OneM2M_PermutationFunctions {
8277 8277 v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
8278 8278 vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
8279 8279  
8280   - v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)});
  8280 + v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
8281 8281  
8282 8282 // Test Body
8283 8283 p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
... ... @@ -10750,7 +10750,7 @@ module OneM2M_PermutationFunctions {
10750 10750  
10751 10751 v_contentResponse.uRI := ?;
10752 10752  
10753   - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
  10753 + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
10754 10754 if(ispresent(p_parentRequestPrimitive)) {
10755 10755 v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
10756 10756 p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
... ... @@ -10824,7 +10824,7 @@ module OneM2M_PermutationFunctions {
10824 10824  
10825 10825 v_contentResponse.uRI := ?;
10826 10826  
10827   - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
  10827 + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
10828 10828  
10829 10829 if(ispresent(p_parentRequestPrimitive)) {
10830 10830 v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
... ... @@ -10901,11 +10901,11 @@ module OneM2M_PermutationFunctions {
10901 10901  
10902 10902 v_contentResponse.uRI := ?;
10903 10903  
10904   - v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn, "")});//c_CRUDNDi);
  10904 + v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
10905 10905  
10906 10906 f_checkAeSimuStatus();
10907 10907  
10908   - vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}))); // AE2 is registred
  10908 + vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
10909 10909  
10910 10910 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
10911 10911  
... ...
... ... @@ -1107,7 +1107,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1107 1107 testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
1108 1108 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
1109 1109 var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
1110   - v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)};
  1110 + v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
1111 1111 v_ae1.start(f_CSE_REG_CRE_012(v_create));
1112 1112 v_ae1.done;
1113 1113 }
... ... @@ -1151,7 +1151,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1151 1151 const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
1152 1152 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
1153 1153  
1154   - v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
  1154 + v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
1155 1155  
1156 1156 v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
1157 1157 v_cse1.done;
... ... @@ -1887,11 +1887,11 @@ module OneM2M_Testcases_CSE_Release_1 {
1887 1887  
1888 1888 v_request := valueof(m_createRemoteCSEBase);
1889 1889 v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE
1890   - v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
  1890 + v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
1891 1891  
1892 1892 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
1893 1893 v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
1894   - v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
  1894 + v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
1895 1895  
1896 1896 v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
1897 1897 v_cse1.done;
... ... @@ -2136,7 +2136,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2136 2136 var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
2137 2137 var template PrimitiveContent v_contentResponse;
2138 2138  
2139   - v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.AE1.mcaPortIn)};
  2139 + v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
2140 2140  
2141 2141 v_contentResponse.aE := mw_contentAeBase;
2142 2142 v_contentResponse.aE.pointOfAccess := ?;
... ... @@ -2342,7 +2342,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2342 2342 var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
2343 2343 var template PrimitiveContent v_contentResponse;
2344 2344  
2345   - v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
  2345 + v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
2346 2346  
2347 2347 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
2348 2348 v_contentResponse.remoteCSE.pointOfAccess := ?;
... ... @@ -2677,7 +2677,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2677 2677 var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
2678 2678 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
2679 2679  
2680   - v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
  2680 + v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
2681 2681  
2682 2682 v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
2683 2683 v_cse1.done;
... ... @@ -2724,7 +2724,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2724 2724 var AttributeList c_optionalAttribute;
2725 2725 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
2726 2726  
2727   - v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_SETTINGS.CSE1.mccPortIn)};
  2727 + v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
2728 2728 c_optionalAttribute := {"pointofAccess"};
2729 2729  
2730 2730 v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
... ... @@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 {
6503 6503  
6504 6504 testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
6505 6505 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
6506   - var PoaList v_poaList := {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn)};
  6506 + var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
6507 6507 var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
6508 6508 var ResponsePrimitive v_responsePrimitive;
6509 6509 var PrimitiveContent v_primitiveContentRetrieveResource;
... ... @@ -6667,7 +6667,7 @@ module OneM2M_Testcases_CSE_Release_1 {
6667 6667  
6668 6668 testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
6669 6669 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
6670   - var PoaList v_poaList := {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn)};
  6670 + var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
6671 6671 var template RequestPrimitive v_updateRequest := m_updateAeBase;
6672 6672 var ResponsePrimitive v_responsePrimitive;
6673 6673 var PrimitiveContent v_primitiveContentRetrieveResource;
... ...
... ... @@ -2748,7 +2748,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2748 2748 vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
2749 2749 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
2750 2750  
2751   - vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_SETTINGS.AE2.mcaPortIn, "")}), -1)); // AE2 is registred
  2751 + vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
2752 2752 f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
2753 2753  
2754 2754 v_ae2Index := f_getLatestResource(vc_ae2);
... ...