Skip to content

Commit

Permalink
Allow for the 'name' parameter to be passed to list server with detai…
Browse files Browse the repository at this point in the history
…ls as well
  • Loading branch information
cyli committed Aug 6, 2014
1 parent 8b99d0e commit 8fa411d
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 3 deletions.
7 changes: 5 additions & 2 deletions mimic/rest/nova_api.py
Expand Up @@ -92,7 +92,7 @@ def list_servers(self, request, tenant_id):
"""
Returns list of servers that were created by the mocks, with the given name.
"""
server_name = ''
server_name = None
if 'name' in request.args:
server_name = request.args['name'][0]
response_data = list_server(tenant_id, server_name, details=False)
Expand All @@ -104,7 +104,10 @@ def list_servers_with_details(self, request, tenant_id):
"""
Returns list of servers that were created by the mocks, with details such as the metadata.
"""
response_data = list_server(tenant_id)
server_name = None
if 'name' in request.args:
server_name = request.args['name'][0]
response_data = list_server(tenant_id, server_name)
request.setResponseCode(response_data[1])
return json.dumps(response_data[0])

Expand Down
28 changes: 27 additions & 1 deletion mimic/test/test_nova.py
Expand Up @@ -10,7 +10,7 @@
from mimic.canned_responses.nova import server_template
from mimic.core import MimicCore
from mimic.resource import MimicRoot
from mimic.test.helpers import request
from mimic.test.helpers import json_request, request
from mimic.rest.nova_api import NovaApi


Expand Down Expand Up @@ -249,6 +249,32 @@ def test_list_servers_with_details(self):
self.assertEqual(len(list_servers_detail_response_body['servers']), 1)
self.assertEqual(list_servers_detail_response_body['servers'][0]['status'], 'ACTIVE')

def test_list_servers_with_details_with_args(self):
"""
:func:`list_servers_with_details` on
``GET /v2.0/<tenant_id>/servers/detail`` when a server with the given
name exists
"""
response, body = self.successResultOf(json_request(
self, self.root, "GET",
"{0}/servers/detail?name={1}".format(self.uri, self.server_name)))
self.assertEqual(response.code, 200)
self.assertEqual(body['servers'][0]['id'], self.server_id)
self.assertEqual(len(body['servers']), 1)
self.assertEqual(body['servers'][0]['status'], 'ACTIVE')

def test_list_servers_with_details_with_args_negative(self):
"""
:func:`list_servers_with_details` on
``GET /v2.0/<tenant_id>/servers/detail`` when a server with the given
name does not exist
"""
response, body = self.successResultOf(json_request(
self, self.root, "GET",
'{0}/servers/detail?name=no_server'.format(self.uri)))
self.assertEqual(response.code, 200)
self.assertEqual(len(body['servers']), 0)

def test_delete_server(self):
"""
Test to verify :func:`delete_server` on ``DELETE /v2.0/<tenant_id>/servers/<server_id>``
Expand Down

0 comments on commit 8fa411d

Please sign in to comment.