Merge "Change "ID only" to "name or ID" for backup commands"

Jenkins · openstack-gerrit · commit 1ce547103ae1 · 2016-06-28T08:24:03.000Z
diff --git a/doc/source/command-objects/backup.rst b/doc/source/command-objects/backup.rst
@@ -49,7 +49,7 @@ Delete backup(s)
 .. _backup_delete-backup:
 .. describe:: <backup>
 
-    Backup(s) to delete (ID only)
+    Backup(s) to delete (name or ID)
 
 backup list
 -----------
@@ -81,7 +81,7 @@ Restore backup
 .. _backup_restore-backup:
 .. describe:: <backup>
 
-    Backup to restore (ID only)
+    Backup to restore (name or ID)
 
 .. describe:: <volume>
 
@@ -101,4 +101,4 @@ Display backup details
 .. _backup_show-backup:
 .. describe:: <backup>
 
-    Backup to display (ID only)
+    Backup to display (name or ID)
diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py
@@ -76,7 +76,7 @@ def get_parser(self, prog_name):
             'backups',
             metavar='<backup>',
             nargs="+",
-            help=_('Backup(s) to delete (ID only)'),
+            help=_('Backup(s) to delete (name or ID)'),
         )
         return parser
 
@@ -150,7 +150,7 @@ def get_parser(self, prog_name):
         parser.add_argument(
             'backup',
             metavar='<backup>',
-            help=_('Backup to restore (ID only)')
+            help=_('Backup to restore (name or ID)')
         )
         parser.add_argument(
             'volume',
@@ -177,7 +177,7 @@ def get_parser(self, prog_name):
         parser.add_argument(
             'backup',
             metavar='<backup>',
-            help=_('Backup to display (ID only)')
+            help=_('Backup to display (name or ID)')
         )
         return parser
 
diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
@@ -147,7 +147,7 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "backup",
             metavar="<backup>",
-            help=_("Backup to restore (ID only)")
+            help=_("Backup to restore (name or ID)")
         )
         parser.add_argument(
             "volume",

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ def get_parser(self, prog_name):`
`147`	`147`	`parser.add_argument(`
`148`	`148`	`"backup",`
`149`	`149`	`metavar="<backup>",`
`150`		`- help=_("Backup to restore (ID only)")`
	`150`	`+ help=_("Backup to restore (name or ID)")`
`151`	`151`	`)`
`152`	`152`	`parser.add_argument(`
`153`	`153`	`"volume",`