Fix router unset --route option

Fix the "--route" option one the "os route unset" command. The option
did not convert gateway to nexthop which results "Router does not contain
route" error.

Change-Id: Ia57bc7ea77ad7c6030535180a6ce42b4928c9e56
Closes-Bug: 1631471

Author: whitekid

openstackclient/network/v2/router.py

@@ -520,12 +520,11 @@ def take_action(self, parsed_args):
         if parsed_args.routes:
             try:
                 for route in parsed_args.routes:
+                    route['nexthop'] = route.pop('gateway')
                     tmp_routes.remove(route)
             except ValueError:
                 msg = (_("Router does not contain route %s") % route)
                 raise exceptions.CommandError(msg)
-            for route in tmp_routes:
-                route['nexthop'] = route.pop('gateway')
             attrs['routes'] = tmp_routes
         if attrs:
             client.update_router(obj, **attrs)

openstackclient/tests/unit/network/v2/test_router.py

@@ -773,9 +773,9 @@ def setUp(self):
         super(TestUnsetRouter, self).setUp()
         self._testrouter = network_fakes.FakeRouter.create_one_router(
             {'routes': [{"destination": "192.168.101.1/24",
-                         "gateway": "172.24.4.3"},
+                         "nexthop": "172.24.4.3"},
                         {"destination": "192.168.101.2/24",
-                         "gateway": "172.24.4.3"}], })
+                         "nexthop": "172.24.4.3"}], })
         self.fake_subnet = network_fakes.FakeSubnet.create_one_subnet()
         self.network.find_router = mock.Mock(return_value=self._testrouter)
         self.network.update_router = mock.Mock(return_value=None)