openstack/nova
Code Issues Proposed changes

backup_schedule tests corrected; controller moved to APIRouterV10; making controller fully HTTPNotImplemented

Browse Source
This commit is contained in:
Brian Waldon
2011-03-28 14:31:12 -04:00
parent ad45419e78
commit b6df504c33
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/api/openstack/__init__.py
View File

@@ -106,11 +106,6 @@ class APIRouter(wsgi.Router):
controller=accounts.Controller(), controller=accounts.Controller(),
collection={'detail': 'GET'}) collection={'detail': 'GET'})
mapper.resource("backup_schedule", "backup_schedule",
controller=backup_schedules.Controller(),
parent_resource=dict(member_name='server',
collection_name='servers'))
mapper.resource("console", "consoles", mapper.resource("console", "consoles",
controller=consoles.Controller(), controller=consoles.Controller(),
parent_resource=dict(member_name='server', parent_resource=dict(member_name='server',
@@ -141,6 +136,11 @@ class APIRouterV10(APIRouter):
controller=flavors.ControllerV10(), controller=flavors.ControllerV10(),
collection={'detail': 'GET'}) collection={'detail': 'GET'})
mapper.resource("backup_schedule", "backup_schedule",
controller=backup_schedules.Controller(),
parent_resource=dict(member_name='server',
collection_name='servers'))
class APIRouterV11(APIRouter): class APIRouterV11(APIRouter):
"""Define routes specific to OpenStack API V1.1.""" """Define routes specific to OpenStack API V1.1."""

6
nova/api/openstack/backup_schedules.py
View File

@@ -42,7 +42,11 @@ class Controller(wsgi.Controller):
def index(self, req, server_id): def index(self, req, server_id):
""" Returns the list of backup schedules for a given instance """ """ Returns the list of backup schedules for a given instance """
return _translate_keys({}) return faults.Fault(exc.HTTPNotImplemented())
def show(self, req, server_id, id):
""" Returns a single backup schedule for a given instance """
return faults.Fault(exc.HTTPNotImplemented())
def create(self, req, server_id): def create(self, req, server_id):
""" No actual update method required, since the existing API allows """ No actual update method required, since the existing API allows

22
nova/tests/api/openstack/test_servers.py
View File

@@ -483,21 +483,31 @@ class ServersTest(test.TestCase):
req.get_response(fakes.wsgi_app()) req.get_response(fakes.wsgi_app())
def test_create_backup_schedules(self): def test_create_backup_schedules(self):
req = webob.Request.blank('/v1.0/servers/1/backup_schedules') req = webob.Request.blank('/v1.0/servers/1/backup_schedule')
req.method = 'POST' req.method = 'POST'
res = req.get_response(fakes.wsgi_app()) res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status, '404 Not Found') self.assertEqual(res.status_int, 501)
def test_delete_backup_schedules(self): def test_delete_backup_schedules(self):
req = webob.Request.blank('/v1.0/servers/1/backup_schedules') req = webob.Request.blank('/v1.0/servers/1/backup_schedule/1')
req.method = 'DELETE' req.method = 'DELETE'
res = req.get_response(fakes.wsgi_app()) res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status, '404 Not Found') self.assertEqual(res.status_int, 501)
def test_get_server_backup_schedules(self): def test_get_server_backup_schedules(self):
req = webob.Request.blank('/v1.0/servers/1/backup_schedules') req = webob.Request.blank('/v1.0/servers/1/backup_schedule')
res = req.get_response(fakes.wsgi_app()) res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status, '404 Not Found') self.assertEqual(res.status_int, 501)
def test_get_server_backup_schedule(self):
req = webob.Request.blank('/v1.0/servers/1/backup_schedule/1')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status_int, 501)
def test_server_backup_schedule_deprecated_v11(self):
req = webob.Request.blank('/v1.1/servers/1/backup_schedule')
res = req.get_response(fakes.wsgi_app())
self.assertEqual(res.status_int, 404)
def test_get_all_server_details_v1_0(self): def test_get_all_server_details_v1_0(self):
req = webob.Request.blank('/v1.0/servers/detail') req = webob.Request.blank('/v1.0/servers/detail')