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

Cloudstack: fix support for some VPC service capabilities (#45727)

Browse source 
* Fix support for VPC capabilities such as redundant routers or region level VPC

* Add integration test cases for "region level VPC" and "distributed router" capabilities
This commit is contained in:
David Passante 2018-09-17 16:08:16 +02:00 committed by René Moser
parent 78e9f452a5
commit 05328ebf21
2 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/ansible/modules/cloud/cloudstack/cs_vpc_offering.py
View file

@ -65,8 +65,36 @@ EXAMPLES = '''
state: enabled state: enabled
supported_services: [ Dns, Dhcp ] supported_services: [ Dns, Dhcp ]
service_providers: service_providers:
- {service: 'dns', provider: 'virtualrouter'} - {service: 'dns', provider: 'VpcVirtualRouter'}
- {service: 'dhcp', provider: 'virtualrouter'} - {service: 'dhcp', provider: 'VpcVirtualRouter'}
# Create a vpc offering with redundant router
- local_action:
module: cs_vpc_offering
name: "my_vpc_offering"
display_text: "vpc offering description"
supported_services: [ Dns, Dhcp, SourceNat ]
service_providers:
- {service: 'dns', provider: 'VpcVirtualRouter'}
- {service: 'dhcp', provider: 'VpcVirtualRouter'}
- {service: 'SourceNat', provider: 'VpcVirtualRouter'}
service_capabilities:
- {service: 'SourceNat', capabilitytype: 'RedundantRouter', capabilityvalue: true}
# Create a region level vpc offering with distributed router
- local_action:
module: cs_vpc_offering
name: "my_vpc_offering"
display_text: "vpc offering description"
state: present
supported_services: [ Dns, Dhcp, SourceNat ]
service_providers:
- {service: 'dns', provider: 'VpcVirtualRouter'}
- {service: 'dhcp', provider: 'VpcVirtualRouter'}
- {service: 'SourceNat', provider: 'VpcVirtualRouter'}
service_capabilities:
- {service: 'Connectivity', capabilitytype: 'DistributedRouter', capabilityvalue: true}
- {service: 'Connectivity', capabilitytype: 'RegionLevelVPC', capabilityvalue: true}
# Remove a vpc offering # Remove a vpc offering
- local_action: - local_action:
@ -189,6 +217,7 @@ class AnsibleCloudStackVPCOffering(AnsibleCloudStack):
'supportedservices': self.module.params.get('supported_services'), 'supportedservices': self.module.params.get('supported_services'),
'serviceproviderlist': self.module.params.get('service_providers'), 'serviceproviderlist': self.module.params.get('service_providers'),
'serviceofferingid': self.get_service_offering_id(), 'serviceofferingid': self.get_service_offering_id(),
'servicecapabilitylist': self.module.params.get('service_capabilities'),
} }
required_params = [ required_params = [

35
test/integration/targets/cs_vpc_offering/tasks/main.yml
View file

@ -380,6 +380,30 @@
- vpcoffer.state == "Enabled" - vpcoffer.state == "Enabled"
- vpcoffer.display_text == "vpc offering description" - vpcoffer.display_text == "vpc offering description"
- name: test create enabled region level vpc offer with distrubuted router
cs_vpc_offering:
name: "{{ cs_resource_prefix }}_vpc_drl"
display_text: "vpc offering description"
supported_services: [ Dns, PortForwarding, Dhcp, SourceNat, UserData, StaticNat, Vpn, Lb ]
service_providers:
- { service: 'dns', provider: 'virtualrouter' }
- { service: 'dhcp', provider: 'virtualrouter' }
state: enabled
service_capabilities:
- {service: 'Connectivity', capabilitytype: 'DistributedRouter', capabilityvalue: true}
- {service: 'Connectivity', capabilitytype: 'RegionLevelVPC', capabilityvalue: true}
register: vpcoffer
- name: verify results of create enabled region level vpc offer with distrubuted router
assert:
that:
- vpcoffer is successful
- vpcoffer is changed
- vpcoffer.name == "{{ cs_resource_prefix }}_vpc_drl"
- vpcoffer.state == "Enabled"
- vpcoffer.display_text == "vpc offering description"
- vpcoffer.distributed == true
- vpcoffer.region_level == true
- name: remove vpc offer - name: remove vpc offer
cs_vpc_offering: cs_vpc_offering:
name: "{{ cs_resource_prefix }}_vpc" name: "{{ cs_resource_prefix }}_vpc"
@ -390,3 +414,14 @@
that: that:
- vpcoffer is successful - vpcoffer is successful
- vpcoffer is changed - vpcoffer is changed
- name: remove region level vpc offer with distrubuted router
cs_vpc_offering:
name: "{{ cs_resource_prefix }}_vpc_drl"
state: absent
register: vpcoffer
- name: verify results of remove region level vpc offer with distrubuted router
assert:
that:
- vpcoffer is successful
- vpcoffer is changed