Merge pull request #84 from DistributedSystemsGroup/kpmg/fix-service-port-name

multiple port, disable checker for k8s

zoe_master/backends/kubernetes/api_client.py

@@ -77,7 +77,7 @@ class KubernetesServiceConf:
 
         for prt in ports:
             aux = self.conf['spec']['ports']  # type: List[Dict[str, str]]
-            aux[count]['name'] = 'http'
+            aux[count]['name'] = 'http-' + str(count)
             aux[count]['port'] = prt.number
             aux[count]['targetPort'] = prt.number
             count += 1
@@ -184,6 +184,13 @@ class KubernetesReplicationControllerConf:
         aux = self.conf['spec']['template']  # type: Dict
         aux['spec']['containers'][0]['resources']['limits']['cpu'] = corelimit
 
+    def set_spec_container_command(self, command):
+        """Setter to set container command"""
+        aux = self.conf['spec']['template']
+        aux['spec']['containers'][0]['command'] = []
+        command_arr = command.split(" ")
+        aux['spec']['containers'][0]['command'] = command_arr
+
     def set_spec_container_volumes(self, volumes: List[VolumeDescription], name: str):
         """Setter to set container volumes"""
         aux = self.conf['spec']['template']  # type: Dict
@@ -261,6 +268,9 @@ class KubernetesClient:
         if len(service_instance.volumes) > 0:
             config.set_spec_container_volumes(service_instance.volumes, service_instance.name)
 
+        if service_instance.command is not None:
+            config.set_spec_container_command(service_instance.command)
+
         info = {}
 
         try:

zoe_master/backends/kubernetes/backend.py

@@ -43,13 +43,13 @@ class KubernetesBackend(zoe_master.backends.base.BaseBackend):
         """Initializes Kubernetes backend starting the event monitoring thread."""
         global _monitor, _checker
         _monitor = KubernetesMonitor(state)
-        _checker = KubernetesStateSynchronizer(state)
+#        _checker = KubernetesStateSynchronizer(state)
 
     @classmethod
     def shutdown(cls):
         """Performs a clean shutdown of the resources used by Swarm backend."""
         _monitor.quit()
-        _checker.quit()
+#        _checker.quit()
 
     def spawn_service(self, service_instance: ServiceInstance):
         """Spawn a service, translating a Zoe Service into a Docker container."""