From 0db5a38cb6d153abf58afbf6599763daa2578833 Mon Sep 17 00:00:00 2001 From: peusterm Date: Wed, 30 Aug 2017 09:51:32 +0200 Subject: [PATCH] Fix: OpenStack keystone API was broken for latest OS client --- .../openstack_dummies/keystone_dummy_api.py | 43 +------------------ 1 file changed, 1 insertion(+), 42 deletions(-) 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//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//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: -- 2.25.1