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

1 files changed, 1 insertions, 2 deletions

diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 48a3a92c..64bb8819 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -520,12 +520,11 @@ class UnsetRouter(command.Command):
         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)