display assigned ip's and interfaces on dashboard

[osm/vim-emu.git] / src / emuvim / api / rest / compute.py

diff --git a/src/emuvim/api/rest/compute.py b/src/emuvim/api/rest/compute.py
index 2ffa3e8..07d059f 100755 (executable)
--- a/src/emuvim/api/rest/compute.py
+++ b/src/emuvim/api/rest/compute.py
@@ -123,13 +123,21 @@ class ComputeList(Resource):
             if dc_label is None or dc_label == 'None':
                 # return list with all compute nodes in all DCs
                 all_containers = []
+                all_extSAPs = []
                 for dc in dcs.itervalues():
                     all_containers += dc.listCompute()
-                return [(c.name, c.getStatus()) for c in all_containers], 200, CORS_HEADER
+                    all_extSAPs += dc.listExtSAPs()
+
+                extSAP_list = [(sap.name, sap.getStatus()) for sap in all_extSAPs]
+                container_list = [(c.name, c.getStatus()) for c in all_containers]
+                total_list = container_list + extSAP_list
+                return total_list, 200, CORS_HEADER
             else:
                 # return list of compute nodes for specified DC
-                return [(c.name, c.getStatus())
-                        for c in dcs.get(dc_label).listCompute()], 200, CORS_HEADER
+                container_list = [(c.name, c.getStatus()) for c in dcs.get(dc_label).listCompute()]
+                extSAP_list = [(sap.name, sap.getStatus()) for sap in dcs.get(dc_label).listExtSAPs()]
+                total_list = container_list + extSAP_list
+                return total_list, 200, CORS_HEADER
         except Exception as ex:
             logging.exception("API error.")
             return ex.message, 500, CORS_HEADER
@@ -174,16 +182,16 @@ class ComputeResources(Resource):
         # then no data
         if params is None:
             params = {}
-        logging.info("REST CALL: update container resources {0}".format(params))
+        logging.debug("REST CALL: update container resources {0}".format(params))
         #check if container exists
         d = dcs.get(dc_label).net.getNodeByName(compute_name)
 
         # general request of cpu percentage
         # create a mutable copy
         params = params.to_dict()
-        if 'cpu' in params:
+        if 'cpu_bw' in params:
             cpu_period = int(dcs.get(dc_label).net.cpu_period)
-            value = params.get('cpu')
+            value = params.get('cpu_bw')
             cpu_quota = int(cpu_period * float(value))
             #put default values back
             if float(value) <= 0: