From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 10 Aug 2016 13:45:07 +0000 (+0200)
Subject: merge rest api updates
X-Git-Tag: v3.1~77
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=5afa0714ecd0762b29f37df1b5679865839ece34

merge rest api updates
---

5afa0714ecd0762b29f37df1b5679865839ece34
diff --cc src/emuvim/api/rest/compute.py
index 030055e,78b49e3..c3680a0
--- a/src/emuvim/api/rest/compute.py
+++ b/src/emuvim/api/rest/compute.py
@@@ -89,27 -109,14 +109,14 @@@ class Compute(Resource)
  
          return nw_list
  
- class ComputeStop(Resource):
- 
-     global dcs
- 
-     def get(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
- 
  
  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():
diff --cc src/emuvim/api/rest/rest_api_endpoint.py
index 51b58cb,b586915..e382f5a
--- a/src/emuvim/api/rest/rest_api_endpoint.py
+++ b/src/emuvim/api/rest/rest_api_endpoint.py
@@@ -62,16 -60,13 +60,16 @@@ class RestApiEndpoint(object)
          self.api = Api(self.app)
  
          # setup endpoints
++
+         self.api.add_resource(Compute, "/restapi/compute/<dc_label>/<compute_name>")
 -        self.api.add_resource(ComputeList, "/restapi/compute/<dc_label>")
 +        self.api.add_resource(ComputeList,
-                               "/restapi/compute",
-                               "/restapi/compute/<dc_label>")
-         self.api.add_resource(ComputeStart, "/restapi/compute/<dc_label>/<compute_name>/start")
-         self.api.add_resource(ComputeStop, "/restapi/compute/<dc_label>/<compute_name>/stop")
-         self.api.add_resource(ComputeStatus, "/restapi/compute/<dc_label>/<compute_name>")
-         self.api.add_resource(DatacenterList, "/restapi/datacenter")
++                      "/restapi/compute",
++                      "/restapi/compute/<dc_label>")
+ 
          self.api.add_resource(DatacenterStatus, "/restapi/datacenter/<dc_label>")
+         self.api.add_resource(DatacenterList, "/restapi/datacenter")
  
-         self.api.add_resource(NetworkAction, "/restapi/network/<vnf_src_name>/<vnf_dst_name>",)
+         self.api.add_resource(NetworkAction, "/restapi/network/<vnf_src_name>/<vnf_dst_name>", )
  
          self.api.add_resource(MonitorInterfaceAction,
                                "/restapi/monitor/<vnf_name>/<metric>",