openstack/python-openstackclient
Code Issues Proposed changes

Use correct router add/remove interface methods

Browse Source 
Use the correct openstacksdk method names.

Change-Id: I07b463753eedf41f79c6e00e9224d0f7697a1bd3
Closes-Bug: #1625954
This commit is contained in:
rabi 2016-09-21 12:58:50 +05:30
parent 682c2bfb8b
commit 47b782687f
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/network/v2/router.py
View File

@ -119,7 +119,7 @@ class AddPortToRouter(command.Command):
def take_action(self, parsed_args):
client = self.app.client_manager.network
port = client.find_port(parsed_args.port, ignore_missing=False)
client.router_add_interface(client.find_router(
client.add_interface_to_router(client.find_router(
parsed_args.router, ignore_missing=False), port_id=port.id)
@ -144,7 +144,7 @@ class AddSubnetToRouter(command.Command):
client = self.app.client_manager.network
subnet = client.find_subnet(parsed_args.subnet,
ignore_missing=False)
client.router_add_interface(
client.add_interface_to_router(
client.find_router(parsed_args.router,
ignore_missing=False),
subnet_id=subnet.id)
@ -324,7 +324,7 @@ class RemovePortFromRouter(command.Command):
def take_action(self, parsed_args):
client = self.app.client_manager.network
port = client.find_port(parsed_args.port, ignore_missing=False)
client.router_remove_interface(client.find_router(
client.remove_interface_from_router(client.find_router(
parsed_args.router, ignore_missing=False), port_id=port.id)
@ -349,7 +349,7 @@ class RemoveSubnetFromRouter(command.Command):
client = self.app.client_manager.network
subnet = client.find_subnet(parsed_args.subnet,
ignore_missing=False)
client.router_remove_interface(
client.remove_interface_from_router(
client.find_router(parsed_args.router,
ignore_missing=False),
subnet_id=subnet.id)

19
openstackclient/tests/unit/network/v2/test_router.py
View File

@ -40,7 +40,7 @@ class TestAddPortToRouter(TestRouter):
def setUp(self):
super(TestAddPortToRouter, self).setUp()
self.network.router_add_interface = mock.Mock()
self.network.add_interface_to_router = mock.Mock()
self.cmd = router.AddPortToRouter(self.app, self.namespace)
self.network.find_router = mock.Mock(return_value=self._router)
self.network.find_port = mock.Mock(return_value=self._port)
@ -65,9 +65,8 @@ class TestAddPortToRouter(TestRouter):
result = self.cmd.take_action(parsed_args)
self.network.router_add_interface.assert_called_with(self._router, **{
'port_id': self._router.port,
})
self.network.add_interface_to_router.assert_called_with(
self._router, **{'port_id': self._router.port, })
self.assertIsNone(result)
@ -80,7 +79,7 @@ class TestAddSubnetToRouter(TestRouter):
def setUp(self):
super(TestAddSubnetToRouter, self).setUp()
self.network.router_add_interface = mock.Mock()
self.network.add_interface_to_router = mock.Mock()
self.cmd = router.AddSubnetToRouter(self.app, self.namespace)
self.network.find_router = mock.Mock(return_value=self._router)
self.network.find_subnet = mock.Mock(return_value=self._subnet)
@ -104,7 +103,7 @@ class TestAddSubnetToRouter(TestRouter):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args)
self.network.router_add_interface.assert_called_with(
self.network.add_interface_to_router.assert_called_with(
self._router, **{'subnet_id': self._router.subnet})
self.assertIsNone(result)
@ -411,7 +410,7 @@ class TestRemovePortFromRouter(TestRouter):
def setUp(self):
super(TestRemovePortFromRouter, self).setUp()
self.network.router_remove_interface = mock.Mock()
self.network.remove_interface_from_router = mock.Mock()
self.cmd = router.RemovePortFromRouter(self.app, self.namespace)
self.network.find_router = mock.Mock(return_value=self._router)
self.network.find_port = mock.Mock(return_value=self._port)
@ -436,7 +435,7 @@ class TestRemovePortFromRouter(TestRouter):
result = self.cmd.take_action(parsed_args)
self.network.router_remove_interface.assert_called_with(
self.network.remove_interface_from_router.assert_called_with(
self._router, **{'port_id': self._router.port})
self.assertIsNone(result)
@ -450,7 +449,7 @@ class TestRemoveSubnetFromRouter(TestRouter):
def setUp(self):
super(TestRemoveSubnetFromRouter, self).setUp()
self.network.router_remove_interface = mock.Mock()
self.network.remove_interface_from_router = mock.Mock()
self.cmd = router.RemoveSubnetFromRouter(self.app, self.namespace)
self.network.find_router = mock.Mock(return_value=self._router)
self.network.find_subnet = mock.Mock(return_value=self._subnet)
@ -474,7 +473,7 @@ class TestRemoveSubnetFromRouter(TestRouter):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args)
self.network.router_remove_interface.assert_called_with(
self.network.remove_interface_from_router.assert_called_with(
self._router, **{'subnet_id': self._router.subnet})
self.assertIsNone(result)