Bug fixes for gcp_compute_forwarding_rule (#42808)

This commit is contained in:
Alex Stephen 2018-08-13 09:00:11 -07:00
commit de00d03d6e
2 changed files with 120 additions and 95 deletions

View file

@ -15,54 +15,46 @@
# Pre-test setup
- name: create a address
gcp_compute_address:
name: 'address-forwardingrule'
region: 'us-west1'
name: "address-forwardingrule"
region: us-west1
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: address
- name: create a target pool
gcp_compute_target_pool:
name: 'targetpool-forwardingrule'
region: 'us-west1'
name: "targetpool-forwardingrule"
region: us-west1
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: targetpool
- name: delete a forwarding rule
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: 'us-west1'
region: us-west1
target: "{{ targetpool }}"
ip_protocol: 'TCP'
port_range: '80-80'
ip_protocol: TCP
port_range: 80-80
ip_address: "{{ address.address }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
#----------------------------------------------------------
- name: create a forwarding rule
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: 'us-west1'
region: us-west1
target: "{{ targetpool }}"
ip_protocol: 'TCP'
port_range: '80-80'
ip_protocol: TCP
port_range: 80-80
ip_address: "{{ address.address }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: result
- name: assert changed is true
@ -71,27 +63,32 @@
- result.changed == true
- "result.kind == 'compute#forwardingRule'"
- name: verify that forwarding_rule was created
shell: |
gcloud compute forwarding-rules describe --project="{{ gcp_project }}" --region=us-west1 "{{ resource_name }}"
register: results
- name: verify that command succeeded
assert:
that:
- results.rc == 0
# ----------------------------------------------------------------------------
- name: create a forwarding rule that already exists
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: 'us-west1'
target: "{{ targetpool }}"
ip_protocol: 'TCP'
port_range: '80-80'
ip_address: "{{ address.address }}"
gcp_compute_forwarding_rule_facts:
filters:
- name = {{ resource_name }}
region: us-west1
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
register: results
- name: verify that command succeeded
assert:
that:
- results['items'] | length == 1
# ----------------------------------------------------------------------------
- name: create a forwarding rule that already exists
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: us-west1
target: "{{ targetpool }}"
ip_protocol: TCP
port_range: 80-80
ip_address: "{{ address.address }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
state: present
register: result
- name: assert changed is false
@ -103,16 +100,14 @@
- name: delete a forwarding rule
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: 'us-west1'
region: us-west1
target: "{{ targetpool }}"
ip_protocol: 'TCP'
port_range: '80-80'
ip_protocol: TCP
port_range: 80-80
ip_address: "{{ address.address }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: result
- name: assert changed is true
@ -121,29 +116,32 @@
- result.changed == true
- result.has_key('kind') == False
- name: verify that forwarding_rule was deleted
shell: |
gcloud compute forwarding-rules describe --project="{{ gcp_project }}" --region=us-west1 "{{ resource_name }}"
register: results
failed_when: results.rc == 0
- name: verify that command succeeded
assert:
that:
- results.rc == 1
- "\"'projects/{{ gcp_project }}/regions/us-west1/forwardingRules/{{ resource_name }}' was not found\" in results.stderr"
# ----------------------------------------------------------------------------
- name: delete a forwarding rule that does not exist
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: 'us-west1'
target: "{{ targetpool }}"
ip_protocol: 'TCP'
port_range: '80-80'
ip_address: "{{ address.address }}"
gcp_compute_forwarding_rule_facts:
filters:
- name = {{ resource_name }}
region: us-west1
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
register: results
- name: verify that command succeeded
assert:
that:
- results['items'] | length == 0
# ----------------------------------------------------------------------------
- name: delete a forwarding rule that does not exist
gcp_compute_forwarding_rule:
name: "{{ resource_name }}"
region: us-west1
target: "{{ targetpool }}"
ip_protocol: TCP
port_range: 80-80
ip_address: "{{ address.address }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
state: absent
register: result
- name: assert changed is false
@ -155,23 +153,19 @@
# Post-test teardown
- name: delete a target pool
gcp_compute_target_pool:
name: 'targetpool-forwardingrule'
region: 'us-west1'
name: "targetpool-forwardingrule"
region: us-west1
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: targetpool
- name: delete a address
gcp_compute_address:
name: 'address-forwardingrule'
region: 'us-west1'
name: "address-forwardingrule"
region: us-west1
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: address