Switch to side-by-side view

--- a/deployment/Manifest.json
+++ b/deployment/Manifest.json
@@ -1,156 +1,34 @@
 {
   "spec": "http://eslap.cloud/manifest/deployment/1_0_0",
-  "servicename": "eslap://c2net/services/demo/november/0_0_1",
-  "name": "demo_november_1",
+  "servicename": "eslap://eslap.cloud/services/opc/1_0_0",
+  "name":"opc_service",
   "configuration": {
     "resources": {},
     "parameters": {
+      "acs": {
+        "dbWatcherDelay": 30000
+      },
       "dssql": {
-        "proxyTcpDssql": "{\"req_dssql2mdbw\":{\"port\":3306}}",
-        "dbWatcherDelay": 15000
-      },
-      "acs": {
-        "dbWatcherDelay": 15000
-      },
+        "proxyTcpDssql":"{\"req_dssql2mdbw\":{\"port\":3306}}",
+        "dbWatcherDelay": 30000
+        },
+      "solvermanager": {
+        "dbWatcherDelay": 30000
+        },
+      "mariadbwrapper": {
+        "proxyTcpMariadbwrapper":"{\"rep_mdbw2dssql\":{\"port\":3306}}",
+        "filesToLoad": [
+          "sqlFiles_base/c2net_prepare.sql",
+          "sqlFiles_base/c2net_check.sql"
+         ]
+        },
       "taskexecutor": {
         "proxyTcpMariaWrapper": "{\"maria_wrapper\":{\"port\":3306}}"
-      },
-      "nativedb": {
-        "proxyTcpMariadbwrapper": "{\"rep_mdbw2dssql\":{\"port\":3306}}",
-        "filesToLoad": [
-          "c2net_prepare.sql",
-          "C2_NOVATEC.sql",
-          "c2net_check.sql"
-        ]
-      },
-      "solverManager": {
-        "dbWatcherDelay": 15000
-      }
+        }
     }
   },
   "roles": {
-    "acs": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "cnm": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "dkms": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "dsadmin": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "dsblob": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "dslong"": {
-     "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "dssql": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "jobs": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "knowledgeBase": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "nativedb": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "mpeaa": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
-    "mpemd": {
+    "opcfe": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -172,7 +50,7 @@
         "__resilience": 1
       }
     },
-    "opp": {
+    "solvermanager": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -183,7 +61,7 @@
         "__resilience": 1
       }
     },
-    "pomaManager": {
+    "pomamanager": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -194,7 +72,7 @@
         "__resilience": 1
       }
     },
-    "pubsubqueue": {
+    "jobexec": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -205,7 +83,7 @@
         "__resilience": 1
       }
     },
-    "resourceManager": {
+    "taskexecutor": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -216,7 +94,7 @@
         "__resilience": 1
       }
     },
-    "solverManager": {
+    "dssql": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -227,7 +105,7 @@
         "__resilience": 1
       }
     },
-    "taskExecutor": {
+    "mariadbwrapper": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -238,7 +116,7 @@
         "__resilience": 1
       }
     },
-    "thirdPartyMediator": {
+    "acs": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,
@@ -249,7 +127,18 @@
         "__resilience": 1
       }
     },
-    "userCollaborationPortal",": {
+    "ucp": {
+      "resources": {
+        "__instances": 1,
+        "__cpu": 1,
+        "__memory": 1,
+        "__ioperf": 1,
+        "__iopsintensive": false,
+        "__bandwidth": 1,
+        "__resilience": 1
+      }
+    },
+    "fecnm": {
       "resources": {
         "__instances": 1,
         "__cpu": 1,