Switch to side-by-side view

--- a/service/Manifest.json
+++ b/service/Manifest.json
@@ -1,92 +1,93 @@
 {
   "spec": "http://eslap.cloud/manifest/service/1_0_0",
-  "name": "eslap://eslap.cloud/services/opc/1_0_0",
+  "name": "eslap://c2netproject.eu/services/c2net/1_0_0",
   "configuration": {
     "resources": [],
     "parameters": [{
+      "name": "acs",
+      "type": "eslap://eslap.cloud/parameter/json/1_0_0"
+    },{
       "name": "dssql",
       "type": "eslap://eslap.cloud/parameter/json/1_0_0"
     },{
-      "name": "mariadbwrapper",
+      "name": "nativedb",
       "type": "eslap://eslap.cloud/parameter/json/1_0_0"
     },{
-      "name": "solvermanager",
-      "type": "eslap://eslap.cloud/parameter/json/1_0_0"
-    },{
-      "name": "acs",
-      "type": "eslap://eslap.cloud/parameter/json/1_0_0"
-    },{
-      "name": "taskexecutor",
+      "name": "thirdPartyMediator",
       "type": "eslap://eslap.cloud/parameter/json/1_0_0"
     }]
   },
   "roles": [{
-    "name": "opcfe",
-    "component": "eslap://java.examples.ecloud/components/opcfemodule/0_5_5",
-    "resources": {},
-    "parameters": {}
+    "name": "acs",
+    "component": "eslap://iti/components/acs/0_0_118"
+  },{
+    "name": "cnm",
+    "component": "eslap://ikerlan.c2net/component/cnm/0_0_1"
+  },{
+    "name": "dkms",
+    "component": "eslap://uninova.c2netproject.eu/components/dkms/0_0_1"
+  },{
+    "name": "dsadmin",
+    "component": "eslap://iti.c2netproject.eu/components/dkbs/dsadmin/1_0_0"
+  },{
+    "name": "dsblob",
+    "component": "eslap://iti.c2netproject.eu/components/dkbs/dsblob/1_0_0"
+  },{
+    "name": "dslong",
+    "component": "eslap://iti.c2netproject.eu/components/dkbs/dslong/1_0_0"
+  },{
+    "name": "dssql",
+    "component": "eslap://iti/components/dssql/0_0_119"
+  },{
+    "name": "jobs",
+    "component": "eslap://c2netproject.eu/components/jobs/0_0_1"
+  },{
+    "name": "knowledgeBase",
+    "component": "eslap://uninova.c2netproject.eu/components/dkbs/kb/1_0_0"
+  },{
+    "name": "nativedb",
+    "component": "eslap://iti/components/mariadbwrapper/0_0_118"
+  },{
+    "name": "mpeaa",
+    "component": "eslap://armines.c2netproject.eu/components/cot/mpe/aa/1_0_0"
+  },{
+    "name": "mpemd",
+    "component": "eslap://armines.c2netproject.eu/components/cot/mpe/md/1_0_0"
   },{
     "name": "opc",
-    "component": "eslap://cms.c2net/components/opc/0_0_4",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "solvermanager",
-    "component": "eslap://c2netproject/components/solvermanager/0_0_6",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "pomamanager",
-    "component": "eslap://cms.c2net/components/pomam/0_0_9",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "jobexec",
-    "component": "eslap://c2netproject/components/jobs/0_0_4",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "taskexecutor",
-    "component": "eslap://c2netproject/components/taskexecutor/0_0_4",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "dssql",
-    "component": "eslap://iti/components/dssql/0_0_149",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "mariadbwrapper",
-    "component": "eslap://iti/components/mariadbwrapper/0_0_138",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "acs",
-    "component": "eslap://iti/components/acs/0_0_121",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "ucp",
-    "component": "eslap://linagora.c2netproject.eu/components/ucp/0_0_1",
-    "resources": {},
-    "parameters": {}
-  },{
-    "name": "fecnm",
-    "component": "eslap://emiedes/components/fecnm/0_0_115",
-    "resources": {},
-    "parameters": {}
+    "component": "eslap://cms.c2net/components/opc/0_0_1"
+  },{
+    "name": "opp",
+    "component": "eslap://linagora.c2netproject.eu/components/cot/opp/1_0_0"
+  },{
+    "name": "pomaManager",
+    "component": "eslap://cms.c2net/components/pomam/0_0_1"
+  },{
+    "name": "pubsubqueue",
+    "component": "eslap://atos.c2net/components/pubsub/1_0_0"
+  },{
+    "name": "resourceManager",
+    "component": "eslap://uninova.c2net/components/rm/0_0_1"
+  },{
+    "name": "solverManager",
+    "component": "eslap://cigip/components/solvermanager/0_0_1"
+  },{
+    "name": "taskExecutor",
+    "component": "eslap://c2netproject.eu/components/taskexecutor/0_0_1"
+  },{
+    "name": "thirdPartyMediator",
+    "component": "eslap://c2net.vtt/components/tpm/0_0_6"
+  },{
+    "name": "userCollaborationPortal",
+    "component": "eslap://linagora.c2netproject.eu/components/ucp/1_0_0"
   }],
   "channels": {
     "provides": [{
-      "name": "service",
+      "name": "portal",
       "type": "eslap://eslap.cloud/channel/reply/1_0_0",
       "protocol": "eslap://eslap.cloud/protocol/message/http/1_0_0"
     },{
-      "name": "serviceucp",
-      "type": "eslap://eslap.cloud/channel/reply/1_0_0",
-      "protocol": "eslap://eslap.cloud/protocol/message/http/1_0_0"
-    },{
-      "name": "servicefecnm",
+      "name": "pubsub",
       "type": "eslap://eslap.cloud/channel/reply/1_0_0",
       "protocol": "eslap://eslap.cloud/protocol/message/http/1_0_0"
     }],
@@ -95,109 +96,86 @@
   "connectors": [{
     "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
     "depended": [{
+      "role":"cnm",
+      "endpoint": "acs"
+    },{
+      "role":"opc",
+      "endpoint": "acs"
+    },{
+      "role":"solverManager",
+      "endpoint": "acs"
+    }],
+    "provided": [{
+      "role": "acs",
+      "endpoint": "rep_acs"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"TBD",
+      "endpoint": "TBD"
+    }],
+    "provided": [{
+      "role": "cnm",
       "endpoint": "service"
-    }],
-    "provided": [{
-      "role": "opcfe",
-      "endpoint": "entrypoint"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "opcfe",
-      "endpoint": "opc"
-    },{
-      "role": "fecnm",
-      "endpoint": "req_fe2opc"
-    },{
-      "role": "ucp",
-      "endpoint": "req_fe2opc"
-    }],
-    "provided": [{
-      "role": "opc",
-      "endpoint": "rep_optimization"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "opcfe",
-      "endpoint": "poma"
-    },{
-      "role": "opc",
-      "endpoint": "req_pomamanager"
-    },{
-      "role": "fecnm",
-      "endpoint": "req_fe2pm"
-    }],
-    "provided": [{
-      "role": "pomamanager",
-      "endpoint": "rep_pomaApi"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "ucp",
-      "endpoint": "req_fe2pm"
-    }],
-    "provided": [{
-      "role": "pomamanager",
-      "endpoint": "rep_pomaAdmin"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "opc",
-      "endpoint": "req_solvers"
-    }],
-    "provided": [{
-      "role": "solvermanager",
-      "endpoint": "solvermanagerservice"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "pomamanager",
-      "endpoint": "req_jobsExecutor"
-    }],
-    "provided": [{
-      "role": "jobexec",
-      "endpoint": "jobsService"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
-    "depended": [{
-      "role": "pomamanager",
-      "endpoint": "jobsNotifications"
-    }],
-    "provided": [{
-      "role": "jobexec",
-      "endpoint": "jobNotificationSend"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
-    "depended": [{
-      "role": "jobexec",
-      "endpoint": "taskNotificationReceive"
-    }],
-    "provided": [{
-      "role": "taskexecutor",
-      "endpoint": "taskNotificationSend"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
-    "depended": [{
-      "role": "acs",
-      "endpoint": "sub_dssql"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"opc",
+      "endpoint": "storage"
+    },{
+      "role":"pomaManager",
+      "endpoint": "storage"
+    },{
+      "role":"resourceManager",
+      "endpoint": "storage"
+    },{
+      "role":"solverManager",
+      "endpoint": "storage"
+    }],
+    "provided": [{
+      "role": "dkms",
+      "endpoint": "api"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"TBD",
+      "endpoint": "TBD"
+    }],
+    "provided": [{
+      "role": "dkms",
+      "endpoint": "data-collection"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
+    "depended": [{
+      "role":"dkms",
+      "endpoint": "event-notification"
+    }],
+    "provided": [{
+      "role": "TBD",
+      "endpoint": "TBD"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"cnm",
+      "endpoint": "storage"
     }],
     "provided": [{
       "role": "dssql",
-      "endpoint": "pub_dssql"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "acs",
+      "endpoint": "rep_dssql2fe_ops"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"acs",
       "endpoint": "req_acs2dssql"
+    },{
+      "role": "dkms",
+      "endpoint": "dssql"
     }],
     "provided": [{
       "role": "dssql",
@@ -206,43 +184,8 @@
   },{
     "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
     "depended": [{
-      "role": "solvermanager",
-      "endpoint": "req_solvermanager2acs"
-    },{
-      "role": "opc",
-      "endpoint": "req_opc2acs"
-    },{
-      "role": "pomamanager",
-      "endpoint": "req_poma2acs"
-    }],
-    "provided": [{
-      "role": "acs",
-      "endpoint": "rep_acs"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "jobexec",
-      "endpoint": "taskRequest"
-    }],
-    "provided": [{
-      "role": "taskexecutor",
-      "endpoint": "taskService"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "opc",
-      "endpoint": "req_storage"
-    },{
-      "role": "solvermanager",
-      "endpoint": "storage"
-    },{
-      "role": "pomamanager",
-      "endpoint": "req_storage"
-    },{
-      "role": "taskexecutor",
-      "endpoint": "maria_sql"
+      "role":"cnm",
+      "endpoint": "sql"
     }],
     "provided": [{
       "role": "dssql",
@@ -251,66 +194,170 @@
   },{
     "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
     "depended": [{
-      "role": "dssql",
+      "role":"pomaManager",
+      "endpoint": "jobsExecutor"
+    }],
+    "provided": [{
+      "role": "jobs",
+      "endpoint": "jobsService"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
+    "depended": [{
+      "role":"pomaManager",
+      "endpoint": "jobsNotifications"
+    }],
+    "provided": [{
+      "role": "jobs",
+      "endpoint": "jobNotificationSend"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"dssql",
+      "endpoint": "req_dssql2mdbw"
+    }],
+    "provided": [{
+      "role": "nativedb",
+      "endpoint": "rep_mdbw2dssql"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"dssql",
       "endpoint": "req_mariadbwrapper"
     }],
     "provided": [{
-      "role": "mariadbwrapper",
+      "role": "nativedb",
       "endpoint": "rep_mariadbwrapper"
     }]
   },{
     "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
     "depended": [{
-      "role": "dssql",
-      "endpoint": "req_dssql2mdbw"
-    },{
-      "role": "taskexecutor",
-      "endpoint": "maria_wrapper"
-    }],
-    "provided": [{
-      "role": "mariadbwrapper",
-      "endpoint": "rep_mdbw2dssql"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
-    "depended": [{
-      "role": "dssql",
-      "endpoint": "sub_mariadbwrapper"
-    }],
-    "provided": [{
-      "role": "mariadbwrapper",
-      "endpoint": "pub_mariadbwrapper"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "endpoint": "serviceucp"
+      "role":"TBD",
+      "endpoint": "TBD"
+    }],
+    "provided": [{
+      "role": "opc",
+      "endpoint": "optimisation"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"opc",
+      "endpoint": "pomaManager"
+    }],
+    "provided": [{
+      "role": "pomaManager",
+      "endpoint": "pomaManager"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
+    "depended": [{
+      "role":"pomaManager",
+      "endpoint": "events"
+    }],
+    "provided": [{
+      "role": "pomaManager",
+      "endpoint": "notifications"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "endpoint": "pubsub"
+    }],
+    "provided": [{
+      "role": "pubsubqueue",
+      "endpoint": "queue"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"resourceManager",
+      "endpoint": "confRM"
+    }],
+    "provided": [{
+      "role": "pubsubqueue",
+      "endpoint": "confPS"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"pubsubqueue",
+      "endpoint": "hubData"
+    }],
+    "provided": [{
+      "role": "resourceManager",
+      "endpoint": "hubData"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"TBD",
+      "endpoint": "TBD"
+    }],
+    "provided": [{
+      "role": "resourceManager",
+      "endpoint": "rmAdmin"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"TBD",
+      "endpoint": "TBD"
+    }],
+    "provided": [{
+      "role": "solverManager",
+      "endpoint": "solvermanagerservice"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role":"opc",
+      "endpoint": "solvers"
+    }],
+    "provided": [{
+      "role": "solverManager",
+      "endpoint": "optAdmin"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
+    "depended": [{
+      "role":"jobs",
+      "endpoint": "taskRequest"
+    }],
+    "provided": [{
+      "role": "taskExecutor",
+      "endpoint": "taskService"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
+    "depended": [{
+      "role":"TBD",
+      "endpoint": "TBD"
+    }],
+    "provided": [{
+      "role": "thirdPartyMediator",
+      "endpoint": "tpmAdmin"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/pubsub/1_0_0",
+    "depended": [{
+      "role":"thirdPartyMediator",
+      "endpoint": "tpmPush"
+    }],
+    "provided": [{
+      "role": "TBD",
+      "endpoint": "TBD"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "endpoint": "portal"
     }],
     "provided": [{
       "role": "ucp",
       "endpoint": "service"
     }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "endpoint": "servicefecnm"
-    }],
-    "provided": [{
-      "role": "fecnm",
-      "endpoint": "sepdest"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role": "fecnm",
-      "endpoint": "req_fe2sm"
-    },{
-      "role": "ucp",
-      "endpoint": "req_fe2sm"
-    }],
-    "provided": [{
-      "role": "solvermanager",
-      "endpoint": "optAdmin"
-    }]
   }]
 }