Merge "Remove delete_extra_routes()"
diff --git a/tempest/api/network/test_routers.py b/tempest/api/network/test_routers.py
index 75a4d6a..ba416e4 100644
--- a/tempest/api/network/test_routers.py
+++ b/tempest/api/network/test_routers.py
@@ -325,13 +325,13 @@
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):
diff --git a/tempest/services/network/json/routers_client.py b/tempest/services/network/json/routers_client.py
index c1dfda0..78ffa77 100644
--- a/tempest/services/network/json/routers_client.py
+++ b/tempest/services/network/json/routers_client.py
@@ -42,15 +42,6 @@
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.