intergration test fixes (#262)

intergration test fixes Reviewed-by: Polina Gubina Reviewed-by: Anton Sidelnikov
opentelekomcloud · Feb 21, 2023 · 0e19dda · 0e19dda
1 parent 12c8558
commit 0e19dda
Show file tree

Hide file tree

Showing 68 changed files with 631 additions and 430 deletions.
diff --git a/tests/integration/targets/anti_ddos_fip_statuses_info/tasks/main.yaml b/tests/integration/targets/anti_ddos_fip_statuses_info/tasks/main.yaml
@@ -8,7 +8,7 @@
       opentelekomcloud.cloud.anti_ddos_fip_statuses_info:
       register: anti_ddos
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - anti_ddos is success
@@ -19,7 +19,7 @@
         status: "notConfig"
       register: anti_ddos
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - anti_ddos is success
@@ -31,7 +31,7 @@
       register: anti_ddos
       ignore_errors: true
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - anti_ddos is not success

diff --git a/tests/integration/targets/anti_ddos_optional_policies_info/tasks/main.yaml b/tests/integration/targets/anti_ddos_optional_policies_info/tasks/main.yaml
@@ -8,7 +8,7 @@
       opentelekomcloud.cloud.anti_ddos_optional_policies_info:
       register: anti_ddos_optional_policies_info
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - anti_ddos_optional_policies_info is success

diff --git a/tests/integration/targets/as_config/tasks/main.yaml b/tests/integration/targets/as_config/tasks/main.yaml
@@ -30,7 +30,7 @@
       register: as_config_check
       check_mode: true
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_config_check is changed
@@ -47,7 +47,7 @@
             disk_type: 'SYS'
       register: as_config
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_config is changed
@@ -60,16 +60,22 @@
           opentelekomcloud.cloud.as_config:
             scaling_configuration: "{{ config_name }}"
             state: absent
-          register: dropped_as_config
+          register: removed
+          until: removed is not failed
           ignore_errors: true
+          retries: 10
 
-        - name: assert result
+        - name: Assert result
           ansible.builtin.assert:
             that:
-              - dropped_as_config is success
-              - dropped_as_config is changed
+              - removed is success
+              - removed is changed
 
         - name: Delete keypair
           openstack.cloud.keypair:
             name: "{{ key_name }}"
             state: absent
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10
diff --git a/tests/integration/targets/as_config_info/tasks/main.yaml b/tests/integration/targets/as_config_info/tasks/main.yaml
@@ -6,11 +6,11 @@
         cloud: "{{ test_cloud }}"
       register: auto_scale
 
-    - name: debug configs
+    - name: Debug configs
       ansible.builtin.debug:
         var: auto_scale.as_configs
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - auto_scale is success

diff --git a/tests/integration/targets/as_group/tasks/main.yaml b/tests/integration/targets/as_group/tasks/main.yaml
@@ -81,7 +81,7 @@
       check_mode: true
       register: as_group_check
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_group_check is changed
@@ -94,7 +94,7 @@
         router: "{{ router.router.id }}"
       register: as_group
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_group is success
@@ -119,7 +119,7 @@
       check_mode: true
       register: as_group_check
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_group_check is success
@@ -133,7 +133,7 @@
         max_instance_number: 10
       register: as_group
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_group is success
@@ -148,7 +148,7 @@
       check_mode: true
       register: as_group_check
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_group_check is changed
@@ -163,7 +163,7 @@
         timeout: 360
       register: as_gr_del
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_gr_del is success
@@ -195,7 +195,7 @@
         timeout: 360
       register: as_group
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_group is success
@@ -206,7 +206,7 @@
         scaling_group: "{{ as_group.as_group.id }}"
       register: as_instances
 
-    - name: assert result
+    - name: Assert result
       ansible.builtin.assert:
         that:
           - as_instances is success
@@ -235,36 +235,52 @@
             force_delete: true
             wait: true
             timeout: 360
-          register: dropped_as_group
-          failed_when: "dropped_as_group is not changed"
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10
 
         - name: Delete as config
           opentelekomcloud.cloud.as_config:
             scaling_configuration: "{{ config_name }}"
             state: absent
-          register: dropped_as_config
-          failed_when: "dropped_as_config is not changed"
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10
 
         - name: Delete keypair
           openstack.cloud.keypair:
             name: "{{ key_name }}"
             state: absent
-          failed_when: false
-
-        - name: Drop existing router
-          openstack.cloud.router:
-            name: "{{ router.router.name }}"
-            state: absent
-          failed_when: false
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10
 
         - name: Drop existing subnet
           openstack.cloud.subnet:
             name: "{{ subnet.subnet.name }}"
             state: absent
-          failed_when: false
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10
 
         - name: Drop existing network
           openstack.cloud.network:
             name: "{{ network.network.name }}"
             state: absent
-          ignore_errors: false
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10
+
+        - name: Drop existing router
+          openstack.cloud.router:
+            name: "{{ router.router.name }}"
+            state: absent
+          register: removed
+          until: removed is not failed
+          ignore_errors: true
+          retries: 10