X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fopenstack_dummies%2Fnova_dummy_api.py;h=50294177450bbc04763f3a1313326298417314d1;hp=7495076e481c59236c8b7106cd2b64a8c8a3633b;hb=4e5c81ecd37e7383c52dad55079f91b90dec22fe;hpb=396e91e0dc05304d524a41d5a6f48d75c2867974

diff --git a/src/emuvim/api/openstack/openstack_dummies/nova_dummy_api.py b/src/emuvim/api/openstack/openstack_dummies/nova_dummy_api.py
index 7495076..5029417 100755
--- a/src/emuvim/api/openstack/openstack_dummies/nova_dummy_api.py
+++ b/src/emuvim/api/openstack/openstack_dummies/nova_dummy_api.py
@@ -42,10 +42,13 @@ class NovaDummyApi(BaseOpenstackDummy):
     def __init__(self, in_ip, in_port, compute):
         super(NovaDummyApi, self).__init__(in_ip, in_port)
         self.compute = compute
+        self.compute.add_flavor('m1.tiny', 1, 512, "MB", 1, "GB")
+        self.compute.add_flavor('m1.nano', 1, 64, "MB", 0, "GB")
+        self.compute.add_flavor('m1.micro', 1, 128, "MB", 0, "GB")
+        self.compute.add_flavor('m1.small', 1, 1024, "MB", 2, "GB")
 
         self.api.add_resource(NovaVersionsList, "/",
                               resource_class_kwargs={'api': self})
-        self.api.add_resource(Shutdown, "/shutdown")
         self.api.add_resource(NovaVersionShow, "/v2.1/<id>",
                               resource_class_kwargs={'api': self})
         self.api.add_resource(NovaListServersApi, "/v2.1/<id>/servers",
@@ -75,30 +78,6 @@ class NovaDummyApi(BaseOpenstackDummy):
         self.api.add_resource(NovaLimits, "/v2.1/<id>/limits",
                               resource_class_kwargs={'api': self})
 
-    def _start_flask(self):
-        LOG.info("Starting %s endpoint @ http://%s:%d" % ("NovaDummyApi", self.ip, self.port))
-        # add some flavors for good measure
-        self.compute.add_flavor('m1.tiny', 1, 512, "MB", 1, "GB")
-        self.compute.add_flavor('m1.nano', 1, 64, "MB", 0, "GB")
-        self.compute.add_flavor('m1.micro', 1, 128, "MB", 0, "GB")
-        self.compute.add_flavor('m1.small', 1, 1024, "MB", 2, "GB")
-        if self.app is not None:
-            self.app.before_request(self.dump_playbook)
-            self.app.run(self.ip, self.port, debug=True, use_reloader=False)
-
-
-class Shutdown(Resource):
-    """
-    A get request to /shutdown will shut down this endpoint.
-    """
-
-    def get(self):
-        LOG.debug(("%s is beeing shut doen") % (__name__))
-        func = request.environ.get('werkzeug.server.shutdown')
-        if func is None:
-            raise RuntimeError('Not running with the Werkzeug Server')
-        func()
-
 
 class NovaVersionsList(Resource):
     def __init__(self, api):