Merge "RIoT config files were updated to use WebGUI"
diff --git a/cfg/coap_basic/coap_basic_fsms.cfg b/cfg/coap_basic/coap_basic_fsms.cfg
index dc5bca7..b4f4336 100644
--- a/cfg/coap_basic/coap_basic_fsms.cfg
+++ b/cfg/coap_basic/coap_basic_fsms.cfg
@@ -43,7 +43,7 @@
{
name := "remotePort",
initValue := {
- intVal := 5683
+ intVal := 30000
},
scope := TC
},//var:remotePort
@@ -51,7 +51,7 @@
{
name := "localHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},
@@ -257,260 +257,260 @@
}
}
},
- {
-/**** FSM Editor layout information. ****
-@state "idle" (100, 527)
-@state "initiated" (1019, 527)
-@parallellink "idle" -- "initiated" (115, 527) (203, 527) * (992, 527) (904, 527)
-@link "idle" -- "initiated"
-singleevent "EPTF_CLL_LGenBase" "LGenBase: Start_the_traffic_case!"
-@link "initiated" -- "idle"
-eventlist "COAP Behavior" "COAP rsp: 200" "COAP rsp: 202" "COAP rsp: 203" "COAP rsp: 205"
-@link "initiated" -- "idle"
-singleevent "COAP Behavior" "COAP rsp: 201"
-@link "initiated" -- "idle"
-singleevent "Special behavior for timeout reporting" "watchdog"
-*/
- name := "TC_CORE02_POST_FSM",
- fsmParams := {
- {
- stateList := {
- "idle",
- "initiated"
- }
- },
- {
- timerList := {
- {
- name := "watchdog",
- startValue := 10.0
- }
- }
- },
- {
- varList := {
- {
- name := "remoteHost",
- initValue := {
- charstringVal := "127.0.0.1"
- },
- scope := TC
- },//var:remoteHost
- {
- name := "remotePort",
- initValue := {
- intVal := 5683
- },
- scope := TC
- },//var:remotePort
- // var:localHost
- {
- name := "localHost",
- initValue := {
- charstringVal := "172.31.21.18"
- },
- scope := TC
- },
- // var:localPort
- {
- name := "localPort",
- initValue := {
- intVal := 31000
- },
- scope := TC
- }
- }
- },
- {
- statHandlerStatList := { }
- }
- },// fsmParams
- table := {
- extendedTable := {
- {
- events2Listen := {
- events := {
- {
- singleEvent := {
- bName := "EPTF_CLL_LGenBase",
- iName := "LGenBase: Start_the_traffic_case!",
- eventType := fsm
- }
- }
- }
- },
- cellRow := {
- statedCellRow := {
- {
- inState := {
- state := "idle"
- },
- cell := {
- actionList := {
- {
- stepOrFunctionName := "COAP Applib: init",
- contextArgs := omit
- },
- {
- stepOrFunctionName := "IOT App COAP: setLocalAddress_byVars",
- contextArgs := {
- varNames := {
- "localHost",
- "localPort"
- }
- }
- },
- {
- stepOrFunctionName := "COAP Applib: setRemoteAddress_byVars",
- contextArgs := {
- varNames := {
- "remoteHost",
- "remotePort"
- }
- }
- },
- {
- stepOrFunctionName := "COAP Applib: loadTemplate_byStringId",
- contextArgs := {
- charstringValue := "t_TC_CORE_02_POST"
- }
- },
- {
- stepOrFunctionName := "COAP Applib: send",
- contextArgs := omit
- },
- {
- stepOrFunctionName := "LGenBase: StepFunction_timerStart",
- contextArgs := {
- timerName := "watchdog"
- }
- }
- },
- nextStateCalculation := omit,
- nextState := "initiated"
- }
- }
- }
- }
- },
- {
- events2Listen := {
- events := {
- {
- eventList := {
- bName := "COAP Behavior",
- iNameList := {
- "COAP rsp: 200",
- "COAP rsp: 202",
- "COAP rsp: 203",
- "COAP rsp: 205"
- },
- eventType := fsm
- }
- }
- }
- },
- cellRow := {
- statedCellRow := {
- {
- inState := {
- state := "initiated"
- },
- cell := {
- actionList := {
- {
- stepOrFunctionName := "IOT App: tcFinished_withVerdict",
- contextArgs := {
- verdict := {
- verdict := fail,
- reason := ""
- }
- }
- }
- },
- nextStateCalculation := omit,
- nextState := "idle"
- }
- }
- }
- }
- },
- {
- events2Listen := {
- events := {
- {
- singleEvent := {
- bName := "COAP Behavior",
- iName := "COAP rsp: 201",
- eventType := fsm
- }
- }
- }
- },
- cellRow := {
- statedCellRow := {
- {
- inState := {
- state := "initiated"
- },
- cell := {
- actionList := {
- {
- stepOrFunctionName := "IOT App: tcFinished_withVerdict",
- contextArgs := {
- verdict := {
- verdict := pass,
- reason := ""
- }
- }
- }
- },
- nextStateCalculation := omit,
- nextState := "idle"
- }
- }
- }
- }
- },
- {
- events2Listen := {
- events := {
- {
- singleEvent := {
- bName := "Special behavior for timeout reporting",
- iName := "watchdog",
- eventType := fsm
- }
- }
- }
- },
- cellRow := {
- statedCellRow := {
- {
- inState := {
- state := "initiated"
- },
- cell := {
- actionList := {
- {
- stepOrFunctionName := "IOT App: tcFinished_withVerdict",
- contextArgs := {
- verdict := {
- verdict := fail,
- reason := ""
- }
- }
- }
- },
- nextStateCalculation := omit,
- nextState := "idle"
- }
- }
- }
- }
- }
- }
- }
+ {
+/**** FSM Editor layout information. ****
+@state "idle" (100, 527)
+@state "initiated" (1019, 527)
+@parallellink "idle" -- "initiated" (115, 527) (203, 527) * (992, 527) (904, 527)
+@link "idle" -- "initiated"
+singleevent "EPTF_CLL_LGenBase" "LGenBase: Start_the_traffic_case!"
+@link "initiated" -- "idle"
+eventlist "COAP Behavior" "COAP rsp: 200" "COAP rsp: 202" "COAP rsp: 203" "COAP rsp: 205"
+@link "initiated" -- "idle"
+singleevent "COAP Behavior" "COAP rsp: 201"
+@link "initiated" -- "idle"
+singleevent "Special behavior for timeout reporting" "watchdog"
+*/
+ name := "TC_CORE02_POST_FSM",
+ fsmParams := {
+ {
+ stateList := {
+ "idle",
+ "initiated"
+ }
+ },
+ {
+ timerList := {
+ {
+ name := "watchdog",
+ startValue := 10.0
+ }
+ }
+ },
+ {
+ varList := {
+ {
+ name := "remoteHost",
+ initValue := {
+ charstringVal := "127.0.0.1"
+ },
+ scope := TC
+ },//var:remoteHost
+ {
+ name := "remotePort",
+ initValue := {
+ intVal := 30000
+ },
+ scope := TC
+ },//var:remotePort
+ // var:localHost
+ {
+ name := "localHost",
+ initValue := {
+ charstringVal := "127.0.0.1"
+ },
+ scope := TC
+ },
+ // var:localPort
+ {
+ name := "localPort",
+ initValue := {
+ intVal := 31000
+ },
+ scope := TC
+ }
+ }
+ },
+ {
+ statHandlerStatList := { }
+ }
+ },// fsmParams
+ table := {
+ extendedTable := {
+ {
+ events2Listen := {
+ events := {
+ {
+ singleEvent := {
+ bName := "EPTF_CLL_LGenBase",
+ iName := "LGenBase: Start_the_traffic_case!",
+ eventType := fsm
+ }
+ }
+ }
+ },
+ cellRow := {
+ statedCellRow := {
+ {
+ inState := {
+ state := "idle"
+ },
+ cell := {
+ actionList := {
+ {
+ stepOrFunctionName := "COAP Applib: init",
+ contextArgs := omit
+ },
+ {
+ stepOrFunctionName := "IOT App COAP: setLocalAddress_byVars",
+ contextArgs := {
+ varNames := {
+ "localHost",
+ "localPort"
+ }
+ }
+ },
+ {
+ stepOrFunctionName := "COAP Applib: setRemoteAddress_byVars",
+ contextArgs := {
+ varNames := {
+ "remoteHost",
+ "remotePort"
+ }
+ }
+ },
+ {
+ stepOrFunctionName := "COAP Applib: loadTemplate_byStringId",
+ contextArgs := {
+ charstringValue := "t_TC_CORE_02_POST"
+ }
+ },
+ {
+ stepOrFunctionName := "COAP Applib: send",
+ contextArgs := omit
+ },
+ {
+ stepOrFunctionName := "LGenBase: StepFunction_timerStart",
+ contextArgs := {
+ timerName := "watchdog"
+ }
+ }
+ },
+ nextStateCalculation := omit,
+ nextState := "initiated"
+ }
+ }
+ }
+ }
+ },
+ {
+ events2Listen := {
+ events := {
+ {
+ eventList := {
+ bName := "COAP Behavior",
+ iNameList := {
+ "COAP rsp: 200",
+ "COAP rsp: 202",
+ "COAP rsp: 203",
+ "COAP rsp: 205"
+ },
+ eventType := fsm
+ }
+ }
+ }
+ },
+ cellRow := {
+ statedCellRow := {
+ {
+ inState := {
+ state := "initiated"
+ },
+ cell := {
+ actionList := {
+ {
+ stepOrFunctionName := "IOT App: tcFinished_withVerdict",
+ contextArgs := {
+ verdict := {
+ verdict := fail,
+ reason := ""
+ }
+ }
+ }
+ },
+ nextStateCalculation := omit,
+ nextState := "idle"
+ }
+ }
+ }
+ }
+ },
+ {
+ events2Listen := {
+ events := {
+ {
+ singleEvent := {
+ bName := "COAP Behavior",
+ iName := "COAP rsp: 201",
+ eventType := fsm
+ }
+ }
+ }
+ },
+ cellRow := {
+ statedCellRow := {
+ {
+ inState := {
+ state := "initiated"
+ },
+ cell := {
+ actionList := {
+ {
+ stepOrFunctionName := "IOT App: tcFinished_withVerdict",
+ contextArgs := {
+ verdict := {
+ verdict := pass,
+ reason := ""
+ }
+ }
+ }
+ },
+ nextStateCalculation := omit,
+ nextState := "idle"
+ }
+ }
+ }
+ }
+ },
+ {
+ events2Listen := {
+ events := {
+ {
+ singleEvent := {
+ bName := "Special behavior for timeout reporting",
+ iName := "watchdog",
+ eventType := fsm
+ }
+ }
+ }
+ },
+ cellRow := {
+ statedCellRow := {
+ {
+ inState := {
+ state := "initiated"
+ },
+ cell := {
+ actionList := {
+ {
+ stepOrFunctionName := "IOT App: tcFinished_withVerdict",
+ contextArgs := {
+ verdict := {
+ verdict := fail,
+ reason := ""
+ }
+ }
+ }
+ },
+ nextStateCalculation := omit,
+ nextState := "idle"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
},
{
/**** FSM Editor layout information. ****
@@ -550,7 +550,7 @@
{
name := "localHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},
diff --git a/cfg/coap_basic/coap_basic_params.cfg b/cfg/coap_basic/coap_basic_params.cfg
index 2eabba0..e583c7c 100644
--- a/cfg/coap_basic/coap_basic_params.cfg
+++ b/cfg/coap_basic/coap_basic_params.cfg
@@ -1,10 +1,11 @@
[MODULE_PARAMETERS]
-tsp_nrOfLGens := 1;
+tsp_EPTF_DsRestAPI_HTTPServer_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/WebGUI_link";
+tsp_EPTF_DsRestAPI_customizableApp_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/GUICustomization_link";
+tsp_EPTF_DsRestAPI_API_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/Js_link";
-#tsp_EPTF_UIHandler_Browser_RemotePort := 4321
-#tsp_EPTF_UIHandler_Browser_directory := "./BrowserGUI";
+tsp_nrOfLGens := 1;
tsp_EPTF_Var_SyncInterval := 3.0;
diff --git a/cfg/leshan_basic/leshan_basic_params.cfg b/cfg/leshan_basic/leshan_basic_params.cfg
index 8041c05..85bd3a3 100644
--- a/cfg/leshan_basic/leshan_basic_params.cfg
+++ b/cfg/leshan_basic/leshan_basic_params.cfg
@@ -1,6 +1,10 @@
[MODULE_PARAMETERS]
+tsp_EPTF_DsRestAPI_HTTPServer_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/WebGUI_link";
+tsp_EPTF_DsRestAPI_customizableApp_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/GUICustomization_link";
+tsp_EPTF_DsRestAPI_API_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/Js_link";
+
tsp_nrOfLGens := 1;
#tsp_EPTF_UIHandler_Browser_RemotePort := 4321
diff --git a/cfg/leshan_serverdown/leshan_basic_params.cfg b/cfg/leshan_serverdown/leshan_basic_params.cfg
index f1b60fd..2222e99 100644
--- a/cfg/leshan_serverdown/leshan_basic_params.cfg
+++ b/cfg/leshan_serverdown/leshan_basic_params.cfg
@@ -1,8 +1,10 @@
[MODULE_PARAMETERS]
-#tsp_EPTF_UIHandler_Browser_RemotePort := 4321
-#tsp_EPTF_UIHandler_Browser_directory := "./BrowserGUI";
+tsp_EPTF_DsRestAPI_HTTPServer_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/WebGUI_link";
+tsp_EPTF_DsRestAPI_customizableApp_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/GUICustomization_link";
+tsp_EPTF_DsRestAPI_API_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/Js_link";
+
tsp_EPTF_Var_SyncInterval := 3.0;
tsp_ExecCtrl_manualControl := true;
diff --git a/cfg/mqtt_basic/mqtt_basic_params.cfg b/cfg/mqtt_basic/mqtt_basic_params.cfg
index ae5a185..b963120 100644
--- a/cfg/mqtt_basic/mqtt_basic_params.cfg
+++ b/cfg/mqtt_basic/mqtt_basic_params.cfg
@@ -1,18 +1,19 @@
[MODULE_PARAMETERS]
-tsp_nrOfLGens := 1;
+tsp_EPTF_DsRestAPI_HTTPServer_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/WebGUI_link";
+tsp_EPTF_DsRestAPI_customizableApp_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/GUICustomization_link";
+tsp_EPTF_DsRestAPI_API_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/Js_link";
-#tsp_EPTF_UIHandler_Browser_RemotePort := 4321
-#tsp_EPTF_UIHandler_Browser_directory := "./BrowserGUI";
+tsp_nrOfLGens := 1;
tsp_EPTF_Var_SyncInterval := 3.0;
tsp_ExecCtrl_manualControl := true;
-tsp_EPTF_MQTT_LGen_debug := true;
-tsp_EPTF_MQTT_LGen_debugVerbose := true;
-tsp_EPTF_MQTT_LocalTransport_debug := true;
-tsp_EPTF_MQTT_LocalTransport_debugVerbose := true;
+//tsp_EPTF_MQTT_LGen_debug := true;
+//tsp_EPTF_MQTT_LGen_debugVerbose := true;
+//tsp_EPTF_MQTT_LocalTransport_debug := true;
+//tsp_EPTF_MQTT_LocalTransport_debugVerbose := true;
//tsp_EPTF_COAP_LGen_debug := true;
//tsp_EPTF_COAP_LGen_debugVerbose := true;
//tsp_EPTF_COAP_LocalTransport_debug := true;
diff --git a/cfg/mqtt_basic/mqtt_basic_templates.cfg b/cfg/mqtt_basic/mqtt_basic_templates.cfg
index 3ae7469..c6e0b56 100644
--- a/cfg/mqtt_basic/mqtt_basic_templates.cfg
+++ b/cfg/mqtt_basic/mqtt_basic_templates.cfg
@@ -20,7 +20,7 @@
},
keep_alive := 0,
payload := {
- client_identifier := "",
+ client_identifier := { stringItem := "", stringLength := 0},
will_topic := omit,
will_message := omit,
user_name := omit,
diff --git a/cfg/performance_californium/coap_basic_fsms.cfg b/cfg/performance_californium/coap_basic_fsms.cfg
index 59b257a..0f959c3 100644
--- a/cfg/performance_californium/coap_basic_fsms.cfg
+++ b/cfg/performance_californium/coap_basic_fsms.cfg
@@ -52,7 +52,7 @@
{
name := "localHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},//var:localHost
@@ -303,7 +303,7 @@
{
name := "localHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},//var:localHost
@@ -540,7 +540,7 @@
{
name := "localHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},
diff --git a/cfg/performance_californium/coap_basic_params.cfg b/cfg/performance_californium/coap_basic_params.cfg
index 9061b49..afa4f22 100644
--- a/cfg/performance_californium/coap_basic_params.cfg
+++ b/cfg/performance_californium/coap_basic_params.cfg
@@ -1,4 +1,8 @@
[MODULE_PARAMETERS]
+tsp_EPTF_DsRestAPI_HTTPServer_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/WebGUI_link";
+tsp_EPTF_DsRestAPI_customizableApp_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/GUICustomization_link";
+tsp_EPTF_DsRestAPI_API_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/Js_link";
+
tsp_EPTF_Var_SyncInterval := 3.0;
tsp_ExecCtrl_manualControl := true;
diff --git a/cfg/stability_leshan/leshan_basic_fsms.cfg b/cfg/stability_leshan/leshan_basic_fsms.cfg
index 8ebe8bf..6e5a0a5 100644
--- a/cfg/stability_leshan/leshan_basic_fsms.cfg
+++ b/cfg/stability_leshan/leshan_basic_fsms.cfg
@@ -86,7 +86,7 @@
{
name := "localHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},
@@ -102,7 +102,7 @@
{
name := "remoteHost",
initValue := {
- charstringVal := "172.31.21.18"
+ charstringVal := "127.0.0.1"
},
scope := TC
},
diff --git a/cfg/stability_leshan/leshan_basic_params.cfg b/cfg/stability_leshan/leshan_basic_params.cfg
index d726336..53c549c 100644
--- a/cfg/stability_leshan/leshan_basic_params.cfg
+++ b/cfg/stability_leshan/leshan_basic_params.cfg
@@ -1,6 +1,10 @@
[MODULE_PARAMETERS]
+tsp_EPTF_DsRestAPI_HTTPServer_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/WebGUI_link";
+tsp_EPTF_DsRestAPI_customizableApp_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/GUICustomization_link";
+tsp_EPTF_DsRestAPI_API_directory := "./src/Libraries/EPTF_Core_Library_CNL113512/demo/WebGUI/Js_link";
+
tsp_EPTF_Var_SyncInterval := 3.0;
tsp_ExecCtrl_manualControl := true;
