openstack/python-openstackclient
Code Issues Proposed changes

Merge "Don't hack the image url"

Browse Source
This commit is contained in:
Jenkins
2015-03-06 04:59:51 +00:00
committed by Gerrit Code Review
parent fb2a5492df 59727ba2f9
commit c4cb51f5a8
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openstackclient/api/image_v1.py
View File

@@ -19,11 +19,18 @@ from openstackclient.api import api
class APIv1(api.BaseAPI):
"""Image v1 API"""
_endpoint_suffix = 'v1'
def __init__(self, endpoint=None, **kwargs):
super(APIv1, self).__init__(endpoint=endpoint, **kwargs)
self.endpoint = self.endpoint.rstrip('/')
self._munge_url()
def _munge_url(self):
# Hack this until discovery is up
self.endpoint = '/'.join([self.endpoint.rstrip('/'), 'v1'])
if self._endpoint_suffix not in self.endpoint.split('/')[-1]:
self.endpoint = '/'.join([self.endpoint, self._endpoint_suffix])
def image_list(
self,

7
openstackclient/api/image_v2.py
View File

@@ -19,11 +19,12 @@ from openstackclient.api import image_v1
class APIv2(image_v1.APIv1):
"""Image v2 API"""
def __init__(self, endpoint=None, **kwargs):
super(APIv2, self).__init__(endpoint=endpoint, **kwargs)
_endpoint_suffix = 'v2'
def _munge_url(self):
# Hack this until discovery is up, and ignore parent endpoint setting
self.endpoint = '/'.join([endpoint.rstrip('/'), 'v2'])
if 'v2' not in self.endpoint.split('/')[-1]:
self.endpoint = '/'.join([self.endpoint, 'v2'])
def image_list(
self,