openstack
/
python-muranoclient
Code Issues Proposed changes

Fix API according to New Sessions Handling design 

Change-Id: If9df75167894c95464d7d34945198d695b17fcf6
This commit is contained in:
Serg Melikyan 2013-04-23 16:43:43 +04:00 committed by Gerrit Code Review
parent 2ce6eb11e6
commit e17b502049
4 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
muranoclient/common/base.py
View File

@ -92,8 +92,8 @@ class Manager(object):
return self.resource_class(self, body[response_key])
return self.resource_class(self, body)
def _get(self, url, response_key=None, return_raw=False):
resp, body = self.api.json_request('GET', url)
def _get(self, url, response_key=None, return_raw=False, headers={}):
resp, body = self.api.json_request('GET', url, headers=headers)
if return_raw:
if response_key:
return body[response_key]

9
muranoclient/v1/environments.py
View File

@ -39,5 +39,10 @@ class EnvironmentManager(base.Manager):
def delete(self, environment_id):
return self._delete('environments/{id}'.format(id=environment_id))
def get(self, environment_id):
return self._get("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),
headers=headers)

4
muranoclient/v1/sessions.py
View File

@ -34,10 +34,6 @@ class Status(base.Resource):
class SessionManager(base.Manager):
resource_class = Session
def list(self, environment_id):
return self._list('environments/{id}/sessions'.
format(id=environment_id), 'sessions')
def get(self, environment_id, session_id):
return self._get('environments/{id}/sessions/{session_id}'.
format(id=environment_id, session_id=session_id))

19
tests/muranoclient/test_methods.py
View File

@ -350,25 +350,6 @@ class UnitTestsForClassesAndFunctions(unittest.TestCase):
service_iis = services.ActiveDirectory(api, api)
assert service_iis.data() is not None
def test_session_manager_list(self):
manager = sessions.SessionManager(api)
result = manager.list('datacenter1')
assert result == []
def test_session_manager_list_with_named_parameters(self):
manager = sessions.SessionManager(api)
result = manager.list(environment_id='datacenter1')
assert result == []
def test_session_manager_list_negative_without_parameters(self):
result = 'Exception'
manager = sessions.SessionManager(api)
try:
result = manager.list()
except TypeError:
pass
assert result == 'Exception'
def test_session_manager_delete(self):
manager = sessions.SessionManager(api)
result = manager.delete('datacenter1', 'session1')