Improve test cases

CHANGELOG.md

@@ -7,6 +7,7 @@ FEATURES:
 
 IMPROVEMENTS:
 
+- Improve test cases ([#152](https://github.com/alibaba/ansible-provider/pull/152))
 - Improve inventory alicloud.py meta and use public_ip_address instead eip_address ([#152](https://github.com/alibaba/ansible-provider/pull/152))
 - Improve module ali_vpc and ali_security_group multi_ok ([#149](https://github.com/alibaba/ansible-provider/pull/149))
 - Improve module ali_slb_vsg and ali_slb_vsg_facts ([#148](https://github.com/alibaba/ansible-provider/pull/148))

tests/ali_eip_facts_test.yml

@@ -3,6 +3,9 @@
   hosts: localhost
   remote_user: root
 
+  vars:
+    name: ansible-testacc-ali_eip_facts-module
+
   roles:
     - eip
 

tests/ali_eip_test.yml

@@ -5,6 +5,7 @@
 
   vars:
     allocate_public_ip: False
+    name: ansible-testacc-ali_eip-module
 
   roles:
     - vpc

tests/ali_eni_facts_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_eni_facts
+    name: ansible-testacc-ali_eni_facts-module
 
   roles:
     - vpc

tests/ali_eni_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_eni
+    name: ansible-testacc-ali_eni-module
 
   roles:
     - vpc

tests/ali_instance_facts_test.yml

@@ -3,6 +3,9 @@
   hosts: localhost
   remote_user: root
 
+  vars:
+    name: ansible-testacc-ali_instance_facts-module
+
   roles:
     - vpc
     - vswitch
@@ -61,19 +64,22 @@
 
     - name: Changed. Deleting security groups
       ali_security_group:
-        group_id: '{{item.id}}'
+        name: '{{ item.group_name }}'
+        vpc_id: '{{item.vpc_id}}'
         state: absent
       with_items: '{{sgs.groups}}'
 
     - name: Changed. Deleting vswitches
       ali_vswitch:
-        id: '{{item.id}}'
+        vpc_id: '{{ item.vpc_id}}'
+        cidr_block: '{{ item.cidr_block}}'
         state: absent
       with_items: '{{vswitches.vswitches}}'
 
     - name: Changed. Deleting vpcs
       ali_vpc:
-        vpc_id: '{{item.id}}'
+        name: '{{item.vpc_name}}'
+        cidr_block: '{{item.cidr_block}}'
         state: absent
       with_items: '{{vpcs.vpcs}}'
 

tests/ali_instance_test.yml

@@ -13,7 +13,7 @@
     - name: Changed. Modifying name, host name and description when C(present)
       ali_instance:
         instance_ids: '{{ instances.ids}}'
-        name: '{{ name }}-instance-modified'
+        name: '{{ name }}-modified'
         description: 'Test modify name, host name and description'
         host_name: 'modify-host-name'
 
@@ -40,14 +40,14 @@
       ali_instance:
         state: running
         instance_ids: '{{ instances.ids}}'
-        name: '{{ name }}-instance'
+        name: '{{ name }}'
         description: '{{instance_description}}'
         host_name: 'modify-host-name'
 
     - name: No Changed. There is no any attribute changed
       ali_instance:
         instance_ids: '{{ instances.ids}}'
-        name: '{{ name }}-instance'
+        name: '{{ name }}'
         description: '{{instance_description}}'
         host_name: 'modify-host-name'
         password: 'Test12345'
@@ -100,19 +100,22 @@
 
     - name: Changed. Deleting security groups
       ali_security_group:
-        group_id: '{{item.id}}'
+        name: '{{ item.group_name }}'
+        vpc_id: '{{item.vpc_id}}'
         state: absent
       with_items: '{{sgs.groups}}'
 
     - name: Changed. Deleting vswitches
       ali_vswitch:
-        id: '{{item.id}}'
+        vpc_id: '{{ item.vpc_id}}'
+        cidr_block: '{{ item.cidr_block}}'
         state: absent
       with_items: '{{vswitches.vswitches}}'
 
     - name: Changed. Deleting vpcs
       ali_vpc:
-        vpc_id: '{{item.id}}'
+        name: '{{item.vpc_name}}'
+        cidr_block: '{{item.cidr_block}}'
         state: absent
       with_items: '{{vpcs.vpcs}}'
 

tests/ali_security_group_facts_test.yml

@@ -3,7 +3,7 @@
   hosts: localhost
   remote_user: root
   vars:
-    name: ansible-testacc-ali_security_group_facts
+    name: ansible-testacc-ali_security_group_facts-module
   roles:
     - vpc
     - security_group

tests/ali_security_group_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_security_group
+    name: ansible-testacc-ali_security_group-module
 
   roles:
     - vpc

tests/ali_slb_lb_facts_test.yml

@@ -3,17 +3,22 @@
   hosts: localhost
   remote_user: root
 
+  vars:
+    name: ansible-testacc-ali_slb_lb_facts
+
   roles:
+    - vpc
+    - vswitch
     - slb
 
   tasks:
     - name: Retrieving slbs using ids
       ali_slb_lb_facts:
-        ids: '{{slb.load_balancer.id}}'
+        ids: '{{slbpub.load_balancer.id}}'
 
     - name: Create a slb and used to test name_regex
       ali_slb_lb:
-        name: '{{name}}regex-slb'
+        name: '{{name}}regex'
 
     - name: Filter slb using name_regex
       ali_slb_lb_facts:
@@ -33,3 +38,17 @@
         state: absent
       with_items: '{{slbs.load_balancers}}'
 
+    - name: Changed. Deleting vswitches
+      ali_vswitch:
+        vpc_id: '{{ item.vpc_id}}'
+        cidr_block: '{{ item.cidr_block}}'
+        state: absent
+      with_items: '{{vswitches.vswitches}}'
+
+    - name: Changed. Deleting vpcs
+      ali_vpc:
+        name: '{{item.vpc_name}}'
+        cidr_block: '{{item.cidr_block}}'
+        state: absent
+      with_items: '{{vpcs.vpcs}}'
+

tests/ali_slb_lb_test.yml

@@ -3,32 +3,60 @@
   hosts: localhost
   remote_user: root
 
+  vars:
+    name: ansible-testacc-ali_slb_lb
+
   roles:
+    - vpc
+    - vswitch
     - slb
 
   tasks:
     - name: Changed. Modifying internet charge type when C(present)
       ali_slb_lb:
-        name: '{{ slb.load_balancer.name }}'
+        name: '{{ slbpub.load_balancer.name }}'
         internet_charge_type: 'PayByBandwidth'
         bandwidth: 5
 
+    - name: Filter slb using name_regex
+      ali_slb_lb_facts:
+        name_prefix: '{{name}}'
+      register: slbs
+
     - name: Changed. Stop slb instance when C(stopped)
       ali_slb_lb:
-        name: '{{ slb.load_balancer.name }}'
+        name: '{{ item.name }}'
         state: stopped
+      with_items: '{{slbs.load_balancers}}'
 
     - name: Changed. Running slb instance when C(running)
       ali_slb_lb:
-        name: '{{ slb.load_balancer.name }}'
+        name: '{{ item.name }}'
         state: running
+      with_items: '{{slbs.load_balancers}}'
 
     - name: No Changed. There is no changed when C(running)
       ali_slb_lb:
-        name: '{{ slb.load_balancer.name }}'
+        name: '{{ item.name }}'
         state: running
+      with_items: '{{slbs.load_balancers}}'
 
     - name: Changed. Delete slb instance when C(absent)
       ali_slb_lb:
-        name: '{{ slb.load_balancer.name }}'
-        state: absent
+        name: '{{ item.name }}'
+        state: absent
+      with_items: '{{slbs.load_balancers}}'
+
+    - name: Changed. Deleting vswitches
+      ali_vswitch:
+        vpc_id: '{{ item.vpc_id}}'
+        cidr_block: '{{ item.cidr_block}}'
+        state: absent
+      with_items: '{{vswitches.vswitches}}'
+
+    - name: Changed. Deleting vpcs
+      ali_vpc:
+        name: '{{item.vpc_name}}'
+        cidr_block: '{{item.cidr_block}}'
+        state: absent
+      with_items: '{{vpcs.vpcs}}'

tests/ali_slb_vsg_facts_test.yml

@@ -4,13 +4,13 @@
   remote_user: root
   vars:
     number_of_instances: 2
-    name: ansible-testacc-ali_slb_vsg_facts
+    name: ansible-testacc-ali_slb_vsg_facts-module
   roles:
     - vpc
     - vswitch
     - security_group
-    - slb
     - instance
+    - slb
 
   tasks:
     - name: Changed. Create a VServer Group in public SLB
@@ -76,6 +76,14 @@
         force: True
         state: absent
 
+    - name: Changed. Deleting security groups
+      ali_security_group:
+        name: '{{ item.group_name }}'
+        vpc_id: '{{item.vpc_id}}'
+        state: absent
+      with_items: '{{sgs.groups}}'
+      when: sgs.groups
+
     - name: Changed. Deleting vswitches
       ali_vswitch:
         vpc_id: '{{ item.vpc_id}}'

tests/ali_slb_vsg_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
   vars:
     number_of_instances: 4
-    name: ansible-testacc-ali_slb_vsg
+    name: ansible-testacc-ali_slb_vsg-module
   roles:
     - vpc
     - vswitch
@@ -198,6 +198,14 @@
         force: True
         state: absent
 
+    - name: Changed. Deleting security groups
+      ali_security_group:
+        name: '{{ item.group_name }}'
+        vpc_id: '{{item.vpc_id}}'
+        state: absent
+      with_items: '{{sgs.groups}}'
+      when: sgs.groups
+
     - name: Changed. Deleting vswitches
       ali_vswitch:
         vpc_id: '{{ item.vpc_id}}'

tests/ali_vpc_facts_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_vpc_facts
+    name: ansible-testacc-ali_vpc_facts-module
 
   roles:
     - vpc

tests/ali_vpc_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_vpc
+    name: ansible-testacc-ali_vpc-module
 
   roles:
     - vpc

tests/ali_vswitch_facts_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_vswitch_facts
+    name: ansible-testacc-ali_vswitch_facts-module
 
   roles:
     - vpc

tests/ali_vswitch_test.yml

@@ -4,7 +4,7 @@
   remote_user: root
 
   vars:
-    name: ansible-testacc-ali_vswitch
+    name: ansible-testacc-ali_vswitch-module
 
   roles:
     - vpc