mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 13:50:22 -07:00
Tidy up validate-modules:no-default-for-required-parameter and other cases (#1423)
* Fixed validate-modules:mutually_exclusive-unknown for plugins/modules/packaging/os/redhat_subscription.py * fixed validation-modules for plugins/modules/cloud/lxd/lxd_container.py * fixed validation-modules for plugins/modules/web_infrastructure/sophos_utm/utm_network_interface_address.py * fixed validation-modules for plugins/modules/cloud/opennebula/one_host.py * fixed validation-modules for plugins/modules/cloud/opennebula/one_image_info.py * fixed validation-modules for plugins/modules/cloud/opennebula/one_image.py * fixed validation-modules for plugins/modules/cloud/opennebula/one_service.py * fixed validation-modules for plugins/modules/cloud/opennebula/one_vm.py * fixed validation-modules for plugins/modules/net_tools/cloudflare_dns.py * fixed validation-modules for plugins/modules/net_tools/ip_netns.py * fixed validation-modules for plugins/modules/net_tools/ipinfoio_facts.py * fixed validation-modules for plugins/modules/net_tools/netcup_dns.py * fixed validation-modules for plugins/modules/remote_management/wakeonlan.py * added types to plugins/modules/remote_management/stacki/stacki_host.py but still cannot remove ignore line * added a couple of FIXME comments * fixed validation-modules for plugins/modules/remote_management/manageiq/manageiq_provider.py * fixed validation-modules for plugins/modules/notification/rocketchat.py * fixed validation-modules for plugins/modules/monitoring/bigpanda.py * fixed validation-modules for plugins/modules/identity/keycloak/keycloak_client.py * fixed validation-modules for plugins/modules/identity/keycloak/keycloak_clienttemplate.py * fixed validation-modules for plugins/modules/cloud/univention/udm_user.py * fixed validation-modules for plugins/modules/cloud/univention/udm_group.py * fixed validation-modules for plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py * fixed validation-modules for plugins/modules/cloud/smartos/imgadm.py * fixed validation-modules for plugins/modules/cloud/profitbricks/profitbricks_nic.py * fixed validation-modules for plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py * Tidy up validate-modules ignores no-default-for-required-parameter + couple of other cases * Added changelog frag * fixed validation-modules for plugins/modules/cloud/centurylink/clc_alert_policy.py * fixed validation-modules for plugins/modules/cloud/centurylink/clc_firewall_policy.py * fixed validation-modules for plugins/modules/cloud/lxd/lxd_profile.py * Typos and small fixes * fixed validation-modules for plugins/modules/net_tools/ldap/ldap_passwd.py * Typos and small fixes, part 2 * Fixes from PR comments * Update plugins/modules/cloud/profitbricks/profitbricks_nic.py Co-authored-by: Felix Fontein <felix@fontein.de> * Rolled back the mutually-exclusive-unknown in redhat_subscription * Update changelogs/fragments/1423-valmod_multiple_cases.yml Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Alexei Znamensky
GitHub
parent
b8794c35e8
commit
ae0d3cb090
34 changed files with 411 additions and 279 deletions
|
|
@ -17,13 +17,16 @@ options:
|
|||
description:
|
||||
- The datacenter in which to operate.
|
||||
type: str
|
||||
required: true
|
||||
server:
|
||||
description:
|
||||
- The server name or ID.
|
||||
type: str
|
||||
required: true
|
||||
name:
|
||||
description:
|
||||
- The name or ID of the NIC. This is only required on deletes, but not on create.
|
||||
- If not specified, it defaults to a value based on UUID4.
|
||||
type: str
|
||||
lan:
|
||||
description:
|
||||
|
|
@ -33,12 +36,12 @@ options:
|
|||
description:
|
||||
- The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable.
|
||||
type: str
|
||||
required: false
|
||||
required: true
|
||||
subscription_password:
|
||||
description:
|
||||
- THe ProfitBricks password. Overrides the PB_PASSWORD environment variable.
|
||||
type: str
|
||||
required: false
|
||||
required: true
|
||||
wait:
|
||||
description:
|
||||
- wait for the operation to complete before returning
|
||||
|
|
@ -97,6 +100,10 @@ uuid_match = re.compile(
|
|||
r'[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}', re.I)
|
||||
|
||||
|
||||
def _make_default_name():
|
||||
return str(uuid.uuid4()).replace('-', '')[:10]
|
||||
|
||||
|
||||
def _wait_for_completion(profitbricks, promise, wait_timeout, msg):
|
||||
if not promise:
|
||||
return
|
||||
|
|
@ -134,6 +141,8 @@ def create_nic(module, profitbricks):
|
|||
server = module.params.get('server')
|
||||
lan = module.params.get('lan')
|
||||
name = module.params.get('name')
|
||||
if name is None:
|
||||
name = _make_default_name()
|
||||
wait = module.params.get('wait')
|
||||
wait_timeout = module.params.get('wait_timeout')
|
||||
|
||||
|
|
@ -184,6 +193,8 @@ def delete_nic(module, profitbricks):
|
|||
datacenter = module.params.get('datacenter')
|
||||
server = module.params.get('server')
|
||||
name = module.params.get('name')
|
||||
if name is None:
|
||||
name = _make_default_name()
|
||||
|
||||
# Locate UUID for Datacenter
|
||||
if not (uuid_match.match(datacenter)):
|
||||
|
|
@ -230,30 +241,25 @@ def delete_nic(module, profitbricks):
|
|||
def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec=dict(
|
||||
datacenter=dict(),
|
||||
server=dict(),
|
||||
name=dict(default=str(uuid.uuid4()).replace('-', '')[:10]), # @FIXME please do not do that
|
||||
datacenter=dict(required=True),
|
||||
server=dict(required=True),
|
||||
name=dict(),
|
||||
lan=dict(),
|
||||
subscription_user=dict(),
|
||||
subscription_password=dict(no_log=True),
|
||||
subscription_user=dict(required=True),
|
||||
subscription_password=dict(required=True, no_log=True),
|
||||
wait=dict(type='bool', default=True),
|
||||
wait_timeout=dict(type='int', default=600),
|
||||
state=dict(default='present'),
|
||||
),
|
||||
required_if=(
|
||||
('state', 'absent', ['name']),
|
||||
('state', 'present', ['lan']),
|
||||
)
|
||||
)
|
||||
|
||||
if not HAS_PB_SDK:
|
||||
module.fail_json(msg='profitbricks required for this module')
|
||||
|
||||
if not module.params.get('subscription_user'): # @ FIXME use required in argument_spec, same for lines below
|
||||
module.fail_json(msg='subscription_user parameter is required')
|
||||
if not module.params.get('subscription_password'):
|
||||
module.fail_json(msg='subscription_password parameter is required')
|
||||
if not module.params.get('datacenter'):
|
||||
module.fail_json(msg='datacenter parameter is required')
|
||||
if not module.params.get('server'):
|
||||
module.fail_json(msg='server parameter is required')
|
||||
|
||||
subscription_user = module.params.get('subscription_user')
|
||||
subscription_password = module.params.get('subscription_password')
|
||||
|
||||
|
|
@ -264,9 +270,6 @@ def main():
|
|||
state = module.params.get('state')
|
||||
|
||||
if state == 'absent':
|
||||
if not module.params.get('name'):
|
||||
module.fail_json(msg='name parameter is required')
|
||||
|
||||
try:
|
||||
(changed) = delete_nic(module, profitbricks)
|
||||
module.exit_json(changed=changed)
|
||||
|
|
@ -274,9 +277,6 @@ def main():
|
|||
module.fail_json(msg='failed to set nic state: %s' % str(e))
|
||||
|
||||
elif state == 'present':
|
||||
if not module.params.get('lan'):
|
||||
module.fail_json(msg='lan parameter is required')
|
||||
|
||||
try:
|
||||
(nic_dict) = create_nic(module, profitbricks)
|
||||
module.exit_json(nics=nic_dict) # @FIXME changed not calculated?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue