Skip to content

Commit

Permalink
OS API fixes, but v3.0 auth not fully supported right now. fallback t…
Browse files Browse the repository at this point in the history
…o v2.0
  • Loading branch information
mpeuster committed Aug 30, 2017
1 parent f881914 commit c0e0cc0
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/emuvim/api/openstack/openstack_dummies/keystone_dummy_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def __init__(self, in_ip, in_port):
self.api.add_resource(Shutdown, "/shutdown")
self.api.add_resource(KeystoneShowAPIv2, "/v2.0", resource_class_kwargs={'api': self})
self.api.add_resource(KeystoneGetToken, "/v2.0/tokens", resource_class_kwargs={'api': self})
self.api.add_resource(KeystoneShowAPIv3, "/v3", resource_class_kwargs={'api': self})
self.api.add_resource(KeystoneGetTokenv3, "/v3/auth/tokens", resource_class_kwargs={'api': self})
self.api.add_resource(KeystoneShowAPIv3, "/v3.0", resource_class_kwargs={'api': self})
self.api.add_resource(KeystoneGetTokenv3, "/v3.0/auth/tokens", resource_class_kwargs={'api': self})

def _start_flask(self):
LOG.info("Starting %s endpoint @ http://%s:%d" % (__name__, self.ip, self.port))
Expand Down Expand Up @@ -150,13 +150,13 @@ def get(self):
"media-types": [
{
"base": "application/json",
"type": "application/vnd.openstack.identity-v2.0+json"
"type": "application/vnd.openstack.identity-v3.0+json"
}
],
"id": "v2.0",
"id": "v3.0",
"links": [
{
"href": "http://%s:%d/v2.0" % (get_host(request), self.api.port),
"href": "http://%s:%d/v3.0" % (get_host(request), self.api.port),
"rel": "self"
}
]
Expand Down

0 comments on commit c0e0cc0

Please sign in to comment.