openstack
/
kolla-cli
Code Issues Proposed changes

Merge "Add kolla args check for control plane action"

This commit is contained in:
Zuul 2019-09-05 16:25:00 +00:00 committed by Gerrit Code Review
parent acbbd130c6 cef5e35aca
commit ea2da49ca5
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kolla_cli/api/control_plane.py
View File

@ -52,9 +52,12 @@ class ControlPlaneApi(object):
check_arg(verbose_level, u._('Verbose level'), int)
check_arg(servicenames, u._('Service names'), list,
empty_ok=True, none_ok=True)
check_kolla_args(hostnames=hostnames,
servicenames=servicenames)
hostnames = safe_decode(hostnames)
servicenames = safe_decode(servicenames)
action = KollaAction(verbose_level=verbose_level,
playbook_name='site.yml')
ansible_job = action.deploy(hostnames, serial_flag, servicenames)
@ -83,6 +86,9 @@ class ControlPlaneApi(object):
check_arg(servicenames, u._('Service names'), list,
empty_ok=True, none_ok=True)
check_kolla_args(hostnames=hostnames,
servicenames=servicenames)
hostnames = safe_decode(hostnames)
servicenames = safe_decode(servicenames)
action = KollaAction(verbose_level=verbose_level,
@ -138,6 +144,8 @@ class ControlPlaneApi(object):
empty_ok=True, none_ok=True)
check_arg(verbose_level, u._('Verbose level'), int)
check_kolla_args(hostnames=hostnames)
hostnames = safe_decode(hostnames)
action = KollaAction(verbose_level=verbose_level,
@ -166,6 +174,8 @@ class ControlPlaneApi(object):
check_arg(servicenames, u._('Service names'), list,
empty_ok=True, none_ok=True)
check_kolla_args(servicenames=servicenames)
servicenames = safe_decode(servicenames)
action = KollaAction(verbose_level=verbose_level,
playbook_name='site.yml')
@ -195,6 +205,9 @@ class ControlPlaneApi(object):
check_arg(servicenames, u._('Service names'), list,
empty_ok=True, none_ok=True)
check_kolla_args(hostnames=hostnames,
servicenames=servicenames)
hostnames = safe_decode(hostnames)
servicenames = safe_decode(servicenames)
action = KollaAction(verbose_level=verbose_level,
@ -215,6 +228,8 @@ class ControlPlaneApi(object):
check_arg(servicenames, u._('Service names'), list,
empty_ok=True, none_ok=True)
check_kolla_args(servicenames=servicenames)
servicenames = safe_decode(servicenames)
action = KollaAction(verbose_level=verbose_level,
playbook_name='site.yml')
@ -260,6 +275,10 @@ class ControlPlaneApi(object):
check_arg(verbose_level, u._('Verbose level'), int)
check_arg(servicenames, u._('Service names'), list,
empty_ok=True, none_ok=True)
check_kolla_args(hostnames=hostnames,
servicenames=servicenames)
hostnames = safe_decode(hostnames)
servicenames = safe_decode(servicenames)