Improve module ali_vpc and ali_security_group multi_ok

CHANGELOG.md

@@ -7,6 +7,7 @@ FEATURES:
 
 IMPROVEMENTS:
 
+- 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))
 - Improve module ali_slb_lb and ali_slb_lb_facts ([#147](https://github.com/alibaba/ansible-provider/pull/147))
 - Improve ecs instance and eni docs ([#146](https://github.com/alibaba/ansible-provider/pull/146))

lib/ansible/modules/cloud/alicloud/ali_security_group.py

@@ -303,6 +303,8 @@ def group_exists(conn, module, vpc_id, name, multi, recent):
     When supplied with a vpc_id and Name, it will check them to determine if it is a match
     otherwise it will assume the Security Group does not exist and thus return None.
     """
+    if multi:
+        return None
     matching_groups = []
     filters = {}
     if vpc_id:
@@ -317,9 +319,7 @@ def group_exists(conn, module, vpc_id, name, multi, recent):
     if len(matching_groups) == 1:
         return matching_groups[0]
     elif len(matching_groups) > 1:
-        if multi:
-            return None
-        elif recent:
+        if recent:
             return matching_groups[-1]
         module.fail_json(msg='Currently there are {0} Security Groups that have the same name and '
                              'vpc id you specified. If you would like to create anyway '

lib/ansible/modules/cloud/alicloud/ali_vpc.py

@@ -31,7 +31,7 @@
 short_description: Configure Alibaba Cloud virtual private cloud(VPC)
 description:
     - Create, Delete Alicloud virtual private cloud(VPC).
-      It support updating VPC description.
+      It supports updating VPC description.
 options:
   state:
     description:
@@ -192,6 +192,8 @@ def vpc_exists(module, vpc, name, cidr_block, multi, recent):
     with a CIDR and Name, it will check them to determine if it is a match
     otherwise it will assume the VPC does not exist and thus return None.
     """
+    if multi:
+        return None
     matching_vpcs = []
     try:
         for v in vpc.describe_vpcs():
@@ -203,9 +205,7 @@ def vpc_exists(module, vpc, name, cidr_block, multi, recent):
     if len(matching_vpcs) == 1:
         return matching_vpcs[0]
     elif len(matching_vpcs) > 1:
-        if multi:
-            return None
-        elif recent:
+        if recent:
             return matching_vpcs[-1]
         module.fail_json(msg='Currently there are {0} VPCs that have the same name and '
                              'CIDR block you specified. If you would like to create '

tests/ali_eni_facts_test.yml

@@ -1,24 +1,27 @@
 ---
-- name: Validate module ali_instance
+- name: Validate module ali_eni_facts
   hosts: localhost
   remote_user: root
 
+  vars:
+    name: ansible-testacc-ali_eni_facts
+
   roles:
     - vpc
     - vswitch
     - security_group
     - network_interface
 
   tasks:
-    - name: Retrieving instances using eni_ids
+    - name: Retrieving enis using eni_ids
       ali_eni_facts:
         eni_ids: '{{ enis.ids}}'
 
     - name: Add two new enis and used to test name_regex and tags
       ali_eni:
         vswitch_id: '{{ vswitches.vswitches.0.id }}'
         security_groups: ['{{ sgs.groups.0.id }}']
-        name: '{{ name }}regex--ali_eni'
+        name: '{{ name }}regex'
         description: '{{description}}-name-regex-ali_eni'
         tags:
           Test: tags
@@ -32,10 +35,10 @@
         tags:
           Test: tags
 
-    - name: Retrieving all instances
+    - name: Retrieving all enis
       ali_eni_facts:
 
-    - name: Retrieving all instances based on name_regex
+    - name: Retrieving all enis based on name_regex
       ali_eni_facts:
         name_prefix: '{{name}}'
       register: enis
@@ -49,19 +52,22 @@
 
     - name: Changed. Deleting security groups
       ali_security_group:
-        group_id: '{{item}}'
+        name: '{{ item.group_name }}'
+        vpc_id: '{{item.vpc_id}}'
         state: absent
-      with_items: '{{sgs.ids}}'
+      with_items: '{{sgs.groups}}'
 
     - name: Changed. Deleting vswitches
       ali_vswitch:
-        id: '{{item}}'
+        vpc_id: '{{ item.vpc_id}}'
+        cidr_block: '{{ item.cidr_block}}'
         state: absent
-      with_items: '{{vswitches.ids}}'
+      with_items: '{{vswitches.vswitches}}'
 
     - name: Changed. Deleting vpcs
       ali_vpc:
-        vpc_id: '{{item}}'
+        name: '{{item.vpc_name}}'
+        cidr_block: '{{item.cidr_block}}'
         state: absent
-      with_items: '{{vpcs.ids}}'
+      with_items: '{{vpcs.vpcs}}'
 

tests/ali_eni_test.yml

@@ -1,8 +1,11 @@
 ---
-- name: Validate module ali_instance
+- name: Validate module ali_eni
   hosts: localhost
   remote_user: root
 
+  vars:
+    name: ansible-testacc-ali_eni
+
   roles:
     - vpc
     - vswitch
@@ -14,27 +17,27 @@
     - name: Changed. Modifying name.
       ali_eni:
         id: '{{ item}}'
-        name: '{{ name }}-ali_eni-modified'
+        name: '{{ name }}-modified'
       with_items: '{{enis.ids}}'
 
     - name: Changed. Modifying description.
       ali_eni:
         id: '{{ item}}'
-        description: '{{description}}ali_eni-modified'
+        description: '{{description}}-modified'
       with_items: '{{enis.ids}}'
 
     - name: No Changed. There is no any attribute changed
       ali_eni:
         id: '{{ item}}'
-        name: '{{ name }}-ali_eni-modified'
-        description: '{{description}}ali_eni-modified'
+        name: '{{ name }}-modified'
+        description: '{{description}}-modified'
       with_items: '{{enis.ids}}'
 
     - name: Changed. Go back init value.
       ali_eni:
         id: '{{item}}'
-        name: '{{ name }}-ali_eni'
-        description: '{{description}}ali_eni'
+        name: '{{ name }}'
+        description: '{{description}}'
       with_items: '{{enis.ids}}'
 
     - name: Creating a new security group
@@ -186,19 +189,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

@@ -2,7 +2,8 @@
 - name: Validate module ali_instance
   hosts: localhost
   remote_user: root
-
+  vars:
+    name: ansible-testacc-ali_security_group_facts
   roles:
     - vpc
     - security_group
@@ -14,7 +15,7 @@
 
     - name: Add a group and used to test name_regex
       ali_security_group:
-        name: '{{name}}regex-vswitch'
+        name: '{{name}}regex'
         description: '{{group_description}} name regex.'
         vpc_id: '{{vpcs.vpcs.0.id}}'
 
@@ -32,13 +33,15 @@
 
     - name: Changed. Deleting security groups
       ali_security_group:
-        id: '{{ item}}'
+        name: '{{ item.group_name }}'
+        vpc_id: '{{item.vpc_id}}'
         state: absent
-      with_items: '{{sgs.ids}}'
+      with_items: '{{sgs.groups}}'
 
     - name: Changed. Deleting vpcs
       ali_vpc:
-        vpc_id: '{{item}}'
+        name: '{{item.vpc_name}}'
+        cidr_block: '{{item.cidr_block}}'
         state: absent
-      with_items: '{{vpcs.ids}}'
+      with_items: '{{vpcs.vpcs}}'