Add Subnet add/remove support to router

The following patch adds the support for
"router add subnet" and "router remove subnet"
to the OSC as a part of migration of Neutron's
CLI commands.

Partial-Bug: #1546849
Implements: blueprint neutron-client-advanced-router
Change-Id: Ia3770c41026194bdb1543d4e67446f81936d44d1

1 files changed, 79 insertions, 0 deletions

diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py
index 40941fbc..8de4b3b2 100644
--- a/openstackclient/tests/network/v2/test_router.py
+++ b/openstackclient/tests/network/v2/test_router.py
@@ -70,6 +70,46 @@ class TestAddPortToRouter(TestRouter):
         self.assertIsNone(result)
 
 
+class TestAddSubnetToRouter(TestRouter):
+    '''Add subnet to Router '''
+
+    _subnet = network_fakes.FakeSubnet.create_one_subnet()
+    _router = network_fakes.FakeRouter.create_one_router(
+        attrs={'subnet': _subnet.id})
+
+    def setUp(self):
+        super(TestAddSubnetToRouter, self).setUp()
+        self.network.router_add_interface = 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)
+
+    def test_add_subnet_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_add_subnet_required_options(self):
+        arglist = [
+            self._router.id,
+            self._router.subnet,
+        ]
+        verifylist = [
+            ('router', self._router.id),
+            ('subnet', self._router.subnet),
+        ]
+        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._router, **{'subnet_id': self._router.subnet})
+
+        self.assertIsNone(result)
+
+
 class TestCreateRouter(TestRouter):
 
     # The new router created.
@@ -309,6 +349,45 @@ class TestRemovePortFromRouter(TestRouter):
         self.assertIsNone(result)
 
 
+class TestRemoveSubnetFromRouter(TestRouter):
+    '''Remove subnet from Router '''
+
+    _subnet = network_fakes.FakeSubnet.create_one_subnet()
+    _router = network_fakes.FakeRouter.create_one_router(
+        attrs={'subnet': _subnet.id})
+
+    def setUp(self):
+        super(TestRemoveSubnetFromRouter, self).setUp()
+        self.network.router_remove_interface = 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)
+
+    def test_remove_subnet_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_subnet_required_options(self):
+        arglist = [
+            self._router.id,
+            self._router.subnet,
+        ]
+        verifylist = [
+            ('subnet', self._router.subnet),
+            ('router', self._router.id),
+        ]
+        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, **{'subnet_id': self._router.subnet})
+        self.assertIsNone(result)
+
+
 class TestSetRouter(TestRouter):
 
     # The router to set.