mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-05-29 12:29:10 -07:00
cloudstack: remove CloudStackException dep for several modules (#26874)
* cloudstack: cs_affinitygroup: remove CloudStackException dependency * cloudstack: cs_domain: remove CloudStackException dependency * cloudstack: cs_firewall: remove CloudStackException dependency * cloudstack: cs_host: remove CloudStackException dependency * cloudstack: cs_instancegroup: remove CloudStackException dependency * cloudstack: cs_pod: remove CloudStackException dependency * cloudstack: cs_configuration: remove CloudStackException dependency, fix pep8 * cloudstack: cs_cluster: remove CloudStackException dependency * cloudstack: cs_network_acl: remove CloudStackException dependency * cloudstack: cs_network_acl_rule: remove CloudStackException dependency * cloudstack: cs_zone_facts: remove CloudStackException dependency * cloudstack: cs_zone: remove CloudStackException dependency * cloudstack: cs_vpn_gateway: remove CloudStackException dependency * cloudstack: cs_vpc: remove CloudStackException dependency * cloudstack: cs_sshkeypair: remove CloudStackException dependency * cloudstack: cs_role: remove CloudStackException dependency * cloudstack: cs_ip_address: remove CloudStackException dependency * cloudstack: cs_ip_staticnat: remove CloudStackException dependency * cloudstack: cs_resourcelimit: remove CloudStackException dependency * cloudstack: cs_region: remove CloudStackException dependency * cloudstack: cs_project: remove CloudStackException dependency * cloudstack: cs_network: remove CloudStackException dependency * cloudstack: cs_loadbalancer_rule_member: remove CloudStackException dependency * cloudstack: cs_loadbalancer_rule: remove CloudStackException dependency * cloudstack: cs_iso: remove CloudStackException dependency
This commit is contained in:
parent
e228c7d021
commit
30ad30c470
26 changed files with 333 additions and 595 deletions
|
@ -158,7 +158,6 @@ zone:
|
|||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.cloudstack import (
|
||||
AnsibleCloudStack,
|
||||
CloudStackException,
|
||||
cs_argument_spec,
|
||||
cs_required_together
|
||||
)
|
||||
|
@ -199,14 +198,14 @@ class AnsibleCloudStackPod(AnsibleCloudStack):
|
|||
if uuid:
|
||||
args['id'] = uuid
|
||||
args['zoneid'] = self.get_zone(key='id')
|
||||
pods = self.cs.listPods(**args)
|
||||
pods = self.query_api('listPods', **args)
|
||||
if pods:
|
||||
self.pod = pods['pod'][0]
|
||||
return self.pod
|
||||
|
||||
args['name'] = self.module.params.get('name')
|
||||
args['zoneid'] = self.get_zone(key='id')
|
||||
pods = self.cs.listPods(**args)
|
||||
pods = self.query_api('listPods', **args)
|
||||
if pods:
|
||||
self.pod = pods['pod'][0]
|
||||
return self.pod
|
||||
|
@ -231,9 +230,7 @@ class AnsibleCloudStackPod(AnsibleCloudStack):
|
|||
self.result['changed'] = True
|
||||
args = self._get_common_pod_args()
|
||||
if not self.module.check_mode:
|
||||
res = self.cs.createPod(**args)
|
||||
if 'errortext' in res:
|
||||
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
|
||||
res = self.query_api('createPod', **args)
|
||||
pod = res['pod']
|
||||
return pod
|
||||
|
||||
|
@ -246,9 +243,7 @@ class AnsibleCloudStackPod(AnsibleCloudStack):
|
|||
self.result['changed'] = True
|
||||
|
||||
if not self.module.check_mode:
|
||||
res = self.cs.updatePod(**args)
|
||||
if 'errortext' in res:
|
||||
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
|
||||
res = self.query_api('updatePod', **args)
|
||||
pod = res['pod']
|
||||
return pod
|
||||
|
||||
|
@ -261,9 +256,7 @@ class AnsibleCloudStackPod(AnsibleCloudStack):
|
|||
'id': pod['id']
|
||||
}
|
||||
if not self.module.check_mode:
|
||||
res = self.cs.deletePod(**args)
|
||||
if 'errortext' in res:
|
||||
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
|
||||
self.query_api('deletePod', **args)
|
||||
return pod
|
||||
|
||||
|
||||
|
@ -286,18 +279,14 @@ def main():
|
|||
supports_check_mode=True
|
||||
)
|
||||
|
||||
try:
|
||||
acs_pod = AnsibleCloudStackPod(module)
|
||||
state = module.params.get('state')
|
||||
if state in ['absent']:
|
||||
pod = acs_pod.absent_pod()
|
||||
else:
|
||||
pod = acs_pod.present_pod()
|
||||
acs_pod = AnsibleCloudStackPod(module)
|
||||
state = module.params.get('state')
|
||||
if state in ['absent']:
|
||||
pod = acs_pod.absent_pod()
|
||||
else:
|
||||
pod = acs_pod.present_pod()
|
||||
|
||||
result = acs_pod.get_result(pod)
|
||||
|
||||
except CloudStackException as e:
|
||||
module.fail_json(msg='CloudStackException: %s' % str(e))
|
||||
result = acs_pod.get_result(pod)
|
||||
|
||||
module.exit_json(**result)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue