Bug fixes for GCP modules (#58901)

5 years ago · 51e1b090db
parent 119b8521a6
commit 51e1b090db
12 changed files with 6 additions and 28 deletions
--- a/lib/ansible/modules/cloud/google/gcp_compute_region_disk.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_region_disk.py
@ -157,7 +157,7 @@ EXAMPLES = '''
 - name: create a region disk
  gcp_compute_region_disk:
    name: test_object
-    size_gb: 50
+    size_gb: 500
    disk_encryption_key:
      raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
    region: us-central1
--- a/test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml
@ -151,7 +151,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that global_forwarding_rule was deleted
  gcp_compute_global_forwarding_rule_facts:
      filters:
@ -183,7 +182,6 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
--- a/test/integration/targets/gcp_compute_health_check/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_health_check/tasks/main.yml
@ -107,7 +107,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that health_check was deleted
  gcp_compute_health_check_facts:
      filters:
@ -143,4 +142,3 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
--- a/test/integration/targets/gcp_compute_http_health_check/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_http_health_check/tasks/main.yml
@ -91,7 +91,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that http_health_check was deleted
  gcp_compute_http_health_check_facts:
      filters:
@ -123,4 +122,3 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
--- a/test/integration/targets/gcp_compute_https_health_check/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_https_health_check/tasks/main.yml
@ -91,7 +91,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that https_health_check was deleted
  gcp_compute_https_health_check_facts:
      filters:
@ -123,4 +122,3 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
--- a/test/integration/targets/gcp_compute_image/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_image/tasks/main.yml
@ -88,7 +88,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that image was deleted
  gcp_compute_image_facts:
      filters:
@ -117,7 +116,6 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
--- a/test/integration/targets/gcp_compute_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance/tasks/main.yml
@ -172,7 +172,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that instance was deleted
  gcp_compute_instance_facts:
      filters:
@ -218,7 +217,6 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
--- a/test/integration/targets/gcp_compute_instance_group/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance_group/tasks/main.yml
@ -104,7 +104,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that instance_group was deleted
  gcp_compute_instance_group_facts:
      filters:
@ -138,7 +137,6 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
--- a/test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml
@ -130,7 +130,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that instance_group_manager was deleted
  gcp_compute_instance_group_manager_facts:
      filters:
@ -163,7 +162,6 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
--- a/test/integration/targets/gcp_compute_instance_template/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance_template/tasks/main.yml
@ -144,7 +144,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that instance_template was deleted
  gcp_compute_instance_template_facts:
      filters:
@ -185,7 +184,6 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
--- a/test/integration/targets/gcp_compute_network/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_network/tasks/main.yml
@ -79,7 +79,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that network was deleted
  gcp_compute_network_facts:
      filters:
@ -108,4 +107,3 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False
--- a/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
@ -16,7 +16,7 @@
 - name: delete a region disk
  gcp_compute_region_disk:
    name: "{{ resource_name }}"
-    size_gb: 50
+    size_gb: 500
    disk_encryption_key:
      raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
    region: us-central1
@ -31,7 +31,7 @@
 - name: create a region disk
  gcp_compute_region_disk:
    name: "{{ resource_name }}"
-    size_gb: 50
+    size_gb: 500
    disk_encryption_key:
      raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
    region: us-central1
@ -67,7 +67,7 @@
 - name: create a region disk that already exists
  gcp_compute_region_disk:
    name: "{{ resource_name }}"
-    size_gb: 50
+    size_gb: 500
    disk_encryption_key:
      raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
    region: us-central1
@ -88,7 +88,7 @@
 - name: delete a region disk
  gcp_compute_region_disk:
    name: "{{ resource_name }}"
-    size_gb: 50
+    size_gb: 500
    disk_encryption_key:
      raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
    region: us-central1
@ -104,7 +104,6 @@
  assert:
    that:
      - result.changed == true
-      - result.has_key('kind') == False
 - name: verify that region_disk was deleted
  gcp_compute_region_disk_facts:
      filters:
@ -124,7 +123,7 @@
 - name: delete a region disk that does not exist
  gcp_compute_region_disk:
    name: "{{ resource_name }}"
-    size_gb: 50
+    size_gb: 500
    disk_encryption_key:
      raw_key: SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=
    region: us-central1
@ -140,4 +139,3 @@
  assert:
    that:
      - result.changed == false
-      - result.has_key('kind') == False