Switch to side-by-side view

--- a/service/Manifest.json
+++ b/service/Manifest.json
@@ -1,363 +1,257 @@
 {
   "spec": "http://eslap.cloud/manifest/service/1_0_0",
-  "name": "eslap://c2netproject.eu/services/c2net/1_0_0",
-  "configuration": {
+  "name": "eslap://linagora.c2netproject.eu/services/cot/0_0_1",
+  "code": "",
+   "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": "nativedb",
-      "type": "eslap://eslap.cloud/parameter/json/1_0_0"
-    },{
-      "name": "thirdPartyMediator",
-      "type": "eslap://eslap.cloud/parameter/json/1_0_0"
-    }]
+       "parameters": [
+	   {
+	       "name": "dssql",
+	       "type": "eslap://eslap.cloud/parameter/json/1_0_0"
+	   },
+	   {
+	       "name": "mariadb",
+	       "type": "eslap://eslap.cloud/parameter/json/1_0_0"
+	   }
+       ]
   },
-  "roles": [{
-    "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_1"
-  },{
+    "roles": [
+	{
+	    "name": "dkms",
+	    "component": "eslap://uninova.c2net/components/dkms/1_0_0",
+	    "resources": {},
+	    "parameters": {}
+	},
+	{
+	    "name": "mariadb",
+	    "component": "eslap://iti/components/mariadbwrapper/0_0_120",
+	    "resources": {},
+	    "parameters": {}
+	},
+	{
+	    "name": "dssql",
+	    "component": "eslap://iti/components/dssql/0_0_132",
+	    "resources": {},
+	    "parameters": {}
+	},
+	{
+	    "name": "proxy",
+	    "component": "eslap://uninova.c2netproject.eu/components/requestmaker/0_0_1",
+	    "resources": {},
+	    "parameters": {}
+	},
+	{
     "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"
+    "component": "eslap://linagora.c2netproject.eu/components/opp/1_0_0",
+    "resources": {},
+    "parameters": {}
+  },{
+    "name": "mpe_aa",
+    "component": "eslap://linagora.c2netproject.eu/components/mpe_aa/1_0_0",
+    "resources": {},
+    "parameters": {}
+  },{
+    "name": "mpe_md",
+    "component": "eslap://linagora.c2netproject.eu/components/mpe_md/1_1_0",
+    "resources": {},
+    "parameters": {}
+  },{
+    "name": "ucp",
+    "component": "eslap://linagora.c2netproject.eu/components/ucp/1_0_0",
+    "resources": {},
+    "parameters": {}
+  },{
+    "name": "opt",
+    "component": "eslap://linagora.c2netproject.eu/components/opt/1_0_0",
+    "resources": {},
+    "parameters": {}
   }],
   "channels": {
-    "provides": [{
-      "name": "portal",
-      "type": "eslap://eslap.cloud/channel/reply/1_0_0",
-      "protocol": "eslap://eslap.cloud/protocol/message/http/1_0_0"
-    },{
-      "name": "pubsub",
-      "type": "eslap://eslap.cloud/channel/reply/1_0_0",
-      "protocol": "eslap://eslap.cloud/protocol/message/http/1_0_0"
-    }],
+      "provides": [
+	  {
+	      "name": "service",
+	      "type": "eslap://eslap.cloud/channel/reply/1_0_0",
+	      "protocol": "eslap://eslap.cloud/protocol/message/http/1_0_0"
+	  }
+
+      ],
     "requires": []
   },
-  "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"
-    }]
-  },{
-    "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": "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",
-      "endpoint": "rep_dssql2acs_ops"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "role":"cnm",
-      "endpoint": "sql"
-    }],
-    "provided": [{
-      "role": "dssql",
-      "endpoint": "rep_dssql_sql"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "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": "nativedb",
-      "endpoint": "rep_mariadbwrapper"
-    }]
-  },{
-    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-    "depended": [{
-      "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"
+    "connectors": [
+
+	{
+	    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+	    "depended": [
+		{
+		    "endpoint": "service"
+		}
+	    ],
+	    "provided": [
+		{
+		    "role": "proxy",
+		    "endpoint": "listener"
+		}
+	    ]
+	},
+	{
+	    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+	    "depended": [
+		{
+		    "role": "proxy",
+		    "endpoint": "probe"
+		},
+		{
+		    "role": "mpe_md",
+		    "endpoint": "query"
+		}
+	    ],
+	    "provided": [
+		{
+		    "role": "dkms",
+		    "endpoint": "api"
+		}
+	    ]
+	},
+	{
+	    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+	    "depended": [
+		{
+		    "role": "dkms",
+		    "endpoint": "eventnotification"
+		}
+	    ],
+	    "provided": [
+		{
+		    "role": "mpe_md",
+		    "endpoint": "eventnotification"
+		}
+	    ]
+	},
+	{
+	    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+	    "depended": [
+		{
+		    "role": "dkms",
+		    "endpoint": "dssql"
+		}
+	    ],
+	    "provided": [
+		{
+		    "role": "dssql",
+		    "endpoint": "rep_dssql_sql"
+		}
+	    ]
+	},
+	{
+	    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+	    "depended": [
+		{
+		    "role": "dssql",
+		    "endpoint": "req_dssql2mdbw"
+		}
+	    ],
+	    "provided": [
+		{
+		    "role": "mariadb",
+		    "endpoint": "rep_mdbw2dssql"
+		}
+	    ]
+	},
+	{
+	    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+	    "depended": [
+		{
+		    "role": "dssql",
+		    "endpoint": "req_mariadbwrapper"
+		}
+	    ],
+	    "provided": [
+		{
+		    "role": "mariadb",
+		    "endpoint": "rep_mariadbwrapper"
+		}
+	    ]
+	},
+
+	{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "mpe_md",
+      "endpoint": "detectionresults"
+    }],
+    "provided": [{
+      "role": "mpe_aa",
+      "endpoint": "detectionresults"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "mpe_aa",
+      "endpoint": "adaptation"
+    }],
+    "provided": [{
+      "role": "opp",
+      "endpoint": "adaptation"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "opp",
+      "endpoint": "actions"
+    }],
+    "provided": [{
+      "role": "ucp",
+      "endpoint": "workflowActions"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "ucp",
+      "endpoint": "cotOrchestration"
+    }],
+    "provided": [{
+      "role": "opp",
+      "endpoint": "orchestration"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "ucp",
+      "endpoint": "optimisation"
+    }],
+    "provided": [{
+      "role": "opt",
+      "endpoint": "optimisation"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "mpe_aa",
+      "endpoint": "cotassessments"
+    }],
+    "provided": [{
+      "role": "ucp",
+      "endpoint": "assessment"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "opp",
+      "endpoint": "optimisation"
+    }],
+    "provided": [{
+      "role": "opt",
+      "endpoint": "optimisation"
+    }]
+  },{
+    "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
+    "depended": [{
+      "role": "opt",
+      "endpoint": "notification"
+    }],
+    "provided": [{
+      "role": "opp",
+      "endpoint": "notification"
     }]
   }]
 }