mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
cs_serviceoffer: remove unused code and improve test coverage (#33276)
This commit is contained in:
parent
e197a94f2b
commit
1f9e84fdd4
2 changed files with 30 additions and 18 deletions
|
@ -374,19 +374,17 @@ class AnsibleCloudStackServiceOffering(AnsibleCloudStack):
|
||||||
'systemvmtype': 'system_vm_type',
|
'systemvmtype': 'system_vm_type',
|
||||||
'tags': 'storage_tags',
|
'tags': 'storage_tags',
|
||||||
}
|
}
|
||||||
self.service_offering = None
|
|
||||||
|
|
||||||
def get_service_offering(self):
|
def get_service_offering(self):
|
||||||
if not self.service_offering:
|
args = {
|
||||||
args = {
|
'name': self.module.params.get('name'),
|
||||||
'name': self.module.params.get('name'),
|
'domainid': self.get_domain(key='id'),
|
||||||
'domainid': self.get_domain(key='id'),
|
'issystem': self.module.params.get('is_system'),
|
||||||
'issystem': self.module.params.get('is_system'),
|
'systemvmtype': self.module.params.get('system_vm_type'),
|
||||||
'systemvmtype': self.module.params.get('system_vm_type'),
|
}
|
||||||
}
|
service_offerings = self.query_api('listServiceOfferings', **args)
|
||||||
service_offerings = self.query_api('listServiceOfferings', **args)
|
if service_offerings:
|
||||||
if service_offerings:
|
return service_offerings['serviceoffering'][0]
|
||||||
return service_offerings['serviceoffering'][0]
|
|
||||||
|
|
||||||
def present_service_offering(self):
|
def present_service_offering(self):
|
||||||
service_offering = self.get_service_offering()
|
service_offering = self.get_service_offering()
|
||||||
|
@ -395,12 +393,6 @@ class AnsibleCloudStackServiceOffering(AnsibleCloudStack):
|
||||||
else:
|
else:
|
||||||
service_offering = self._update_offering(service_offering)
|
service_offering = self._update_offering(service_offering)
|
||||||
|
|
||||||
if service_offering:
|
|
||||||
service_offering = self.ensure_tags(
|
|
||||||
resource=service_offering,
|
|
||||||
resource_type='ServiceOffering'
|
|
||||||
)
|
|
||||||
|
|
||||||
return service_offering
|
return service_offering
|
||||||
|
|
||||||
def absent_service_offering(self):
|
def absent_service_offering(self):
|
||||||
|
@ -422,7 +414,7 @@ class AnsibleCloudStackServiceOffering(AnsibleCloudStack):
|
||||||
|
|
||||||
required_params = []
|
required_params = []
|
||||||
if is_system and not system_vm_type:
|
if is_system and not system_vm_type:
|
||||||
required_params.add('system_vm_type')
|
required_params.append('system_vm_type')
|
||||||
self.module.fail_on_missing_params(required_params=required_params)
|
self.module.fail_on_missing_params(required_params=required_params)
|
||||||
|
|
||||||
args = {
|
args = {
|
||||||
|
|
|
@ -10,6 +10,26 @@
|
||||||
that:
|
that:
|
||||||
- so|success
|
- so|success
|
||||||
|
|
||||||
|
- name: fail missing storage type and is_system
|
||||||
|
cs_serviceoffer:
|
||||||
|
name: System Offering for Ansible
|
||||||
|
cpu_number: 1
|
||||||
|
cpu_speed: 500
|
||||||
|
memory: 512
|
||||||
|
host_tag: perf
|
||||||
|
storage_tag: perf
|
||||||
|
storage_type: shared
|
||||||
|
offer_ha: true
|
||||||
|
limit_cpu_usage: false
|
||||||
|
is_system: true
|
||||||
|
register: so
|
||||||
|
ignore_errors: true
|
||||||
|
- name: verify create system service offering in check mode
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- so|failed
|
||||||
|
- so.msg.startswith('missing required arguments:')
|
||||||
|
|
||||||
- name: create system service offering in check mode
|
- name: create system service offering in check mode
|
||||||
cs_serviceoffer:
|
cs_serviceoffer:
|
||||||
name: System Offering for Ansible
|
name: System Offering for Ansible
|
||||||
|
|
Loading…
Reference in a new issue