Merge "Fix metavars and typos in local_ip"

Zuul · openstack-gerrit · commit 91a963873f63 · 2022-03-09T13:44:26.000Z
diff --git a/openstackclient/network/v2/local_ip.py b/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")
         )
diff --git a/openstackclient/network/v2/local_ip_association.py b/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(
diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/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
     """

Original file line number	Diff line number	Diff line change
`@@ -87,17 +87,17 @@ def get_parser(self, prog_name):`
`87`	`87`	`)`
`88`	`88`	`parser.add_argument(`
`89`	`89`	`'--local-port',`
`90`		`- metavar='<local_port>',`
	`90`	`+ metavar='<local-port>',`
`91`	`91`	`help=_("Port to allocate Local IP (name or ID)")`
`92`	`92`	`)`
`93`	`93`	`parser.add_argument(`
`94`	`94`	`"--local-ip-address",`
`95`		`- metavar="<local_ip_address>",`
	`95`	`+ metavar="<local-ip-address>",`
`96`	`96`	`help=_("IP address or CIDR "),`
`97`	`97`	`)`
`98`	`98`	`parser.add_argument(`
`99`	`99`	`'--ip-mode',`
`100`		`- metavar='<ip_mode>',`
	`100`	`+ metavar='<ip-mode>',`
`101`	`101`	`help=_("local IP ip mode")`
`102`	`102`	`)`
`103`	`103`
`@@ -212,13 +212,13 @@ def get_parser(self, prog_name):`
`212`	`212`	`)`
`213`	`213`	`parser.add_argument(`
`214`	`214`	`'--local-port',`
`215`		`- metavar='<local_port>',`
	`215`	`+ metavar='<local-port>',`
`216`	`216`	`help=_("List Local IP(s) according to "`
`217`	`217`	`"given port (name or ID)")`
`218`	`218`	`)`
`219`	`219`	`parser.add_argument(`
`220`	`220`	`'--local-ip-address',`
`221`		`- metavar='<local_ip_address>',`
	`221`	`+ metavar='<local-ip-address>',`
`222`	`222`	`help=_("List Local IP(s) according to "`
`223`	`223`	`"given Local IP Address")`
`224`	`224`	`)`