Merge "Fix metavars and typos in local_ip"

Author: Zuul

openstackclient/network/v2/local_ip.py

@@ -87,17 +87,17 @@ def get_parser(self, prog_name):
         )
         parser.add_argument(
             '--local-port',
-            metavar='<local_port>',
+            metavar='<local-port>',
             help=_("Port to allocate Local IP (name or ID)")
         )
         parser.add_argument(
             "--local-ip-address",
-            metavar="<local_ip_address>",
+            metavar="<local-ip-address>",
             help=_("IP address or CIDR "),
         )
         parser.add_argument(
             '--ip-mode',
-            metavar='<ip_mode>',
+            metavar='<ip-mode>',
             help=_("local IP ip mode")
         )
 
@@ -212,13 +212,13 @@ def get_parser(self, prog_name):
         )
         parser.add_argument(
             '--local-port',
-            metavar='<local_port>',
+            metavar='<local-port>',
             help=_("List Local IP(s) according to "
                    "given port (name or ID)")
         )
         parser.add_argument(
             '--local-ip-address',
-            metavar='<local_ip_address>',
+            metavar='<local-ip-address>',
             help=_("List Local IP(s) according to "
                    "given Local IP Address")
         )

openstackclient/network/v2/local_ip_association.py

@@ -43,16 +43,16 @@ def get_parser(self, prog_name):
             'local_ip',
             metavar='<local-ip>',
             help=_("Local IP that the port association belongs to "
-                   "(IP address or ID)")
+                   "(Name or ID)")
         )
         parser.add_argument(
             'fixed_port',
-            metavar='<fixed_port>',
+            metavar='<fixed-port>',
             help=_("The ID or Name of Port to allocate Local IP Association")
         )
         parser.add_argument(
             '--fixed-ip',
-            metavar='<fixed_ip>',
+            metavar='<fixed-ip>',
             help=_("Fixed IP for Local IP Association")
         )
 
@@ -87,14 +87,14 @@ def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         parser.add_argument(
             'local_ip',
-            metavar="<local_ip>",
+            metavar="<local-ip>",
             help=_("Local IP that the port association belongs to "
-                   "(IP address or ID)")
+                   "(Name or ID)")
         )
         parser.add_argument(
             'fixed_port_id',
             nargs="+",
-            metavar="<fixed_port_id>",
+            metavar="<fixed-port-id>",
             help=_("The fixed port ID of Local IP Association")
         )
         return parser
@@ -136,18 +136,18 @@ def get_parser(self, prog_name):
 
         parser.add_argument(
             'local_ip',
-            metavar='<local_ip>',
+            metavar='<local-ip>',
             help=_("Local IP that port associations belongs to")
         )
         parser.add_argument(
             '--fixed-port',
-            metavar='<fixed_port>',
+            metavar='<fixed-port>',
             help=_("Filter the list result by the ID or name of "
                    "the fixed port")
         )
         parser.add_argument(
             '--fixed-ip',
-            metavar='<fixed_ip>',
+            metavar='<fixed-ip>',
             help=_("Filter the list result by fixed ip")
         )
         parser.add_argument(

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

@@ -2142,7 +2142,7 @@ def create_local_ip_associations(attrs=None, count=2):
     :param Dictionary attrs:
         A dictionary with all attributes
     :param int count:
-        The number of address groups to fake
+        The number of local ip associations to fake
     :return:
         A list of FakeResource objects faking the local ip associations
     """