Merge "Fix Trivial Changes in [1]"

Jenkins · openstack-gerrit · commit 2fdd4ff2f6e2 · 2017-03-21T08:29:27.000Z
diff --git a/doc/source/command-objects/network-agent.rst b/doc/source/command-objects/network-agent.rst
@@ -25,15 +25,15 @@ Add network to an agent
 
 .. describe:: --dhcp
 
-    Add a network to DHCP agent.
+    Add a network to DHCP agent
 
 .. describe:: <agent-id>
 
-    Agent to which a network is added. (ID only)
+    Agent to which a network is added (ID only)
 
 .. describe:: <network>
 
-    Network to be added to an agent. (ID or name)
+    Network to be added to an agent (ID or name)
 
 network agent delete
 --------------------
@@ -77,7 +77,7 @@ List network agents
 
 .. option:: --network <network>
 
-    List agents hosting a network. (ID or name)
+    List agents hosting a network (ID or name)
 
 network agent set
 -----------------
@@ -144,8 +144,8 @@ Remove network from an agent
 
 .. describe:: <agent-id>
 
-    Agent to which a network is removed. (ID only)
+    Agent to which a network is removed (ID only)
 
 .. describe:: <network>
 
-    Network to be removed from an agent. (ID or name)
+    Network to be removed from an agent (ID or name)
diff --git a/openstackclient/network/v2/network_agent.py b/openstackclient/network/v2/network_agent.py
@@ -56,20 +56,20 @@ def get_parser(self, prog_name):
         parser.add_argument(
             'agent_id',
             metavar='<agent-id>',
-            help=_('Agent to which a network is added. (ID only)'))
+            help=_('Agent to which a network is added (ID only)'))
         parser.add_argument(
             'network',
             metavar='<network>',
-            help=_('Network to be added to an agent.  (ID or name)'))
+            help=_('Network to be added to an agent (ID or name)'))
 
         return parser
 
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
         agent = client.get_agent(parsed_args.agent_id)
+        network = client.find_network(
+            parsed_args.network, ignore_missing=False)
         if parsed_args.dhcp:
-            network = client.find_network(
-                parsed_args.network, ignore_missing=False)
             try:
                 client.add_dhcp_agent_to_network(agent, network)
             except Exception:
@@ -225,19 +225,19 @@ def get_parser(self, prog_name):
         parser.add_argument(
             'agent_id',
             metavar='<agent-id>',
-            help=_('Agent to which a network is removed. (ID only)'))
+            help=_('Agent to which a network is removed (ID only)'))
         parser.add_argument(
             'network',
             metavar='<network>',
-            help=_('Network to be removed from an agent. (ID or name)'))
+            help=_('Network to be removed from an agent (ID or name)'))
         return parser
 
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
         agent = client.get_agent(parsed_args.agent_id)
+        network = client.find_network(
+            parsed_args.network, ignore_missing=False)
         if parsed_args.dhcp:
-            network = client.find_network(
-                parsed_args.network, ignore_missing=False)
             try:
                 client.remove_dhcp_agent_from_network(agent, network)
             except Exception:
