Ansible integration test fixes - pt 2

lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel.py

@@ -162,8 +162,8 @@
       state: present
   register: gateway
 
-- name: create a vpn-tunnel
-  gcp_compute_vpn-tunnel:
+- name: create a vpn tunnel
+  gcp_compute_vpn_tunnel:
       name: "test_object"
       region: us-west1
       target_vpn_gateway: "{{ gateway }}"

lib/ansible/modules/cloud/google/gcp_iam_service_account.py

@@ -62,7 +62,9 @@
 EXAMPLES = '''
 - name: create a service account
   gcp_iam_service_account:
-      name: test-ansible@graphite-playground.google.com.iam.gserviceaccount.com
+      name: '"{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
+
+      '
       display_name: My Ansible test key
       project: "test_project"
       auth_kind: "serviceaccount"

lib/ansible/modules/cloud/google/gcp_sql_database.py

@@ -76,7 +76,7 @@
 EXAMPLES = '''
 - name: create a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-3"
       settings:
         ip_configuration:
           authorized_networks:

lib/ansible/modules/cloud/google/gcp_sql_instance.py

@@ -273,7 +273,7 @@
 EXAMPLES = '''
 - name: create a instance
   gcp_sql_instance:
-      name: "test_object"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:

lib/ansible/modules/cloud/google/gcp_sql_user.py

@@ -77,7 +77,7 @@
 EXAMPLES = '''
 - name: create a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-1"
       settings:
         ip_configuration:
           authorized_networks:

lib/ansible/modules/cloud/google/gcp_storage_bucket_access_control.py

@@ -110,7 +110,7 @@
 EXAMPLES = '''
 - name: create a bucket
   gcp_storage_bucket:
-      name: "bucket-bac"
+      name: "{{ resource_name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"

test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml

@@ -49,8 +49,8 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: present
   register: gateway
-- name: delete a vpn-tunnel
-  gcp_compute_vpn-tunnel:
+- name: delete a vpn tunnel
+  gcp_compute_vpn_tunnel:
       name: "{{ resource_name }}"
       region: us-west1
       target_vpn_gateway: "{{ gateway }}"
@@ -61,8 +61,8 @@
       service_account_file: "{{ gcp_cred_file }}"
       state: absent
 #----------------------------------------------------------
-- name: create a vpn-tunnel
-  gcp_compute_vpn-tunnel:
+- name: create a vpn tunnel
+  gcp_compute_vpn_tunnel:
       name: "{{ resource_name }}"
       region: us-west1
       target_vpn_gateway: "{{ gateway }}"
@@ -94,8 +94,8 @@
     that:
       - results['items'] | length == 1
 # ----------------------------------------------------------------------------
-- name: create a vpn-tunnel that already exists
-  gcp_compute_vpn-tunnel:
+- name: create a vpn tunnel that already exists
+  gcp_compute_vpn_tunnel:
       name: "{{ resource_name }}"
       region: us-west1
       target_vpn_gateway: "{{ gateway }}"
@@ -112,8 +112,8 @@
       - result.changed == false
       - "result.kind == 'compute#vpnTunnel'"
 #----------------------------------------------------------
-- name: delete a vpn-tunnel
-  gcp_compute_vpn-tunnel:
+- name: delete a vpn tunnel
+  gcp_compute_vpn_tunnel:
       name: "{{ resource_name }}"
       region: us-west1
       target_vpn_gateway: "{{ gateway }}"
@@ -145,8 +145,8 @@
     that:
       - results['items'] | length == 0
 # ----------------------------------------------------------------------------
-- name: delete a vpn-tunnel that does not exist
-  gcp_compute_vpn-tunnel:
+- name: delete a vpn tunnel that does not exist
+  gcp_compute_vpn_tunnel:
       name: "{{ resource_name }}"
       region: us-west1
       target_vpn_gateway: "{{ gateway }}"

test/integration/targets/gcp_iam_service_account/tasks/main.yml

@@ -15,7 +15,9 @@
 # Pre-test setup
 - name: delete a service account
   gcp_iam_service_account:
-      name: test-ansible@graphite-playground.google.com.iam.gserviceaccount.com
+      name: '"{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
+
+      '
       display_name: My Ansible test key
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -24,7 +26,9 @@
 #----------------------------------------------------------
 - name: create a service account
   gcp_iam_service_account:
-      name: test-ansible@graphite-playground.google.com.iam.gserviceaccount.com
+      name: '"{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
+
+      '
       display_name: My Ansible test key
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -50,7 +54,9 @@
 # ----------------------------------------------------------------------------
 - name: create a service account that already exists
   gcp_iam_service_account:
-      name: test-ansible@graphite-playground.google.com.iam.gserviceaccount.com
+      name: '"{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
+
+      '
       display_name: My Ansible test key
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -64,7 +70,9 @@
 #----------------------------------------------------------
 - name: delete a service account
   gcp_iam_service_account:
-      name: test-ansible@graphite-playground.google.com.iam.gserviceaccount.com
+      name: '"{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
+
+      '
       display_name: My Ansible test key
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -90,7 +98,9 @@
 # ----------------------------------------------------------------------------
 - name: delete a service account that does not exist
   gcp_iam_service_account:
-      name: test-ansible@graphite-playground.google.com.iam.gserviceaccount.com
+      name: '"{{resource_name}}@{{gcp_project}}.google.com.iam.gserviceaccount.com"
+
+      '
       display_name: My Ansible test key
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"

test/integration/targets/gcp_sql_database/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-3"
       settings:
         ip_configuration:
           authorized_networks:
@@ -132,7 +132,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-3"
       settings:
         ip_configuration:
           authorized_networks:

test/integration/targets/gcp_sql_instance/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: delete a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -30,7 +30,7 @@
 #----------------------------------------------------------
 - name: create a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -63,7 +63,7 @@
 # ----------------------------------------------------------------------------
 - name: create a instance that already exists
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -84,7 +84,7 @@
 #----------------------------------------------------------
 - name: delete a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:
@@ -117,7 +117,7 @@
 # ----------------------------------------------------------------------------
 - name: delete a instance that does not exist
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-2"
       settings:
         ip_configuration:
           authorized_networks:

test/integration/targets/gcp_sql_user/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-1"
       settings:
         ip_configuration:
           authorized_networks:
@@ -137,7 +137,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a instance
   gcp_sql_instance:
-      name: "{{ resource_name }}"
+      name: "{{resource_name}}-1"
       settings:
         ip_configuration:
           authorized_networks:

test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml

@@ -15,7 +15,7 @@
 # Pre-test setup
 - name: create a bucket
   gcp_storage_bucket:
-      name: "bucket-bac"
+      name: "{{ resource_name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -99,7 +99,7 @@
 # If errors happen, don't crash the playbook!
 - name: delete a bucket
   gcp_storage_bucket:
-      name: "bucket-bac"
+      name: "{{ resource_name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"