Calls to the v1 API are prefixed with the appropriate version prefix

This will break existing usage in murano-dashboard, where in case if
the murano api host is provided manually, the dashboard explicitly
puts the version number at the end of endpoint
This is fixed in murano-dashboard commit Ic2bbdc6bdd55f1e1d5f7958126ccbad834cbba4c
Closes-bug: #1298477
Change-Id: Idc72c36a36fc2cd57ea02a156838742ace990633
This commit is contained in:
Alexander Tivelkov 2014-03-27 20:13:55 +04:00
parent 4bbeb5488e
commit af850493fa
5 changed files with 17 additions and 17 deletions

View File

@ -35,11 +35,11 @@ class DeploymentManager(base.Manager):
resource_class = Deployment
def list(self, environment_id):
return self._list('/environments/{id}/deployments'.
return self._list('/v1/environments/{id}/deployments'.
format(id=environment_id), 'deployments')
def reports(self, environment_id, deployment_id, *service_ids):
path = '/environments/{id}/deployments/{deployment_id}'
path = '/v1/environments/{id}/deployments/{deployment_id}'
path = path.format(id=environment_id, deployment_id=deployment_id)
if service_ids:
for service_id in service_ids:

View File

@ -35,29 +35,29 @@ class EnvironmentManager(base.Manager):
resource_class = Environment
def list(self):
return self._list('/environments', 'environments')
return self._list('/v1/environments', 'environments')
def create(self, body):
return self._create('/environments', body)
return self._create('/v1/environments', body)
def update(self, environment_id, name):
return self._update('/environments/{id}'.format(id=environment_id),
return self._update('/v1/environments/{id}'.format(id=environment_id),
body={'name': name})
def delete(self, environment_id):
return self._delete('/environments/{id}'.format(id=environment_id))
return self._delete('/v1/environments/{id}'.format(id=environment_id))
def get(self, environment_id, session_id=None):
if session_id:
headers = {'X-Configuration-Session': session_id}
else:
headers = {}
return self._get("/environments/{id}".format(id=environment_id),
return self._get("/v1/environments/{id}".format(id=environment_id),
headers=headers)
def last_status(self, environment_id, session_id):
headers = {'X-Configuration-Session': session_id}
path = '/environments/{id}/lastStatus'
path = '/v1/environments/{id}/lastStatus'
path = path.format(id=environment_id)
status_dict = self._get(path, return_raw=True,
response_key='lastStatuses',

View File

@ -57,14 +57,14 @@ class ServiceManager(base.Manager):
else:
headers = {}
return self._list('/environments/{0}/services/{1}'.
return self._list('/v1/environments/{0}/services/{1}'.
format(environment_id, path), headers=headers)
@normalize_path
def post(self, environment_id, path, data, session_id):
headers = {'X-Configuration-Session': session_id}
result = self._create('/environments/{0}/services/{1}'.
result = self._create('/v1/environments/{0}/services/{1}'.
format(environment_id, path), data,
headers=headers, return_raw=True)
@ -77,13 +77,13 @@ class ServiceManager(base.Manager):
def put(self, environment_id, path, data, session_id):
headers = {'X-Configuration-Session': session_id}
return self._update('/environments/{0}/services/{1}'.
return self._update('/v1/environments/{0}/services/{1}'.
format(environment_id, path), data,
headers=headers)
@normalize_path
def delete(self, environment_id, path, session_id):
headers = {'X-Configuration-Session': session_id}
path = '/environments/{0}/services/{1}'.format(environment_id, path)
path = '/v1/environments/{0}/services/{1}'.format(environment_id, path)
return self._delete(path, headers=headers)

View File

@ -27,19 +27,19 @@ class SessionManager(base.Manager):
resource_class = Session
def get(self, environment_id, session_id):
return self._get('/environments/{id}/sessions/{session_id}'.
return self._get('/v1/environments/{id}/sessions/{session_id}'.
format(id=environment_id, session_id=session_id))
def configure(self, environment_id):
return self._create('/environments/{id}/configure'.
return self._create('/v1/environments/{id}/configure'.
format(id=environment_id), None)
def deploy(self, environment_id, session_id):
path = '/environments/{id}/sessions/{session_id}/deploy'
path = '/v1/environments/{id}/sessions/{session_id}/deploy'
self.api.json_request('POST',
path.format(id=environment_id,
session_id=session_id))
def delete(self, environment_id, session_id):
return self._delete("/environments/{id}/sessions/{session_id}".
return self._delete("/v1/environments/{id}/sessions/{session_id}".
format(id=environment_id, session_id=session_id))

View File

@ -27,4 +27,4 @@ class StatisticsManager(base.Manager):
resource_class = Statistic
def list(self):
return self._list('/stats', 'stats')
return self._list('/v1/stats', 'stats')