From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Wed, 30 Aug 2017 07:51:32 +0000 (+0200)
Subject: Fix: OpenStack keystone API was broken for latest OS client
X-Git-Tag: v3.1~13^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=0db5a38cb6d153abf58afbf6599763daa2578833;p=osm%2Fvim-emu.git

Fix: OpenStack keystone API was broken for latest OS client
---

diff --git a/src/emuvim/api/openstack/openstack_dummies/keystone_dummy_api.py b/src/emuvim/api/openstack/openstack_dummies/keystone_dummy_api.py
index e39cfeb..58f56d8 100755
--- a/src/emuvim/api/openstack/openstack_dummies/keystone_dummy_api.py
+++ b/src/emuvim/api/openstack/openstack_dummies/keystone_dummy_api.py
@@ -116,30 +116,10 @@ class KeystoneShowAPIv2(Resource):
                 {
                     "href": "http://%s:%d/v2.0" % (get_host(request), self.api.port),
                     "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/tokens" % (get_host(request), self.api.port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/networks" % (get_host(request), neutron_port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/subnets" % (get_host(request), neutron_port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/ports" % (get_host(request), neutron_port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v1/<tenant_id>/stacks" % (get_host(request), heat_port),
-                    "rel": "self"
                 }
             ]
         }
-
+        LOG.debug(json.dumps(resp))
         return Response(json.dumps(resp), status=200, mimetype='application/json')
 
 
@@ -178,26 +158,6 @@ class KeystoneShowAPIv3(Resource):
                 {
                     "href": "http://%s:%d/v2.0" % (get_host(request), self.api.port),
                     "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/tokens" % (get_host(request), self.api.port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/networks" % (get_host(request), neutron_port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/subnets" % (get_host(request), neutron_port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v2.0/ports" % (get_host(request), neutron_port),
-                    "rel": "self"
-                },
-                {
-                    "href": "http://%s:%d/v1/<tenant_id>/stacks" % (get_host(request), heat_port),
-                    "rel": "self"
                 }
             ]
         }
@@ -470,7 +430,6 @@ class KeystoneGetTokenv3(Resource):
                     "name": "heat"
                 }
             ]
-            
             return Response(json.dumps(ret), status=201, mimetype='application/json')
 
         except Exception as ex: