improve(vpc): Add tags param

alibaba · Nov 8, 2019 · 41c5f45 · 41c5f45
1 parent 290dbf5
commit 41c5f45
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 19 deletions.
diff --git a/lib/ansible/modules/cloud/alicloud/ali_eip.py b/lib/ansible/modules/cloud/alicloud/ali_eip.py
@@ -350,6 +350,7 @@ def main():
         try:
             if eip.remove_tags(tags):
                 changed = True
+            module.exit_json(changed=changed, eip=eip.get().read())
         except Exception as e:
             module.fail_json(msg="{0}".format(e))
 

diff --git a/lib/ansible/modules/cloud/alicloud/ali_vpc.py b/lib/ansible/modules/cloud/alicloud/ali_vpc.py
@@ -294,6 +294,7 @@ def main():
         try:
             if vpc.remove_tags(tags):
                 changed = True
+            module.exit_json(changed=changed, vpc=vpc.get().read())
         except Exception as e:
             module.fail_json(msg="{0}".format(e))
 

diff --git a/lib/ansible/modules/cloud/alicloud/ali_vswitch.py b/lib/ansible/modules/cloud/alicloud/ali_vswitch.py
@@ -269,6 +269,7 @@ def main():
         try:
             if vswitch.remove_tags(tags):
                 changed = True
+            module.exit_json(changed=changed, vswitch=vswitch.get().read())
         except Exception as e:
             module.fail_json(msg="{0}".format(e))
 

diff --git a/tests/ali_eip_test.yml b/tests/ali_eip_test.yml
@@ -110,6 +110,10 @@
         tags:
           Test1: "add1"
 
+    - name: Get the existing eip
+      ali_eip_info:
+        name_prefix: '{{name}}'
+
     - name: Changed. Modify Tags.
       ali_eip:
         ip_address: "{{ eip.eip.ip_address }}"
@@ -124,13 +128,29 @@
           Test1: "add1"
           Test2: "add3"
 
+    - name: Get the existing eip
+      ali_eip_info:
+        name_prefix: '{{name}}'
+
     - name: Changed. Removing tags.
       ali_eip:
         ip_address: "{{ eip.eip.ip_address }}"
         purge_tags: True
         tags:
           Test1: "add1"
 
+    - name: No Changed. No tags need to be removed.
+      ali_eip:
+        ip_address: "{{ eip.eip.ip_address }}"
+        purge_tags: True
+        tags:
+          Test1: "add1"
+
+    - name: Get the existing eip
+      ali_eip_info:
+        name_prefix: '{{name}}'
+      register: eips
+
     - name: Changed. Release ips.
       ali_eip:
         ip_address: "{{ eip.eip.ip_address }}"

diff --git a/tests/ali_vpc_test.yml b/tests/ali_vpc_test.yml
@@ -41,6 +41,10 @@
           Test2: "add2"
       with_items: '{{vpcs.vpcs}}'
 
+    - name: Get the existing vpc
+      ali_vpc_info:
+        name_prefix: '{{name}}'
+
     - name: Filter vpc using tags
       ali_vpc_info:
         tags:
@@ -64,6 +68,10 @@
           Test2: "add3"
       with_items: '{{vpcs.vpcs}}'
 
+    - name: Get the existing vpc
+      ali_vpc_info:
+        name_prefix: '{{name}}'
+
     - name: Changed. Removing tags.
       ali_vpc:
         cidr_block: '{{ vpc_cidr }}'
@@ -73,28 +81,41 @@
           Test1: "add1"
       with_items: '{{vpcs.vpcs}}'
 
-    - name: Changed. Modify description.
+    - name: No Changed. No tags need to be removed.
       ali_vpc:
         cidr_block: '{{ vpc_cidr }}'
         name: '{{ item.vpc_name }}'
-        description: '{{ vpc_description }}-modified'
-      with_items: '{{vpcs.vpcs}}'
-
-    - name: Not Changed. No any attribute changed.
-      ali_vpc:
-        cidr_block: '{{ vpc_cidr }}'
-        name: '{{ item.vpc_name }}'
-        description: '{{ vpc_description }}-modified'
+        purge_tags: True
+        tags:
+          Test1: "add1"
       with_items: '{{vpcs.vpcs}}'
 
     - name: Get the existing vpc
       ali_vpc_info:
         name_prefix: '{{name}}'
-      register: vpcs
-
-    - name: Changed. Deleting vpcs
-      ali_vpc:
-        cidr_block: '{{ item.cidr_block }}'
-        name: '{{ item.vpc_name }}'
-        state: absent
-      with_items: '{{vpcs.vpcs}}'
+#
+#    - name: Changed. Modify description.
+#      ali_vpc:
+#        cidr_block: '{{ vpc_cidr }}'
+#        name: '{{ item.vpc_name }}'
+#        description: '{{ vpc_description }}-modified'
+#      with_items: '{{vpcs.vpcs}}'
+#
+#    - name: Not Changed. No any attribute changed.
+#      ali_vpc:
+#        cidr_block: '{{ vpc_cidr }}'
+#        name: '{{ item.vpc_name }}'
+#        description: '{{ vpc_description }}-modified'
+#      with_items: '{{vpcs.vpcs}}'
+#
+#    - name: Get the existing vpc
+#      ali_vpc_info:
+#        name_prefix: '{{name}}'
+#      register: vpcs
+#
+#    - name: Changed. Deleting vpcs
+#      ali_vpc:
+#        cidr_block: '{{ item.cidr_block }}'
+#        name: '{{ item.vpc_name }}'
+#        state: absent
+#      with_items: '{{vpcs.vpcs}}'
diff --git a/tests/ali_vswitch_test.yml b/tests/ali_vswitch_test.yml
@@ -32,6 +32,13 @@
         tags:
           Test1: "add1"
 
+    - name: Get the existing vswitch
+      ali_vswitch_info:
+        name_prefix: '{{ name }}'
+        filters:
+          vpc_id: '{{vpc.vpc.id}}'
+      register: vswitches
+
     - name: Changed. Modify Tags.
       ali_vswitch:
         vpc_id: '{{ item.vpc_id}}'
@@ -50,6 +57,13 @@
           Test2: "add3"
       with_items: '{{vswitches.vswitches}}'
 
+    - name: Get the existing vswitch
+      ali_vswitch_info:
+        name_prefix: '{{ name }}'
+        filters:
+          vpc_id: '{{vpc.vpc.id}}'
+      register: vswitches
+
     - name: Changed. Removing tags.
       ali_vswitch:
         vpc_id: '{{ item.vpc_id}}'
@@ -59,6 +73,22 @@
           Test1: "add1"
       with_items: '{{vswitches.vswitches}}'
 
+    - name: No Changed. No tags need to be removed.
+      ali_vswitch:
+        vpc_id: '{{ item.vpc_id}}'
+        cidr_block: '{{ item.cidr_block}}'
+        purge_tags: True
+        tags:
+          Test1: "add1"
+      with_items: '{{vswitches.vswitches}}'
+
+    - name: Get the existing vswitch
+      ali_vswitch_info:
+        name_prefix: '{{ name }}'
+        filters:
+          vpc_id: '{{vpc.vpc.id}}'
+      register: vswitches
+
     - name: Changed. Modify description.
       ali_vswitch:
         vpc_id: '{{ item.vpc_id}}'

diff --git a/tests/group_vars/all b/tests/group_vars/all
@@ -4,7 +4,7 @@ availability_zone: cn-beijing-c
 name: ansible-testAcc
 description: "Test ansible module "
 tags: {For: testAcc, Created: Ansible, From: provider/tests}
-policy: '{"Statement": [{"Action": ["*"],"Effect": "Allow","Resource": "*"}],"Version": "1"}'
+assume_role_policy: '{"Statement": [{"Action": ["*"],"Effect": "Allow","Resource": "*"}],"Version": "1"}'
 
 # create vpc parameters
 vpc_cidr: "172.16.0.0/12"

diff --git a/tests/roles/instance/tasks/main.yml b/tests/roles/instance/tasks/main.yml
@@ -33,7 +33,7 @@
 
     tags: '{{ tags }}'
     ram_role_name: '{{ ram_role_name }}'
-    policy: '{{ policy }}'
+    assume_role_policy: '{{ assume_role_policy }}'
   when: not instances.instances
 
 - name: Get the existing ECS instances