[master] TSDaemon changed to ControlDaemon, WebGUI subrepo update
Signed-off-by: Tamas Levente Kiss <tamas.levente.kiss@ericsson.com>
diff --git a/lib/WebGUI b/lib/WebGUI
index f62ca1b..27d4ebc 160000
--- a/lib/WebGUI
+++ b/lib/WebGUI
@@ -1 +1 @@
-Subproject commit f62ca1bc0f54de368d341b97e0f773c4f44f70ff
+Subproject commit 27d4ebc4f1ff6d4c2cf48f9fe8d8101d9fb97ea2
diff --git a/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/Request.json b/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/Request.json
index e3fdec5..415113b 100644
--- a/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/Request.json
+++ b/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/Request.json
@@ -10,7 +10,7 @@
},
{
"paramName": "Element",
- "paramValue": "TSDaemons"
+ "paramValue": "ControlDaemons"
}
],
"children": [
@@ -937,7 +937,7 @@
{
"getData": {
"source": "TSController",
- "element": "TSDaemons",
+ "element": "ControlDaemons",
"children": [
{
"getData": {
@@ -945,7 +945,7 @@
"element": "Name",
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "%Parent1%"
}
]
@@ -957,7 +957,7 @@
"element": "Type",
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "%Parent1%"
}
]
@@ -969,7 +969,7 @@
"element": "Address",
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "%Parent1%"
}
],
@@ -980,7 +980,7 @@
"element": "Port",
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "%Parent1%"
}
],
@@ -991,7 +991,7 @@
"element": "Status",
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "%Parent1%"
}
],
@@ -1034,7 +1034,7 @@
{
"getData": {
"source": "TSController",
- "element": "TSDaemons",
+ "element": "ControlDaemons",
"filter": {
"dataValue": "%Parent0%"
},
@@ -1045,7 +1045,7 @@
"element": "GuiAddress",
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "%Parent1%"
}
]
diff --git a/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/ViewModelInstances.json b/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/ViewModelInstances.json
index 98ed0e6..5393b4b 100644
--- a/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/ViewModelInstances.json
+++ b/src/Microservices/PerformanceMonitor/GUI/Setups/PerformanceMonitor_Main/ViewModelInstances.json
@@ -51,13 +51,13 @@
"iteratorColumnPosition": -1
},
"dataPathStrList": [
- "dataElementPresent.TSDaemons",
- "dataElementPresent.TSDaemons.Name",
- "dataElementPresent.TSDaemons.Type",
- "dataElementPresent.TSDaemons.Address",
- "dataElementPresent.TSDaemons.Address.Port",
- "dataElementPresent.TSDaemons.Address.Port.Status",
- "dataElementPresent.TSDaemons.Address.Port.Status.GuiAddress"
+ "dataElementPresent.ControlDaemons",
+ "dataElementPresent.ControlDaemons.Name",
+ "dataElementPresent.ControlDaemons.Type",
+ "dataElementPresent.ControlDaemons.Address",
+ "dataElementPresent.ControlDaemons.Address.Port",
+ "dataElementPresent.ControlDaemons.Address.Port.Status",
+ "dataElementPresent.ControlDaemons.Address.Port.Status.GuiAddress"
],
"dataPathList": [
[
@@ -102,7 +102,7 @@
]
],
"selectionToControlPathStrList": [
- "dataElementPresent.TSDaemons"
+ "dataElementPresent.ControlDaemons"
],
"selectionToControlPathList": [
[
@@ -313,7 +313,7 @@
"class": "CViewModel_ElementRelay",
"customData": {},
"dataPathStrList": [
- "dataElementPresent.TSDaemons.GuiAddress"
+ "dataElementPresent.ControlDaemons.GuiAddress"
],
"dataPathList": [
[
diff --git a/src/Microservices/Playlist/Playlists/admin/Start.json b/src/Microservices/Playlist/Playlists/admin/Start.json
index c42e2d0..29800e0 100644
--- a/src/Microservices/Playlist/Playlists/admin/Start.json
+++ b/src/Microservices/Playlist/Playlists/admin/Start.json
@@ -15,7 +15,7 @@
"tp": 1,
"params": [
{
- "paramName": "TSDaemon",
+ "paramName": "ControlDaemon",
"paramValue": "0"
},
{
@@ -52,7 +52,7 @@
{
"getData": {
"source": "TSController",
- "element": "TSProcesses",
+ "element": "ControlledProcesses",
"filter": {
"dataValue": "true"
},
@@ -65,7 +65,7 @@
"content": "0",
"params": [
{
- "paramName": "TSProcess",
+ "paramName": "ControlledProcess",
"paramValue": "%Parent0%"
}
]
@@ -96,7 +96,7 @@
"paramValue": {
"request": {
"source": "TSController",
- "element": "TSProcesses",
+ "element": "ControlledProcesses",
"remapTo": {
"request": {
"source": "DataSource",
@@ -110,7 +110,7 @@
"element": "ReadyToRun",
"params": [
{
- "paramName": "TSProcess",
+ "paramName": "ControlledProcess",
"paramValue": {
"dataValue": "%FilterParent2%"
}
@@ -158,7 +158,7 @@
{
"paramName": "Element",
"paramValue": {
- "dataValue": "TSProcesses"
+ "dataValue": "ControlledProcesses"
}
}
]
@@ -259,7 +259,7 @@
{
"getData": {
"source": "TSController",
- "element": "TSProcesses",
+ "element": "ControlledProcesses",
"children": [
{
"setData": {
@@ -269,7 +269,7 @@
"content": "0",
"params": [
{
- "paramName": "TSProcess",
+ "paramName": "ControlledProcess",
"paramValue": "%Parent0%"
}
]
