openstack/tempest
Code Issues Proposed changes

Merge "Remove delete_extra_routes()"

Browse Source
This commit is contained in:
Jenkins 2016-06-06 17:19:32 +00:00 committed by Gerrit Code Review
commit c24869b191
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/api/network/test_routers.py
View File

@ -325,13 +325,13 @@ class RoutersTest(base.BaseRouterTest):
routes[i]['destination'])
self.assertEqual(test_routes[i]['nexthop'], routes[i]['nexthop'])
self.routers_client.delete_extra_routes(router['id'])
self._delete_extra_routes(router['id'])
show_body_after_deletion = self.routers_client.show_router(
router['id'])
self.assertEmpty(show_body_after_deletion['router']['routes'])
def _delete_extra_routes(self, router_id):
self.routers_client.delete_extra_routes(router_id)
self.routers_client.update_router(router_id, routes=None)
@test.idempotent_id('a8902683-c788-4246-95c7-ad9c6d63a4d9')
def test_update_router_admin_state(self):

9
tempest/services/network/json/routers_client.py
View File

@ -42,15 +42,6 @@ class RoutersClient(base.BaseNetworkClient):
uri = '/routers'
return self.list_resources(uri, **filters)
def delete_extra_routes(self, router_id):
uri = '/routers/%s' % router_id
put_body = {
'router': {
'routes': None
}
}
return self.update_resource(uri, put_body)
def add_router_interface(self, router_id, **kwargs):
"""Add router interface.