Merge "Add "router remove port" to osc"

5 files changed, 95 insertions, 1 deletions

diff --git a/doc/source/command-objects/router.rst b/doc/source/command-objects/router.rst
index 9d094d37..d4e3f4a5 100644
--- a/doc/source/command-objects/router.rst
+++ b/doc/source/command-objects/router.rst
@@ -6,6 +6,7 @@ Network v2
 
 router add port
 ---------------
+
 Add a port to a router
 
 .. program:: router add port
@@ -102,6 +103,29 @@ List routers
 
     List additional fields in output
 
+router remove port
+------------------
+
+Remove a port from a router
+
+.. program:: router remove port
+.. code:: bash
+
+    os router remove port
+        <router>
+        <port>
+
+.. _router_remove_port:
+
+.. describe:: <router>
+
+    Router from which port will be removed (name or ID)
+
+.. describe:: <port>
+
+    Port to be removed (name or ID)
+
+
 router set
 ----------
 
@@ -167,4 +191,4 @@ Display router details
 .. _router_show-router:
 .. describe:: <router>
 
-    Router to display (name or ID)
\ No newline at end of file
+    Router to display (name or ID)
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 73075de0..cd0f0e4c 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -244,6 +244,30 @@ class ListRouter(command.Lister):
                 ) for s in data))
 
 
+class RemovePortFromRouter(command.Command):
+    """Remove a port from a router"""
+
+    def get_parser(self, prog_name):
+        parser = super(RemovePortFromRouter, self).get_parser(prog_name)
+        parser.add_argument(
+            'router',
+            metavar='<router>',
+            help="Router from which port will be removed (name or ID)",
+        )
+        parser.add_argument(
+            'port',
+            metavar='<port>',
+            help="Port to be removed (name or ID).",
+        )
+        return parser
+
+    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(
+            parsed_args.router, ignore_missing=False), port_id=port.id)
+
+
 class SetRouter(command.Command):
     """Set router properties"""
 
diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py
index 64796c56..5d3e80d7 100644
--- a/openstackclient/tests/network/v2/test_router.py
+++ b/openstackclient/tests/network/v2/test_router.py
@@ -267,6 +267,46 @@ class TestListRouter(TestRouter):
         self.assertEqual(self.data_long, list(data))
 
 
+class TestRemovePortFromRouter(TestRouter):
+    '''Remove port from a Router '''
+
+    _port = network_fakes.FakePort.create_one_port()
+    _router = network_fakes.FakeRouter.create_one_router(
+        attrs={'port': _port.id})
+
+    def setUp(self):
+        super(TestRemovePortFromRouter, self).setUp()
+        self.network.router_remove_interface = 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)
+
+    def test_remove_port_no_option(self):
+        arglist = []
+        verifylist = []
+
+        # Missing required args should bail here
+        self.assertRaises(tests_utils.ParserException, self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+    def test_remove_port_required_options(self):
+        arglist = [
+            self._router.id,
+            self._router.port,
+        ]
+        verifylist = [
+            ('router', self._router.id),
+            ('port', self._router.port),
+        ]
+        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._router, **{'port_id': self._router.port})
+        self.assertIsNone(result)
+
+
 class TestSetRouter(TestRouter):
 
     # The router to set.
diff --git a/releasenotes/notes/router-remove-port-058078c93819b0f4.yaml b/releasenotes/notes/router-remove-port-058078c93819b0f4.yaml
new file mode 100644
index 00000000..187026a7
--- /dev/null
+++ b/releasenotes/notes/router-remove-port-058078c93819b0f4.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add ``router remove port`` command
+    [Bug `1546849 <https://bugs.launchpad.net/bugs/1546849>`_]
diff --git a/setup.cfg b/setup.cfg
index c6035e2b..937f6272 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -342,6 +342,7 @@ openstack.network.v2 =
     router_create = openstackclient.network.v2.router:CreateRouter
     router_delete = openstackclient.network.v2.router:DeleteRouter
     router_list = openstackclient.network.v2.router:ListRouter
+    router_remove_port = openstackclient.network.v2.router:RemovePortFromRouter
     router_set = openstackclient.network.v2.router:SetRouter
     router_show = openstackclient.network.v2.router:ShowRouter