diff --git a/lib/ansible/modules/network/fortios/fortios_system_vdom_dns.py b/lib/ansible/modules/network/fortios/fortios_system_vdom_dns.py
new file mode 100644
index 00000000000..1d36d828c9e
--- /dev/null
+++ b/lib/ansible/modules/network/fortios/fortios_system_vdom_dns.py
@@ -0,0 +1,324 @@
+#!/usr/bin/python
+from __future__ import (absolute_import, division, print_function)
+# Copyright 2019 Fortinet, Inc.
+#
+# This program 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.
+#
+# This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
+
+__metaclass__ = type
+
+ANSIBLE_METADATA = {'status': ['preview'],
+ 'supported_by': 'community',
+ 'metadata_version': '1.1'}
+
+DOCUMENTATION = '''
+---
+module: fortios_system_vdom_dns
+short_description: Configure DNS servers for a non-management VDOM in Fortinet's FortiOS and FortiGate.
+description:
+ - This module is able to configure a FortiGate or FortiOS (FOS) device by allowing the
+ user to set and modify system feature and vdom_dns category.
+ Examples include all parameters and values need to be adjusted to datasources before usage.
+ Tested with FOS v6.0.5
+version_added: "2.9"
+author:
+ - Miguel Angel Munoz (@mamunozgonzalez)
+ - Nicolas Thomas (@thomnico)
+notes:
+ - Requires fortiosapi library developed by Fortinet
+ - Run as a local_action in your playbook
+requirements:
+ - fortiosapi>=0.9.8
+options:
+ host:
+ description:
+ - FortiOS or FortiGate IP address.
+ type: str
+ required: false
+ username:
+ description:
+ - FortiOS or FortiGate username.
+ type: str
+ required: false
+ password:
+ description:
+ - FortiOS or FortiGate password.
+ type: str
+ default: ""
+ vdom:
+ description:
+ - Virtual domain, among those defined previously. A vdom is a
+ virtual instance of the FortiGate that can be configured and
+ used as a different unit.
+ type: str
+ default: root
+ https:
+ description:
+ - Indicates if the requests towards FortiGate must use HTTPS protocol.
+ type: bool
+ default: true
+ ssl_verify:
+ description:
+ - Ensures FortiGate certificate must be verified by a proper CA.
+ type: bool
+ default: true
+ system_vdom_dns:
+ description:
+ - Configure DNS servers for a non-management VDOM.
+ default: null
+ type: dict
+ suboptions:
+ ip6_primary:
+ description:
+ - Primary IPv6 DNS server IP address for the VDOM.
+ type: str
+ ip6_secondary:
+ description:
+ - Secondary IPv6 DNS server IP address for the VDOM.
+ type: str
+ primary:
+ description:
+ - Primary DNS server IP address for the VDOM.
+ type: str
+ secondary:
+ description:
+ - Secondary DNS server IP address for the VDOM.
+ type: str
+ source_ip:
+ description:
+ - Source IP for communications with the DNS server.
+ type: str
+ vdom_dns:
+ description:
+ - Enable/disable configuring DNS servers for the current VDOM.
+ type: str
+ choices:
+ - enable
+ - disable
+'''
+
+EXAMPLES = '''
+- hosts: localhost
+ vars:
+ host: "192.168.122.40"
+ username: "admin"
+ password: ""
+ vdom: "root"
+ ssl_verify: "False"
+ tasks:
+ - name: Configure DNS servers for a non-management VDOM.
+ fortios_system_vdom_dns:
+ host: "{{ host }}"
+ username: "{{ username }}"
+ password: "{{ password }}"
+ vdom: "{{ vdom }}"
+ https: "False"
+ system_vdom_dns:
+ ip6_primary: "<your_own_value>"
+ ip6_secondary: "<your_own_value>"
+ primary: "<your_own_value>"
+ secondary: "<your_own_value>"
+ source_ip: "84.230.14.43"
+ vdom_dns: "enable"
+'''
+
+RETURN = '''
+build:
+ description: Build number of the fortigate image
+ returned: always
+ type: str
+ sample: '1547'
+http_method:
+ description: Last method used to provision the content into FortiGate
+ returned: always
+ type: str
+ sample: 'PUT'
+http_status:
+ description: Last result given by FortiGate on last operation applied
+ returned: always
+ type: str
+ sample: "200"
+mkey:
+ description: Master key (id) used in the last call to FortiGate
+ returned: success
+ type: str
+ sample: "id"
+name:
+ description: Name of the table used to fulfill the request
+ returned: always
+ type: str
+ sample: "urlfilter"
+path:
+ description: Path of the table used to fulfill the request
+ returned: always
+ type: str
+ sample: "webfilter"
+revision:
+ description: Internal revision number
+ returned: always
+ type: str
+ sample: "17.0.2.10658"
+serial:
+ description: Serial number of the unit
+ returned: always
+ type: str
+ sample: "FGVMEVYYQT3AB5352"
+status:
+ description: Indication of the operation's result
+ returned: always
+ type: str
+ sample: "success"
+vdom:
+ description: Virtual domain used
+ returned: always
+ type: str
+ sample: "root"
+version:
+ description: Version of the FortiGate
+ returned: always
+ type: str
+ sample: "v5.6.3"
+
+'''
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.connection import Connection
+from ansible.module_utils.network.fortios.fortios import FortiOSHandler
+from ansible.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG
+
+
+def login(data, fos):
+ host = data['host']
+ username = data['username']
+ password = data['password']
+ ssl_verify = data['ssl_verify']
+
+ fos.debug('on')
+ if 'https' in data and not data['https']:
+ fos.https('off')
+ else:
+ fos.https('on')
+
+ fos.login(host, username, password, verify=ssl_verify)
+
+
+def filter_system_vdom_dns_data(json):
+ option_list = ['ip6_primary', 'ip6_secondary', 'primary',
+ 'secondary', 'source_ip', 'vdom_dns']
+ dictionary = {}
+
+ for attribute in option_list:
+ if attribute in json and json[attribute] is not None:
+ dictionary[attribute] = json[attribute]
+
+ return dictionary
+
+
+def underscore_to_hyphen(data):
+ if isinstance(data, list):
+ for elem in data:
+ elem = underscore_to_hyphen(elem)
+ elif isinstance(data, dict):
+ new_data = {}
+ for k, v in data.items():
+ new_data[k.replace('_', '-')] = underscore_to_hyphen(v)
+ data = new_data
+
+ return data
+
+
+def system_vdom_dns(data, fos):
+ vdom = data['vdom']
+ system_vdom_dns_data = data['system_vdom_dns']
+ filtered_data = underscore_to_hyphen(filter_system_vdom_dns_data(system_vdom_dns_data))
+
+ return fos.set('system',
+ 'vdom-dns',
+ data=filtered_data,
+ vdom=vdom)
+
+
+def is_successful_status(status):
+ return status['status'] == "success" or \
+ status['http_method'] == "DELETE" and status['http_status'] == 404
+
+
+def fortios_system(data, fos):
+
+ if data['system_vdom_dns']:
+ resp = system_vdom_dns(data, fos)
+
+ return not is_successful_status(resp), \
+ resp['status'] == "success", \
+ resp
+
+
+def main():
+ fields = {
+ "host": {"required": False, "type": "str"},
+ "username": {"required": False, "type": "str"},
+ "password": {"required": False, "type": "str", "default": "", "no_log": True},
+ "vdom": {"required": False, "type": "str", "default": "root"},
+ "https": {"required": False, "type": "bool", "default": True},
+ "ssl_verify": {"required": False, "type": "bool", "default": True},
+ "system_vdom_dns": {
+ "required": False, "type": "dict", "default": None,
+ "options": {
+ "ip6_primary": {"required": False, "type": "str"},
+ "ip6_secondary": {"required": False, "type": "str"},
+ "primary": {"required": False, "type": "str"},
+ "secondary": {"required": False, "type": "str"},
+ "source_ip": {"required": False, "type": "str"},
+ "vdom_dns": {"required": False, "type": "str",
+ "choices": ["enable", "disable"]}
+
+ }
+ }
+ }
+
+ module = AnsibleModule(argument_spec=fields,
+ supports_check_mode=False)
+
+ # legacy_mode refers to using fortiosapi instead of HTTPAPI
+ legacy_mode = 'host' in module.params and module.params['host'] is not None and \
+ 'username' in module.params and module.params['username'] is not None and \
+ 'password' in module.params and module.params['password'] is not None
+
+ if not legacy_mode:
+ if module._socket_path:
+ connection = Connection(module._socket_path)
+ fos = FortiOSHandler(connection)
+
+ is_error, has_changed, result = fortios_system(module.params, fos)
+ else:
+ module.fail_json(**FAIL_SOCKET_MSG)
+ else:
+ try:
+ from fortiosapi import FortiOSAPI
+ except ImportError:
+ module.fail_json(msg="fortiosapi module is required")
+
+ fos = FortiOSAPI()
+
+ login(module.params, fos)
+ is_error, has_changed, result = fortios_system(module.params, fos)
+ fos.logout()
+
+ if not is_error:
+ module.exit_json(changed=has_changed, meta=result)
+ else:
+ module.fail_json(msg="Error in repo", meta=result)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/test/units/modules/network/fortios/test_fortios_system_vdom_dns.py b/test/units/modules/network/fortios/test_fortios_system_vdom_dns.py
new file mode 100644
index 00000000000..35484cd53b1
--- /dev/null
+++ b/test/units/modules/network/fortios/test_fortios_system_vdom_dns.py
@@ -0,0 +1,191 @@
+# Copyright 2019 Fortinet, Inc.
+#
+# This program 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.
+#
+# This program 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 <https://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import os
+import json
+import pytest
+from mock import ANY
+from ansible.module_utils.network.fortios.fortios import FortiOSHandler
+
+try:
+ from ansible.modules.network.fortios import fortios_system_vdom_dns
+except ImportError:
+ pytest.skip("Could not load required modules for testing", allow_module_level=True)
+
+
+@pytest.fixture(autouse=True)
+def connection_mock(mocker):
+ connection_class_mock = mocker.patch('ansible.modules.network.fortios.fortios_system_vdom_dns.Connection')
+ return connection_class_mock
+
+
+fos_instance = FortiOSHandler(connection_mock)
+
+
+def test_system_vdom_dns_creation(mocker):
+ schema_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.schema')
+
+ set_method_result = {'status': 'success', 'http_method': 'POST', 'http_status': 200}
+ set_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.set', return_value=set_method_result)
+
+ input_data = {
+ 'username': 'admin',
+ 'state': 'present',
+ 'system_vdom_dns': {
+ 'ip6_primary': 'test_value_3',
+ 'ip6_secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source_ip': '84.230.14.7',
+ 'vdom_dns': 'enable'
+ },
+ 'vdom': 'root'}
+
+ is_error, changed, response = fortios_system_vdom_dns.fortios_system(input_data, fos_instance)
+
+ expected_data = {
+ 'ip6-primary': 'test_value_3',
+ 'ip6-secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source-ip': '84.230.14.7',
+ 'vdom-dns': 'enable'
+ }
+
+ set_method_mock.assert_called_with('system', 'vdom-dns', data=expected_data, vdom='root')
+ schema_method_mock.assert_not_called()
+ assert not is_error
+ assert changed
+ assert response['status'] == 'success'
+ assert response['http_status'] == 200
+
+
+def test_system_vdom_dns_creation_fails(mocker):
+ schema_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.schema')
+
+ set_method_result = {'status': 'error', 'http_method': 'POST', 'http_status': 500}
+ set_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.set', return_value=set_method_result)
+
+ input_data = {
+ 'username': 'admin',
+ 'state': 'present',
+ 'system_vdom_dns': {
+ 'ip6_primary': 'test_value_3',
+ 'ip6_secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source_ip': '84.230.14.7',
+ 'vdom_dns': 'enable'
+ },
+ 'vdom': 'root'}
+
+ is_error, changed, response = fortios_system_vdom_dns.fortios_system(input_data, fos_instance)
+
+ expected_data = {
+ 'ip6-primary': 'test_value_3',
+ 'ip6-secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source-ip': '84.230.14.7',
+ 'vdom-dns': 'enable'
+ }
+
+ set_method_mock.assert_called_with('system', 'vdom-dns', data=expected_data, vdom='root')
+ schema_method_mock.assert_not_called()
+ assert is_error
+ assert not changed
+ assert response['status'] == 'error'
+ assert response['http_status'] == 500
+
+
+def test_system_vdom_dns_idempotent(mocker):
+ schema_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.schema')
+
+ set_method_result = {'status': 'error', 'http_method': 'DELETE', 'http_status': 404}
+ set_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.set', return_value=set_method_result)
+
+ input_data = {
+ 'username': 'admin',
+ 'state': 'present',
+ 'system_vdom_dns': {
+ 'ip6_primary': 'test_value_3',
+ 'ip6_secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source_ip': '84.230.14.7',
+ 'vdom_dns': 'enable'
+ },
+ 'vdom': 'root'}
+
+ is_error, changed, response = fortios_system_vdom_dns.fortios_system(input_data, fos_instance)
+
+ expected_data = {
+ 'ip6-primary': 'test_value_3',
+ 'ip6-secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source-ip': '84.230.14.7',
+ 'vdom-dns': 'enable'
+ }
+
+ set_method_mock.assert_called_with('system', 'vdom-dns', data=expected_data, vdom='root')
+ schema_method_mock.assert_not_called()
+ assert not is_error
+ assert not changed
+ assert response['status'] == 'error'
+ assert response['http_status'] == 404
+
+
+def test_system_vdom_dns_filter_foreign_attributes(mocker):
+ schema_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.schema')
+
+ set_method_result = {'status': 'success', 'http_method': 'POST', 'http_status': 200}
+ set_method_mock = mocker.patch('ansible.module_utils.network.fortios.fortios.FortiOSHandler.set', return_value=set_method_result)
+
+ input_data = {
+ 'username': 'admin',
+ 'state': 'present',
+ 'system_vdom_dns': {
+ 'random_attribute_not_valid': 'tag',
+ 'ip6_primary': 'test_value_3',
+ 'ip6_secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source_ip': '84.230.14.7',
+ 'vdom_dns': 'enable'
+ },
+ 'vdom': 'root'}
+
+ is_error, changed, response = fortios_system_vdom_dns.fortios_system(input_data, fos_instance)
+
+ expected_data = {
+ 'ip6-primary': 'test_value_3',
+ 'ip6-secondary': 'test_value_4',
+ 'primary': 'test_value_5',
+ 'secondary': 'test_value_6',
+ 'source-ip': '84.230.14.7',
+ 'vdom-dns': 'enable'
+ }
+
+ set_method_mock.assert_called_with('system', 'vdom-dns', data=expected_data, vdom='root')
+ schema_method_mock.assert_not_called()
+ assert not is_error
+ assert changed
+ assert response['status'] == 'success'
+ assert response['http_status'] == 200