From 3c5824415f93b86d62b7d778d5bb52a23b961a40 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Mon, 17 Sep 2018 14:43:05 -0400
Subject: [PATCH] Fix some spaces in help messages

Fix some missing and not necessary trailing spaces in
the network v2 API files.  Also fixed one block indent
that was different from all its friends.

Trivialfix

Change-Id: Ic6491203c2fb9085543d69f0bb5f38e5a96039da
---
 openstackclient/network/v2/port.py   | 16 ++++++++--------
 openstackclient/network/v2/router.py |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 80fab14ffd..0d276d9da4 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -259,7 +259,7 @@ def _add_updatable_args(parser):
                  'normal', 'baremetal', 'virtio-forwarder'],
         help=_("VNIC type for this port (direct | direct-physical | "
                "macvtap | normal | baremetal | virtio-forwarder, "
-               " default: normal)")
+               "default: normal)")
     )
     # NOTE(dtroyer): --host-id is deprecated in Mar 2016.  Do not
     #                remove before 3.x release or Mar 2017.
@@ -669,7 +669,7 @@ class SetPort(command.Command):
         parser.add_argument(
             '--no-binding-profile',
             action='store_true',
-            help=_("Clear existing information of binding:profile."
+            help=_("Clear existing information of binding:profile. "
                    "Specify both --binding-profile and --no-binding-profile "
                    "to overwrite the current binding:profile information.")
         )
@@ -723,9 +723,9 @@ class SetPort(command.Command):
             '--no-allowed-address',
             dest='no_allowed_address_pair',
             action='store_true',
-            help=_("Clear existing allowed-address pairs associated"
-                   "with this port."
-                   "(Specify both --allowed-address and --no-allowed-address"
+            help=_("Clear existing allowed-address pairs associated "
+                   "with this port. "
+                   "(Specify both --allowed-address and --no-allowed-address "
                    "to overwrite the current allowed-address pairs)")
         )
         parser.add_argument(
@@ -843,7 +843,7 @@ class UnsetPort(command.Command):
             '--binding-profile',
             metavar='<binding-profile-key>',
             action='append',
-            help=_("Desired key which should be removed from binding:profile"
+            help=_("Desired key which should be removed from binding:profile "
                    "(repeat option to unset multiple binding:profile data)"))
         parser.add_argument(
             '--security-group',
@@ -867,8 +867,8 @@ class UnsetPort(command.Command):
             required_keys=['ip-address'],
             optional_keys=['mac-address'],
             help=_("Desired allowed-address pair which should be removed "
-                   "from this port: ip-address=<ip-address> "
-                   "[,mac-address=<mac-address>] (repeat option to set "
+                   "from this port: ip-address=<ip-address>"
+                   "[,mac-address=<mac-address>] (repeat option to unset "
                    "multiple allowed-address pairs)")
         )
         parser.add_argument(
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 187c241fc9..746452e40c 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -611,10 +611,10 @@ class SetRouter(command.Command):
         elif parsed_args.no_route or parsed_args.clear_routes:
             attrs['routes'] = []
         if (parsed_args.disable_snat or parsed_args.enable_snat or
-           parsed_args.fixed_ip) and not parsed_args.external_gateway:
-                msg = (_("You must specify '--external-gateway' in order"
-                         "to update the SNAT or fixed-ip values"))
-                raise exceptions.CommandError(msg)
+                parsed_args.fixed_ip) and not parsed_args.external_gateway:
+            msg = (_("You must specify '--external-gateway' in order "
+                     "to update the SNAT or fixed-ip values"))
+            raise exceptions.CommandError(msg)
         if parsed_args.external_gateway:
             gateway_info = {}
             network = client.find_network(