openstack/python-zunclient
Code Issues Proposed changes

Wait for the container to create

Browse Source 
Bug #1810004

Change-Id: Ia1d48c9ff82a25fbbf833d11620469fa6b01b830
This commit is contained in:
Feng Shengqin
2019-01-15 17:00:47 +08:00
parent b328c351ba
commit 8c6b42b204
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
zunclient/osc/v1/containers.py
View File

@@ -206,6 +206,10 @@ class CreateContainer(command.ShowOne):
'retries: Consecutive failures needed to report unhealthy.' 'retries: Consecutive failures needed to report unhealthy.'
'timeout: Maximum time to allow one check to run (s|m|h)' 'timeout: Maximum time to allow one check to run (s|m|h)'
' (default 0s).') ' (default 0s).')
parser.add_argument(
'--wait',
action='store_true',
help='Wait for create to complete')
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@@ -249,6 +253,18 @@ class CreateContainer(command.ShowOne):
opts = zun_utils.remove_null_parms(**opts) opts = zun_utils.remove_null_parms(**opts)
container = client.containers.create(**opts) container = client.containers.create(**opts)
if parsed_args.wait:
container_uuid = getattr(container, 'uuid', None)
if utils.wait_for_status(
client.containers.get,
container_uuid,
success_status=['created'],
):
container = client.containers.get(container_uuid)
print('Complete to create container.\n')
else:
print('Failed to create container.\n')
raise SystemExit
columns = _container_columns(container) columns = _container_columns(container)
return columns, utils.get_item_properties(container, columns) return columns, utils.get_item_properties(container, columns)
@@ -860,6 +876,10 @@ class RunContainer(command.ShowOne):
'retries: Consecutive failures needed to report unhealthy.' 'retries: Consecutive failures needed to report unhealthy.'
'timeout: Maximum time to allow one check to run (s|m|h)' 'timeout: Maximum time to allow one check to run (s|m|h)'
' (default 0s).') ' (default 0s).')
parser.add_argument(
'--wait',
action='store_true',
help='Wait for run to complete')
return parser return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
@@ -905,6 +925,18 @@ class RunContainer(command.ShowOne):
container = client.containers.run(**opts) container = client.containers.run(**opts)
columns = _container_columns(container) columns = _container_columns(container)
container_uuid = getattr(container, 'uuid', None) container_uuid = getattr(container, 'uuid', None)
if parsed_args.wait:
if utils.wait_for_status(
client.containers.get,
container_uuid,
success_status=['running'],
):
container = client.containers.get(container_uuid)
print('Complete to run container.\n')
else:
print('Failed to run container.\n')
raise SystemExit
if parsed_args.interactive: if parsed_args.interactive:
ready_for_attach = False ready_for_attach = False
while True: while True: