Merge "Fix errant underscores"

Jenkins · openstack-gerrit · commit b00bbaa062e9 · 2014-01-10T17:27:48.000Z
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
@@ -48,9 +48,9 @@ def get_parser(self, prog_name):
             help="Name of image",
         )
         parser.add_argument(
-            "--disk_format",
+            "--disk-format",
             default="raw",
-            metavar="<disk_format>",
+            metavar="<disk-format>",
             help="Disk format of image",
         )
         parser.add_argument(
@@ -66,7 +66,7 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "--container-format",
             default="bare",
-            metavar="<container_format>",
+            metavar="<container-format>",
             help="Container format of image",
         )
         parser.add_argument(
@@ -82,17 +82,17 @@ def get_parser(self, prog_name):
         )
         parser.add_argument(
             "--min-disk",
-            metavar="<disk_gb>",
+            metavar="<disk-gb>",
             help="Minimum size of disk needed to boot image in gigabytes",
         )
         parser.add_argument(
             "--min-ram",
-            metavar="<disk_ram>",
+            metavar="<disk-ram>",
             help="Minimum amount of ram needed to boot image in megabytes",
         )
         parser.add_argument(
             "--location",
-            metavar="<image_url>",
+            metavar="<image-url>",
             help="URL where the data for this image already resides",
         )
         parser.add_argument(
@@ -107,7 +107,7 @@ def get_parser(self, prog_name):
         )
         parser.add_argument(
             "--copy-from",
-            metavar="<image_url>",
+            metavar="<image-url>",
             help="Similar to --location, but this indicates that the image"
                  " should immediately be copied from the data store",
         )
@@ -301,12 +301,12 @@ def get_parser(self, prog_name):
         )
         parser.add_argument(
             "--min-disk",
-            metavar="<disk_gb>",
+            metavar="<disk-gb>",
             help="Minimum size of disk needed to boot image in gigabytes",
         )
         parser.add_argument(
             "--min-ram",
-            metavar="<disk_ram>",
+            metavar="<disk-ram>",
             help="Minimum amount of ram needed to boot image in megabytes",
         )
         parser.add_argument(

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ def get_parser(self, prog_name):`
`48`	`48`	`help="Name of image",`
`49`	`49`	`)`
`50`	`50`	`parser.add_argument(`
`51`		`- "--disk_format",`
	`51`	`+ "--disk-format",`
`52`	`52`	`default="raw",`
`53`		`- metavar="<disk_format>",`
	`53`	`+ metavar="<disk-format>",`
`54`	`54`	`help="Disk format of image",`
`55`	`55`	`)`
`56`	`56`	`parser.add_argument(`
`@@ -66,7 +66,7 @@ def get_parser(self, prog_name):`
`66`	`66`	`parser.add_argument(`
`67`	`67`	`"--container-format",`
`68`	`68`	`default="bare",`
`69`		`- metavar="<container_format>",`
	`69`	`+ metavar="<container-format>",`
`70`	`70`	`help="Container format of image",`
`71`	`71`	`)`
`72`	`72`	`parser.add_argument(`
`@@ -82,17 +82,17 @@ def get_parser(self, prog_name):`
`82`	`82`	`)`
`83`	`83`	`parser.add_argument(`
`84`	`84`	`"--min-disk",`
`85`		`- metavar="<disk_gb>",`
	`85`	`+ metavar="<disk-gb>",`
`86`	`86`	`help="Minimum size of disk needed to boot image in gigabytes",`
`87`	`87`	`)`
`88`	`88`	`parser.add_argument(`
`89`	`89`	`"--min-ram",`
`90`		`- metavar="<disk_ram>",`
	`90`	`+ metavar="<disk-ram>",`
`91`	`91`	`help="Minimum amount of ram needed to boot image in megabytes",`
`92`	`92`	`)`
`93`	`93`	`parser.add_argument(`
`94`	`94`	`"--location",`
`95`		`- metavar="<image_url>",`
	`95`	`+ metavar="<image-url>",`
`96`	`96`	`help="URL where the data for this image already resides",`
`97`	`97`	`)`
`98`	`98`	`parser.add_argument(`
`@@ -107,7 +107,7 @@ def get_parser(self, prog_name):`
`107`	`107`	`)`
`108`	`108`	`parser.add_argument(`
`109`	`109`	`"--copy-from",`
`110`		`- metavar="<image_url>",`
	`110`	`+ metavar="<image-url>",`
`111`	`111`	`help="Similar to --location, but this indicates that the image"`
`112`	`112`	`" should immediately be copied from the data store",`
`113`	`113`	`)`
`@@ -301,12 +301,12 @@ def get_parser(self, prog_name):`
`301`	`301`	`)`
`302`	`302`	`parser.add_argument(`
`303`	`303`	`"--min-disk",`
`304`		`- metavar="<disk_gb>",`
	`304`	`+ metavar="<disk-gb>",`
`305`	`305`	`help="Minimum size of disk needed to boot image in gigabytes",`
`306`	`306`	`)`
`307`	`307`	`parser.add_argument(`
`308`	`308`	`"--min-ram",`
`309`		`- metavar="<disk_ram>",`
	`309`	`+ metavar="<disk-ram>",`
`310`	`310`	`help="Minimum amount of ram needed to boot image in megabytes",`
`311`	`311`	`)`
`312`	`312`	`parser.add_argument(`