mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-24 19:31:26 -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:
René Moser
GitHub
parent
e228c7d021
commit
30ad30c470
26 changed files with 333 additions and 595 deletions
|
|
@ -153,8 +153,13 @@ storage:
|
|||
sample: storage01
|
||||
'''
|
||||
|
||||
# import cloudstack common
|
||||
from ansible.module_utils.cloudstack import *
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.cloudstack import (
|
||||
AnsibleCloudStack,
|
||||
cs_argument_spec,
|
||||
cs_required_together
|
||||
)
|
||||
|
||||
|
||||
class AnsibleCloudStackConfiguration(AnsibleCloudStack):
|
||||
|
||||
|
|
@ -162,39 +167,38 @@ class AnsibleCloudStackConfiguration(AnsibleCloudStack):
|
|||
super(AnsibleCloudStackConfiguration, self).__init__(module)
|
||||
self.returns = {
|
||||
'category': 'category',
|
||||
'scope': 'scope',
|
||||
'value': 'value',
|
||||
'scope': 'scope',
|
||||
'value': 'value',
|
||||
}
|
||||
self.storage = None
|
||||
self.account = None
|
||||
self.cluster = None
|
||||
|
||||
|
||||
def _get_common_configuration_args(self):
|
||||
args = {}
|
||||
args['name'] = self.module.params.get('name')
|
||||
args['accountid'] = self.get_account(key='id')
|
||||
args['storageid'] = self.get_storage(key='id')
|
||||
args['zoneid'] = self.get_zone(key='id')
|
||||
args['clusterid'] = self.get_cluster(key='id')
|
||||
args = {
|
||||
'name': self.module.params.get('name'),
|
||||
'accountid': self.get_account(key='id'),
|
||||
'storageid': self.get_storage(key='id'),
|
||||
'zoneid': self.get_zone(key='id'),
|
||||
'clusterid': self.get_cluster(key='id'),
|
||||
}
|
||||
return args
|
||||
|
||||
|
||||
def get_zone(self, key=None):
|
||||
# make sure we do net use the default zone
|
||||
zone = self.module.params.get('zone')
|
||||
if zone:
|
||||
return super(AnsibleCloudStackConfiguration, self).get_zone(key=key)
|
||||
|
||||
|
||||
def get_cluster(self, key=None):
|
||||
if not self.cluster:
|
||||
cluster_name = self.module.params.get('cluster')
|
||||
if not cluster_name:
|
||||
return None
|
||||
args = {}
|
||||
args['name'] = cluster_name
|
||||
clusters = self.cs.listClusters(**args)
|
||||
args = {
|
||||
'name': cluster_name,
|
||||
}
|
||||
clusters = self.query_api('listClusters', **args)
|
||||
if clusters:
|
||||
self.cluster = clusters['cluster'][0]
|
||||
self.result['cluster'] = self.cluster['name']
|
||||
|
|
@ -202,15 +206,15 @@ class AnsibleCloudStackConfiguration(AnsibleCloudStack):
|
|||
self.module.fail_json(msg="Cluster %s not found." % cluster_name)
|
||||
return self._get_by_key(key=key, my_dict=self.cluster)
|
||||
|
||||
|
||||
def get_storage(self, key=None):
|
||||
if not self.storage:
|
||||
storage_pool_name = self.module.params.get('storage')
|
||||
if not storage_pool_name:
|
||||
return None
|
||||
args = {}
|
||||
args['name'] = storage_pool_name
|
||||
storage_pools = self.cs.listStoragePools(**args)
|
||||
args = {
|
||||
'name': storage_pool_name,
|
||||
}
|
||||
storage_pools = self.query_api('listStoragePools', **args)
|
||||
if storage_pools:
|
||||
self.storage = storage_pools['storagepool'][0]
|
||||
self.result['storage'] = self.storage['name']
|
||||
|
|
@ -218,24 +222,21 @@ class AnsibleCloudStackConfiguration(AnsibleCloudStack):
|
|||
self.module.fail_json(msg="Storage pool %s not found." % storage_pool_name)
|
||||
return self._get_by_key(key=key, my_dict=self.storage)
|
||||
|
||||
|
||||
def get_configuration(self):
|
||||
configuration = None
|
||||
args = self._get_common_configuration_args()
|
||||
configurations = self.cs.listConfigurations(**args)
|
||||
configurations = self.query_api('listConfigurations', **args)
|
||||
if not configurations:
|
||||
self.module.fail_json(msg="Configuration %s not found." % args['name'])
|
||||
configuration = configurations['configuration'][0]
|
||||
return configuration
|
||||
|
||||
|
||||
def get_value(self):
|
||||
value = str(self.module.params.get('value'))
|
||||
if value in ('True', 'False'):
|
||||
value = value.lower()
|
||||
return value
|
||||
|
||||
|
||||
def present_configuration(self):
|
||||
configuration = self.get_configuration()
|
||||
args = self._get_common_configuration_args()
|
||||
|
|
@ -243,13 +244,10 @@ class AnsibleCloudStackConfiguration(AnsibleCloudStack):
|
|||
if self.has_changed(args, configuration, ['value']):
|
||||
self.result['changed'] = True
|
||||
if not self.module.check_mode:
|
||||
res = self.cs.updateConfiguration(**args)
|
||||
if 'errortext' in res:
|
||||
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
|
||||
res = self.query_api('updateConfiguration', **args)
|
||||
configuration = res['configuration']
|
||||
return configuration
|
||||
|
||||
|
||||
def get_result(self, configuration):
|
||||
self.result = super(AnsibleCloudStackConfiguration, self).get_result(configuration)
|
||||
if self.account:
|
||||
|
|
@ -259,16 +257,17 @@ class AnsibleCloudStackConfiguration(AnsibleCloudStack):
|
|||
self.result['zone'] = self.zone['name']
|
||||
return self.result
|
||||
|
||||
|
||||
def main():
|
||||
argument_spec = cs_argument_spec()
|
||||
argument_spec.update(dict(
|
||||
name = dict(required=True),
|
||||
value = dict(type='str', required=True),
|
||||
zone = dict(default=None),
|
||||
storage = dict(default=None),
|
||||
cluster = dict(default=None),
|
||||
account = dict(default=None),
|
||||
domain = dict(default='ROOT')
|
||||
name=dict(required=True),
|
||||
value=dict(type='str', required=True),
|
||||
zone=dict(),
|
||||
storage=dict(),
|
||||
cluster=dict(),
|
||||
account=dict(),
|
||||
domain=dict(default='ROOT')
|
||||
))
|
||||
|
||||
module = AnsibleModule(
|
||||
|
|
@ -277,17 +276,11 @@ def main():
|
|||
supports_check_mode=True
|
||||
)
|
||||
|
||||
try:
|
||||
acs_configuration = AnsibleCloudStackConfiguration(module)
|
||||
configuration = acs_configuration.present_configuration()
|
||||
result = acs_configuration.get_result(configuration)
|
||||
|
||||
except CloudStackException as e:
|
||||
module.fail_json(msg='CloudStackException: %s' % str(e))
|
||||
|
||||
acs_configuration = AnsibleCloudStackConfiguration(module)
|
||||
configuration = acs_configuration.present_configuration()
|
||||
result = acs_configuration.get_result(configuration)
|
||||
module.exit_json(**result)
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue