From 32a5084b3db882ebc78e4846e12a8e715040c81b Mon Sep 17 00:00:00 2001
From: Veronica Musso <veronica.a.musso@intel.com>
Date: Thu, 29 May 2014 16:42:03 -0300
Subject: [PATCH] Change help for --poll option in Nova commands
This patch clarifies the help about --poll option in these nova commands:
image-create, boot, migrate, resize, rebuild and reboot
Change-Id: Ia877fe5d07f2e9e60104f117c4a6032b6c419282
Closes-bug: #1312747
---
novaclient/v1_1/shell.py | 13 +++++++------
novaclient/v3/shell.py | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
index 6f987b8cf..6e3137ccf 100644
--- a/novaclient/v1_1/shell.py
+++ b/novaclient/v1_1/shell.py
@@ -444,7 +444,7 @@ def _boot(cs, args):
dest='poll',
action="store_true",
default=False,
- help=_('Blocks while server builds so progress can be reported.'))
+ help=_('Report the new server boot progress until it completes.'))
def do_boot(cs, args):
"""Boot a new server."""
boot_args, boot_kwargs = _boot(cs, args)
@@ -1194,7 +1194,7 @@ def do_list(cs, args):
dest='poll',
action="store_true",
default=False,
- help=_('Blocks while server is rebooting.'))
+ help=_('Poll until reboot is complete.'))
def do_reboot(cs, args):
"""Reboot a server."""
server = _find_server(cs, args.server)
@@ -1218,7 +1218,7 @@ def do_reboot(cs, args):
dest='poll',
action="store_true",
default=False,
- help=_('Blocks while server rebuilds so progress can be reported.'))
+ help=_('Report the server rebuild progress until it completes.'))
@utils.arg('--minimal',
dest='minimal',
action="store_true",
@@ -1261,7 +1261,7 @@ def do_rename(cs, args):
dest='poll',
action="store_true",
default=False,
- help=_('Blocks while servers resizes so progress can be reported.'))
+ help=_('Report the server resize progress until it completes.'))
def do_resize(cs, args):
"""Resize a server."""
server = _find_server(cs, args.server)
@@ -1290,7 +1290,7 @@ def do_resize_revert(cs, args):
dest='poll',
action="store_true",
default=False,
- help=_('Blocks while server migrates so progress can be reported.'))
+ help=_('Report the server migration progress until it completes.'))
def do_migrate(cs, args):
"""Migrate a server. The new host will be selected by the scheduler."""
server = _find_server(cs, args.server)
@@ -1422,7 +1422,8 @@ def do_root_password(cs, args):
dest='poll',
action="store_true",
default=False,
- help=_('Blocks while server snapshots so progress can be reported.'))
+ help=_('Report the snapshot progress and poll until image creation is '
+ 'complete.'))
def do_image_create(cs, args):
"""Create a new image by taking a snapshot of a running server."""
server = _find_server(cs, args.server)
diff --git a/novaclient/v3/shell.py b/novaclient/v3/shell.py
index 9ad52d16b..ef2bf777e 100644
--- a/novaclient/v3/shell.py
+++ b/novaclient/v3/shell.py
@@ -320,7 +320,7 @@ def _boot(cs, args):
dest='poll',
action="store_true",
default=False,
- help='Blocks while server builds so progress can be reported.')
+ help='Report the new server boot progress until it completes.')
def do_boot(cs, args):
"""Boot a new server."""
boot_args, boot_kwargs = _boot(cs, args)
@@ -1046,7 +1046,7 @@ def do_list(cs, args):
dest='poll',
action="store_true",
default=False,
- help='Blocks while server is rebooting.')
+ help='Poll until reboot is complete.')
def do_reboot(cs, args):
"""Reboot a server."""
server = _find_server(cs, args.server)
@@ -1070,7 +1070,7 @@ def do_reboot(cs, args):
dest='poll',
action="store_true",
default=False,
- help='Blocks while server rebuilds so progress can be reported.')
+ help='Report the server rebuild progress until it completes.')
@utils.arg('--minimal',
dest='minimal',
action="store_true",
@@ -1108,7 +1108,7 @@ def do_rename(cs, args):
dest='poll',
action="store_true",
default=False,
- help='Blocks while server resizes so progress can be reported.')
+ help='Report the server resize progress until it completes.')
def do_resize(cs, args):
"""Resize a server."""
server = _find_server(cs, args.server)
@@ -1137,7 +1137,7 @@ def do_resize_revert(cs, args):
dest='poll',
action="store_true",
default=False,
- help='Blocks while server migrates so progress can be reported.')
+ help='Report the server migration progress until it completes.')
def do_migrate(cs, args):
"""Migrate a server. The new host will be selected by the scheduler."""
server = _find_server(cs, args.server)
@@ -1241,7 +1241,8 @@ def do_root_password(cs, args):
dest='poll',
action="store_true",
default=False,
- help='Blocks while server snapshots so progress can be reported.')
+ help='Report the snapshot progress and poll until image creation is '
+ 'complete.')
def do_image_create(cs, args):
"""Create a new image by taking a snapshot of a running server."""
server = _find_server(cs, args.server)