X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Frest%2Fcompute.py;h=c3680a098c26ab0bef48614da30265aefee8b327;hb=5afa0714ecd0762b29f37df1b5679865839ece34;hp=b935af8c05f03b281ed3dd4632c419fa50ba3597;hpb=0d98d75450be28bba00ebabcd9041b4ae541f964;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/api/rest/compute.py b/src/emuvim/api/rest/compute.py
index b935af8..c3680a0 100755
--- a/src/emuvim/api/rest/compute.py
+++ b/src/emuvim/api/rest/compute.py
@@ -34,7 +34,8 @@ logging.basicConfig(level=logging.INFO)
 
 dcs = {}
 
-class ComputeStart(Resource):
+
+class Compute(Resource):
     """
     Start a new compute instance: A docker container (note: zerorpc does not support keyword arguments)
     :param dc_label: name of the DC
@@ -48,41 +49,74 @@ class ComputeStart(Resource):
     global dcs
 
     def put(self, dc_label, compute_name):
-        logging.debug("API CALL: compute start")
-        try:
 
-            image = json.loads(request.json).get("image")
-            network = json.loads(request.json).get("network")
-            command = json.loads(request.json).get("docker_command")
+        # check if json data is a dict
+        data = request.json
+        if data is None:
+            data = {}
+        elif type(data) is not dict:
+            data = json.loads(request.json)
+
+        network = data.get("network")
+        nw_list = self._parse_network(network)
+        image = data.get("image")
+        command = data.get("docker_command")
+
+        try:
+            logging.debug("API CALL: compute start")
             c = dcs.get(dc_label).startCompute(
-                compute_name, image= image, command= command, network= network)
+                compute_name, image=image, command=command, network=nw_list)
             # return docker inspect dict
             return c.getStatus(), 200
         except Exception as ex:
             logging.exception("API error.")
             return ex.message, 500
 
-class ComputeStop(Resource):
+    def get(self, dc_label, compute_name):
 
-    global dcs
+        logging.debug("API CALL: compute status")
 
-    def get(self, dc_label, compute_name):
+        try:
+            return dcs.get(dc_label).containers.get(compute_name).getStatus(), 200
+        except Exception as ex:
+            logging.exception("API error.")
+            return ex.message, 500
+
+    def delete(self, dc_label, compute_name):
         logging.debug("API CALL: compute stop")
         try:
             return dcs.get(dc_label).stopCompute(compute_name), 200
         except Exception as ex:
             logging.exception("API error.")
-            return ex.message,500
+            return ex.message, 500
 
+    def _parse_network(self, network_str):
+        '''
+        parse the options for all network interfaces of the vnf
+        :param network_str: (id=x,ip=x.x.x.x/x), ...
+        :return: list of dicts [{"id":x,"ip":"x.x.x.x/x"}, ...]
+        '''
+        nw_list = list()
+
+        # TODO make this more robust with regex check
+        if network_str is None:
+            return nw_list
+
+        networks = network_str[1:-1].split('),(')
+        for nw in networks:
+            nw_dict = dict(tuple(e.split('=')) for e in nw.split(','))
+            nw_list.append(nw_dict)
+
+        return nw_list
 
-class ComputeList(Resource):
 
+class ComputeList(Resource):
     global dcs
 
-    def get(self, dc_label):
+    def get(self, dc_label=None):
         logging.debug("API CALL: compute list")
         try:
-            if dc_label == 'None':
+            if dc_label is None or dc_label == 'None':
                 # return list with all compute nodes in all DCs
                 all_containers = []
                 for dc in dcs.itervalues():
@@ -91,28 +125,13 @@ class ComputeList(Resource):
             else:
                 # return list of compute nodes for specified DC
                 return [(c.name, c.getStatus())
-                    for c in dcs.get(dc_label).listCompute()], 200
+                        for c in dcs.get(dc_label).listCompute()], 200
         except Exception as ex:
             logging.exception("API error.")
             return ex.message, 500
 
 
-class ComputeStatus(Resource):
-
-    global dcs
-
-    def get(self, dc_label, compute_name):
-
-        logging.debug("API CALL: compute list")
-
-        try:
-            return dcs.get(dc_label).containers.get(compute_name).getStatus(), 200
-        except Exception as ex:
-            logging.exception("API error.")
-            return ex.message, 500
-
 class DatacenterList(Resource):
-
     global dcs
 
     def get(self):
@@ -123,8 +142,8 @@ class DatacenterList(Resource):
             logging.exception("API error.")
             return ex.message, 500
 
-class DatacenterStatus(Resource):
 
+class DatacenterStatus(Resource):
     global dcs
 
     def get(self, dc_label):