improve (dns): support domain group manage and modify ali_dns_domain

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

@@ -31,16 +31,16 @@
 short_description: Configure Alibaba Cloud DNS (DNS)
 description:
     - Create, Delete Alicloud cloud DNS(DNS).
-      It supports updating DNS remark.
+      It supports updating DNS remark and change domain group.
 options:
   domain_name:
     description:
       -  The name to give your DNS.
     required: True
     aliases: ['name']
-  group_id:
+  group_name:
     description:
-      - Domain name group, which is, by default, the GroupId of the “Default Group”.
+      - Specify name of group, when change domain group.
   lang:
     description:
       - The language which you choose
@@ -80,6 +80,11 @@
     domain_name: '{{ domain_name }}'
     remark: 'new--{{ remark }}'
 
+- name: Changed. change domain group.
+  ali_dns_domain:
+    domain_name: '{{ domain_name }}'
+    group_name: '{{ group_name }}'
+
 - name: Changed. Deleting dns
   ali_dns_domain:
     domain_name: '{{ domain_name }}'
@@ -191,7 +196,7 @@ def main():
     argument_spec = ecs_argument_spec()
     argument_spec.update(dict(
         domain_name=dict(type='str', aliases=['name'], required=True),
-        group_id=dict(type='str'),
+        group_name=dict(type='str'),
         lang=dict(type='str'),
         resource_group_id=dict(type='str'),
         remark=dict(type='str'),
@@ -210,6 +215,7 @@ def main():
     state = module.params['state']
     domain_name = module.params['domain_name']
     remark = module.params['remark']
+    group_name = module.params['group_name']
     changed = False
 
     # Check if VPC exists
@@ -232,6 +238,14 @@ def main():
         except DNSResponseError as e:
             module.fail_json(msg='Unable to create dns, error: {0}'.format(e))
 
+    if domain_name and group_name:
+        try:
+            res = dns.change_domain_group(group_name=group_name, domain_name=domain_name)
+            if res:
+                changed = True
+        except DNSResponseError as e:
+            module.fail_json(msg='Unable to change domain group, error: {0}'.format(e))
+
     if remark:
         try:
             res = dns.modify_remark(remark=remark)

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

@@ -0,0 +1,186 @@
+#!/usr/bin/python
+# Copyright (c) 2017 Alibaba Group Holding Limited. He Guimin <[email protected]>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible. If not, see http://www.gnu.org/licenses/.
+
+
+__metaclass__ = type
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+DOCUMENTATION = """
+---
+module: ali_dns_group
+version_added: "2.8"
+short_description: Configure Alibaba Cloud DNS (DNS)
+description:
+    - Create, Delete Alicloud cloud DNS group(DNS group).
+      It supports updating group name.
+options:
+  lang:
+    description:
+      - The language which you choose
+  group_name:
+    description:
+      - Give the name of group when create DNS group and Use this parameter to guarantee idempotence.
+    aliases: ['name']
+  state:
+    description:
+      -  Whether or not to create, delete DNS group.
+    choices: ['present', 'absent']
+    default: 'present'
+  new_group_name:
+    description:
+      -  Give new group name, when update group name.
+    aliases: ['new_name']
+requirements:
+    - "python >= 3.6"
+    - "footmark >= 1.15.0"
+extends_documentation_fragment:
+    - alicloud
+author:
+  - "He Guimin (@xiaozhu36)"
+"""
+
+EXAMPLES = """
+# Note: These examples do not set authentication details, see the Alibaba Cloud Guide for details.
+- name: Changed. Create dns group.
+  ali_dns_group:
+    group_name: '{{ group_name }}'
+
+- name: Changed. Update dns group name.
+  ali_dns_group:
+    group_name: '{{ group_name }}'
+    new_group_name: '{{ new_group_name }}'
+"""
+
+RETURN = '''
+groups:
+    description: info about the DNS group that was created or deleted
+    returned: always
+    type: complex
+    contains:
+        count:
+            description: alias of 'domain_count'.
+            returned: always
+            type: int
+            sample: 0
+        domain_count:
+            description: Number of domain names in the group .
+            returned: always
+            type: dict
+            returned: always
+            type: int
+            sample: 0
+        group_id:
+            description: The id of group.
+            returned: always
+            type: string
+            sample: xxxxxxxxxx
+        id:
+            description: alias of 'group_id'.
+            returned: always
+            type: string
+            sample: xxxxxxxxxx
+        group_name:
+            description: Name of group.
+            returned: always
+            type: string
+            sample: ansible_test
+'''
+
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.alicloud_ecs import ecs_argument_spec, dns_connect
+
+HAS_FOOTMARK = False
+
+try:
+    from footmark.exception import DNSResponseError
+    HAS_FOOTMARK = True
+except ImportError:
+    HAS_FOOTMARK = False
+
+
+def dns_group_exists(module, dns_conn, group_id, group_name):
+    matching_dns = []
+    try:
+        for v in dns_conn.describe_domain_groups():
+            if v.name == group_name:
+                matching_dns.append(v)
+    except Exception as e:
+        module.fail_json(msg="Failed to describe DNS group: {0}".format(e))
+    if matching_dns:
+        return matching_dns[0]
+
+
+def main():
+    argument_spec = ecs_argument_spec()
+    argument_spec.update(dict(
+        group_name=dict(type='str', aliases=['name']),
+        lang=dict(type='str'),
+        state=dict(default='present', choices=['present', 'absent']),
+        new_group_name=dict(type='str', aliases=['new_name']),
+    ))
+
+    module = AnsibleModule(argument_spec=argument_spec)
+
+    if HAS_FOOTMARK is False:
+        module.fail_json(msg='footmark required for the module ali_dns_group.')
+
+    dns_conn = dns_connect(module)
+
+    # Get values of variable
+    state = module.params['state']
+    group_name = module.params['group_name']
+    new_group_name = module.params['new_group_name']
+    changed = False
+
+    dns_group = dns_group_exists(module, dns_conn,group_name)
+
+    if state == 'absent':
+        if not dns_group:
+            module.exit_json(changed=changed, groups={})
+        try:
+            module.exit_json(changed=dns_group.delete(), groups={})
+        except DNSResponseError as ex:
+            module.fail_json(msg='Unable to delete dns group{0}, error: {1}'.format(dns_group.id, ex))
+
+    if not dns_group:
+        params = module.params
+        try:
+            dns_group = dns_conn.add_domain_group(**params)
+            if dns_group:
+                changed = True
+            module.exit_json(changed=changed, groups=dns_group.get().read())
+        except DNSResponseError as e:
+            module.fail_json(msg='Unable to create dns group, error: {0}'.format(e))
+
+    if new_group_name and group_name:
+        try:
+            res = dns_group.update_domain_group(new_group_name=new_group_name, group_name=group_name)
+            if res:
+                changed = True
+        except DNSResponseError as e:
+            module.fail_json(msg='Unable to update domain group, error: {0}'.format(e))
+    module.exit_json(changed=changed, groups=dns_group.read())
+
+
+if __name__ == '__main__':
+    main()