Fixed a couple of bugs in path resolution routine

Change-Id: I2e7754ec8aec3f882c9e624f65842cd55acc9049
This commit is contained in:
Alexander Tivelkov 2013-07-16 13:19:09 +04:00
parent e9264019d3
commit 3dee37df5f
1 changed files with 7 additions and 3 deletions

View File

@ -19,8 +19,12 @@ from muranoclient.common import base
def normalize_path(f):
@wraps(f)
def f_normalize_path(*args, **kwargs):
if kwargs['path'][0] == '/':
args = list(args)
if len(args) >= 3 and args[2][0] == '/':
args[2] = args[2][1:]
elif kwargs['path'][0] == '/':
kwargs['path'] = kwargs['path'][1:]
return f(*args, **kwargs)
return f_normalize_path
@ -51,7 +55,7 @@ class ServiceManager(base.Manager):
def post(self, environment_id, path, data, session_id):
headers = {'X-Configuration-Session': session_id}
return self._create('environments/{id}/services/{1}'.
return self._create('environments/{0}/services/{1}'.
format(environment_id, path), data,
headers=headers)
@ -59,7 +63,7 @@ class ServiceManager(base.Manager):
def put(self, environment_id, path, data, session_id):
headers = {'X-Configuration-Session': session_id}
return self._update('environments/{id}/services/{1}'.
return self._update('environments/{0}/services/{1}'.
format(environment_id, path), data,
headers=headers)