cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check argument choices according to type value

Browse source
This commit is contained in:
Hiroaki Nakamura 2016-06-30 01:59:37 +09:00
parent 61020a87dd
commit eb7488854b
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cloud/lxd/lxd_container.py
View file

@ -317,7 +317,6 @@ except ImportError:
# LXD_ANSIBLE_STATES is a map of states that contain values of methods used # LXD_ANSIBLE_STATES is a map of states that contain values of methods used
# when a particular state is evoked. # when a particular state is evoked.
LXD_ANSIBLE_STATES = { LXD_ANSIBLE_STATES = {
'present': '', # TODO: Separate state for profile
'started': '_started', 'started': '_started',
'stopped': '_stopped', 'stopped': '_stopped',
'restarted': '_restarted', 'restarted': '_restarted',
@ -325,6 +324,11 @@ LXD_ANSIBLE_STATES = {
'frozen': '_frozen' 'frozen': '_frozen'
} }
# PROFILE_STATES is a list for states supported for type=profiles
PROFILES_STATES = [
'present', 'absent'
]
# ANSIBLE_LXD_STATES is a map of states of lxd containers to the Ansible # ANSIBLE_LXD_STATES is a map of states of lxd containers to the Ansible
# lxc_container module state parameter value. # lxc_container module state parameter value.
ANSIBLE_LXD_STATES = { ANSIBLE_LXD_STATES = {
@ -361,8 +365,13 @@ class LxdContainerManagement(object):
self.name = self.module.params['name'] self.name = self.module.params['name']
self.type = self.module.params['type'] self.type = self.module.params['type']
self._build_config() self._build_config()
# TODO: check state value according to type
self.state = self.module.params['state'] self.state = self.module.params['state']
if self.type == 'container':
self._check_argument_choices('state', self.state, LXD_ANSIBLE_STATES.keys())
elif self.type == 'profile':
self._check_argument_choices('state', self.state, PROFILES_STATES)
self.new_name = self.module.params.get('new_name', None) self.new_name = self.module.params.get('new_name', None)
self.timeout = self.module.params['timeout'] self.timeout = self.module.params['timeout']
self.wait_for_ipv4_addresses = self.module.params['wait_for_ipv4_addresses'] self.wait_for_ipv4_addresses = self.module.params['wait_for_ipv4_addresses']
@ -383,6 +392,12 @@ class LxdContainerManagement(object):
self.logs = [] self.logs = []
self.actions = [] self.actions = []
def _check_argument_choices(self, name, value, choices):
if value not in choices:
choices_str=",".join([str(c) for c in choices])
msg="value of %s must be one of: %s, got: %s" % (name, choices_str, value)
self.module.fail_json(msg=msg)
def _build_config(self): def _build_config(self):
self.config = {} self.config = {}
for attr in CONFIG_PARAMS[self.type]: for attr in CONFIG_PARAMS[self.type]:
@ -767,7 +782,7 @@ def main():
type='dict', type='dict',
), ),
state=dict( state=dict(
choices=LXD_ANSIBLE_STATES.keys(), choices=list(set(LXD_ANSIBLE_STATES.keys()) | set(PROFILES_STATES)),
default='started' default='started'
), ),
timeout=dict( timeout=dict(