Fix: hackfest_1 deployment using OSM LB returned

[osm/vim-emu.git] / src / emuvim / api / openstack / openstack_dummies / heat_dummy_api.py

diff --git a/src/emuvim/api/openstack/openstack_dummies/heat_dummy_api.py b/src/emuvim/api/openstack/openstack_dummies/heat_dummy_api.py
index e95d9d6..9822f22 100755 (executable)
--- a/src/emuvim/api/openstack/openstack_dummies/heat_dummy_api.py
+++ b/src/emuvim/api/openstack/openstack_dummies/heat_dummy_api.py
@@ -44,7 +44,6 @@ class HeatDummyApi(BaseOpenstackDummy):
         super(HeatDummyApi, self).__init__(in_ip, in_port)
         self.compute = compute
 
-        self.api.add_resource(Shutdown, "/shutdown")
         self.api.add_resource(HeatListAPIVersions, "/",
                               resource_class_kwargs={'api': self})
         self.api.add_resource(HeatCreateStack, "/v1/<tenant_id>/stacks",
@@ -69,26 +68,6 @@ class HeatDummyApi(BaseOpenstackDummy):
             return response
 
 
-    def _start_flask(self):
-        LOG.info("Starting %s endpoint @ http://%s:%d" % (__name__, self.ip, self.port))
-        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 down") % (__name__))
-        func = request.environ.get('werkzeug.server.shutdown')
-        if func is None:
-            raise RuntimeError('Not running with the Werkzeug Server')
-        func()
-
-
 class HeatListAPIVersions(Resource):
     def __init__(self, api):
         self.api = api
@@ -409,12 +388,14 @@ class HeatDeleteStack(Resource):
         try:
             if stack_name_or_id in self.api.compute.stacks:
                 self.api.compute.delete_stack(stack_name_or_id)
-                return Response('Deleted Stack: ' + stack_name_or_id, 204)
+                return Response("", 204,
+                                mimetype='application/json')
 
             for stack in self.api.compute.stacks.values():
                 if stack.stack_name == stack_name_or_id:
                     self.api.compute.delete_stack(stack.id)
-                    return Response('Deleted Stack: ' + stack_name_or_id, 204)
+                    return Response("", 204,
+                                    mimetype='application/json')
 
         except Exception as ex:
             LOG.exception("Heat: Delete Stack exception")