Merge "Add command: router add/remove route --route"

2 files changed, 183 insertions, 0 deletions

diff --git a/openstackclient/tests/functional/network/v2/test_router.py b/openstackclient/tests/functional/network/v2/test_router.py
index 05aad7a0..0769dca6 100644
--- a/openstackclient/tests/functional/network/v2/test_router.py
+++ b/openstackclient/tests/functional/network/v2/test_router.py
@@ -261,3 +261,46 @@ class RouterTests(common.NetworkTagTests):
             new_name
         ))
         self.assertIsNone(cmd_output["external_gateway_info"])
+
+    def test_router_add_remove_route(self):
+        network_name = uuid.uuid4().hex
+        subnet_name = uuid.uuid4().hex
+        router_name = uuid.uuid4().hex
+
+        self.openstack('network create %s' % network_name)
+        self.addCleanup(self.openstack, 'network delete %s' % network_name)
+
+        self.openstack(
+            'subnet create %s '
+            '--network %s --subnet-range 10.0.0.0/24' % (
+                subnet_name, network_name))
+
+        self.openstack('router create %s' % router_name)
+        self.addCleanup(self.openstack, 'router delete %s' % router_name)
+
+        self.openstack('router add subnet %s %s' % (router_name, subnet_name))
+        self.addCleanup(self.openstack, 'router remove subnet %s %s' % (
+            router_name, subnet_name))
+
+        out1 = json.loads(self.openstack(
+            'router add route -f json %s '
+            '--route destination=10.0.10.0/24,gateway=10.0.0.10' %
+            router_name)),
+        self.assertEqual(1, len(out1[0]['routes']))
+
+        self.addCleanup(
+            self.openstack, 'router set %s --no-route' % router_name)
+
+        out2 = json.loads(self.openstack(
+            'router add route -f json %s '
+            '--route destination=10.0.10.0/24,gateway=10.0.0.10 '
+            '--route destination=10.0.11.0/24,gateway=10.0.0.11' %
+            router_name)),
+        self.assertEqual(2, len(out2[0]['routes']))
+
+        out3 = json.loads(self.openstack(
+            'router remove route -f json %s '
+            '--route destination=10.0.11.0/24,gateway=10.0.0.11 '
+            '--route destination=10.0.12.0/24,gateway=10.0.0.12' %
+            router_name)),
+        self.assertEqual(1, len(out3[0]['routes']))
diff --git a/openstackclient/tests/unit/network/v2/test_router.py b/openstackclient/tests/unit/network/v2/test_router.py
index 38861b0a..09b4957c 100644
--- a/openstackclient/tests/unit/network/v2/test_router.py
+++ b/openstackclient/tests/unit/network/v2/test_router.py
@@ -776,6 +776,146 @@ class TestRemoveSubnetFromRouter(TestRouter):
         self.assertIsNone(result)
 
 
+class TestAddExtraRoutesToRouter(TestRouter):
+
+    _router = network_fakes.FakeRouter.create_one_router()
+
+    def setUp(self):
+        super(TestAddExtraRoutesToRouter, self).setUp()
+        self.network.add_extra_routes_to_router = mock.Mock(
+            return_value=self._router)
+        self.cmd = router.AddExtraRoutesToRouter(self.app, self.namespace)
+        self.network.find_router = mock.Mock(return_value=self._router)
+
+    def test_add_no_extra_route(self):
+        arglist = [
+            self._router.id,
+        ]
+        verifylist = [
+            ('router', self._router.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.network.add_extra_routes_to_router.assert_called_with(
+            self._router, body={'router': {'routes': []}})
+        self.assertEqual(2, len(result))
+
+    def test_add_one_extra_route(self):
+        arglist = [
+            self._router.id,
+            '--route', 'destination=dst1,gateway=gw1',
+        ]
+        verifylist = [
+            ('router', self._router.id),
+            ('routes', [{'destination': 'dst1', 'gateway': 'gw1'}]),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.network.add_extra_routes_to_router.assert_called_with(
+            self._router, body={'router': {'routes': [
+                {'destination': 'dst1', 'nexthop': 'gw1'},
+            ]}})
+        self.assertEqual(2, len(result))
+
+    def test_add_multiple_extra_routes(self):
+        arglist = [
+            self._router.id,
+            '--route', 'destination=dst1,gateway=gw1',
+            '--route', 'destination=dst2,gateway=gw2',
+        ]
+        verifylist = [
+            ('router', self._router.id),
+            ('routes', [
+                {'destination': 'dst1', 'gateway': 'gw1'},
+                {'destination': 'dst2', 'gateway': 'gw2'},
+            ]),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.network.add_extra_routes_to_router.assert_called_with(
+            self._router, body={'router': {'routes': [
+                {'destination': 'dst1', 'nexthop': 'gw1'},
+                {'destination': 'dst2', 'nexthop': 'gw2'},
+            ]}})
+        self.assertEqual(2, len(result))
+
+
+class TestRemoveExtraRoutesFromRouter(TestRouter):
+
+    _router = network_fakes.FakeRouter.create_one_router()
+
+    def setUp(self):
+        super(TestRemoveExtraRoutesFromRouter, self).setUp()
+        self.network.remove_extra_routes_from_router = mock.Mock(
+            return_value=self._router)
+        self.cmd = router.RemoveExtraRoutesFromRouter(self.app, self.namespace)
+        self.network.find_router = mock.Mock(return_value=self._router)
+
+    def test_remove_no_extra_route(self):
+        arglist = [
+            self._router.id,
+        ]
+        verifylist = [
+            ('router', self._router.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.network.remove_extra_routes_from_router.assert_called_with(
+            self._router, body={'router': {'routes': []}})
+        self.assertEqual(2, len(result))
+
+    def test_remove_one_extra_route(self):
+        arglist = [
+            self._router.id,
+            '--route', 'destination=dst1,gateway=gw1',
+        ]
+        verifylist = [
+            ('router', self._router.id),
+            ('routes', [{'destination': 'dst1', 'gateway': 'gw1'}]),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.network.remove_extra_routes_from_router.assert_called_with(
+            self._router, body={'router': {'routes': [
+                {'destination': 'dst1', 'nexthop': 'gw1'},
+            ]}})
+        self.assertEqual(2, len(result))
+
+    def test_remove_multiple_extra_routes(self):
+        arglist = [
+            self._router.id,
+            '--route', 'destination=dst1,gateway=gw1',
+            '--route', 'destination=dst2,gateway=gw2',
+        ]
+        verifylist = [
+            ('router', self._router.id),
+            ('routes', [
+                {'destination': 'dst1', 'gateway': 'gw1'},
+                {'destination': 'dst2', 'gateway': 'gw2'},
+            ]),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.network.remove_extra_routes_from_router.assert_called_with(
+            self._router, body={'router': {'routes': [
+                {'destination': 'dst1', 'nexthop': 'gw1'},
+                {'destination': 'dst2', 'nexthop': 'gw2'},
+            ]}})
+        self.assertEqual(2, len(result))
+
+
 class TestSetRouter(TestRouter):
 
     # The router to set.