openstack
/
python-zunclient
Code Issues Proposed changes

Handle entrypoint is None 

Change-Id: Ic6eb27cb018eec6d476fbbe17f29ac020ce83b71
Closes-Bug: #1872130
(cherry picked from commit 75d2d10a81)
This commit is contained in:
Hongbin Lu 2020-04-10 19:46:36 +00:00
parent 54dbd8be4f
commit d26adc61c0
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,7 +243,9 @@ class CreateContainer(command.ShowOne):
opts['command'] = parsed_args.command
opts['registry'] = parsed_args.registry
opts['host'] = parsed_args.host
opts['entrypoint'] = zun_utils.parse_entrypoint(parsed_args.entrypoint)
if parsed_args.entrypoint:
opts['entrypoint'] = zun_utils.parse_entrypoint(
parsed_args.entrypoint)
if parsed_args.security_group:
opts['security_groups'] = parsed_args.security_group
if parsed_args.expose_port:
@ -946,7 +948,9 @@ class RunContainer(command.ShowOne):
opts['command'] = parsed_args.command
opts['registry'] = parsed_args.registry
opts['host'] = parsed_args.host
opts['entrypoint'] = zun_utils.parse_entrypoint(parsed_args.entrypoint)
if parsed_args.entrypoint:
opts['entrypoint'] = zun_utils.parse_entrypoint(
parsed_args.entrypoint)
if parsed_args.security_group:
opts['security_groups'] = parsed_args.security_group
if parsed_args.expose_port:

1
zunclient/tests/unit/v1/test_containers_shell.py
View File

@ -28,7 +28,6 @@ def _get_container_args(**kwargs):
'mounts': [],
'nets': [],
'command': [],
'entrypoint': [],
}
default_args.update(kwargs)
return default_args

6
zunclient/v1/containers_shell.py
View File

@ -215,7 +215,8 @@ def do_create(cs, args):
opts['command'] = args.command
opts['registry'] = args.registry
opts['host'] = args.host
opts['entrypoint'] = zun_utils.parse_entrypoint(args.entrypoint)
if args.entrypoint:
opts['entrypoint'] = zun_utils.parse_entrypoint(args.entrypoint)
if args.healthcheck:
opts['healthcheck'] = zun_utils.parse_health(args.healthcheck)
@ -749,7 +750,8 @@ def do_run(cs, args):
opts['command'] = args.command
opts['registry'] = args.registry
opts['host'] = args.host
opts['entrypoint'] = zun_utils.parse_entrypoint(args.entrypoint)
if args.entrypoint:
opts['entrypoint'] = zun_utils.parse_entrypoint(args.entrypoint)
if args.healthcheck:
opts['healthcheck'] = zun_utils.parse_health(args.healthcheck)