T7391 domain search fix for 1.4+ (#418)

* t7391 init

* sanity

* vyos_system unit test

* added vyos_system v14 test cases

* vyos_system integration tests fix

* changelog

* domain search integration test

* Update plugins/modules/vyos_system.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

4 files changed, 130 insertions, 0 deletions

diff --git a/tests/integration/targets/vyos_system/tests/cli/domain_search.yaml b/tests/integration/targets/vyos_system/tests/cli/domain_search.yaml
new file mode 100644
index 00000000..2422d2c7
--- /dev/null
+++ b/tests/integration/targets/vyos_system/tests/cli/domain_search.yaml
@@ -0,0 +1,43 @@
+---
+- debug: msg="START cli/domain_search.yaml on connection={{ ansible_connection }}"
+
+- name: ensure facts
+  include_tasks: _get_version.yaml
+
+- name: setup
+  ignore_errors: true
+  vyos.vyos.vyos_system:
+    domain_search:
+      - nbg.bufanda.ke
+    state: absent
+
+- name: configure domain search setting
+  register: result
+  vyos.vyos.vyos_system:
+    domain_search:
+      - nbg.bufanda.ke
+
+- assert:
+    that:
+      - result.changed == true
+      - result.commands|length == 1
+      - "{{ merged['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+- name: configure domain search setting
+  register: result
+  vyos.vyos.vyos_system:
+    domain_search:
+      - nbg.bufanda.ke
+
+- assert:
+    that:
+      - result.changed == false
+
+- name: teardown
+  ignore_errors: true
+  vyos.vyos.vyos_system:
+    domain_search:
+      - nbg.bufanda.ke
+    state: absent
+
+- debug: msg="END cli/basic.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_system/vars/pre-v1_4.yaml b/tests/integration/targets/vyos_system/vars/pre-v1_4.yaml
new file mode 100644
index 00000000..cb41c9c6
--- /dev/null
+++ b/tests/integration/targets/vyos_system/vars/pre-v1_4.yaml
@@ -0,0 +1,4 @@
+---
+merged:
+  commands:
+    - set system domain-search domain 'nbg.bufanda.ke'
diff --git a/tests/integration/targets/vyos_system/vars/v1_4.yaml b/tests/integration/targets/vyos_system/vars/v1_4.yaml
new file mode 100644
index 00000000..96f0b7c9
--- /dev/null
+++ b/tests/integration/targets/vyos_system/vars/v1_4.yaml
@@ -0,0 +1,4 @@
+---
+merged:
+  commands:
+    - set system domain-search 'nbg.bufanda.ke'
diff --git a/tests/unit/modules/network/vyos/test_vyos_system.py b/tests/unit/modules/network/vyos/test_vyos_system.py
index cf405cab..5edfa0df 100644
--- a/tests/unit/modules/network/vyos/test_vyos_system.py
+++ b/tests/unit/modules/network/vyos/test_vyos_system.py
@@ -45,11 +45,26 @@ class TestVyosSystemModule(TestVyosModule):
         )
         self.load_config = self.mock_load_config.start()
 
+        self.mock_get_os_version = patch(
+            "ansible_collections.vyos.vyos.plugins.modules.vyos_system.get_os_version",
+        )
+        self.test_version = "1.2"
+        self.get_os_version = self.mock_get_os_version.start()
+        self.get_os_version.return_value = self.test_version
+        self.mock_facts_get_os_version = patch(
+            "ansible_collections.vyos.vyos.plugins.modules.vyos_system.get_os_version",
+        )
+        self.get_facts_os_version = self.mock_facts_get_os_version.start()
+        self.get_facts_os_version.return_value = self.test_version
+        self.maxDiff = None
+
     def tearDown(self):
         super(TestVyosSystemModule, self).tearDown()
 
         self.mock_get_config.stop()
         self.mock_load_config.stop()
+        self.mock_get_os_version.stop()
+        self.mock_facts_get_os_version.stop()
 
     def load_fixtures(self, commands=None, filename=None):
         self.get_config.return_value = load_fixture("vyos_config_config.cfg")
@@ -112,3 +127,67 @@ class TestVyosSystemModule(TestVyosModule):
             "delete system name-server",
         ]
         self.execute_module(changed=True, commands=commands)
+
+
+class TestVyosSystemModule14(TestVyosModule):
+    module = vyos_system
+
+    def setUp(self):
+        super(TestVyosSystemModule14, self).setUp()
+
+        self.mock_get_config = patch(
+            "ansible_collections.vyos.vyos.plugins.modules.vyos_system.get_config",
+        )
+        self.get_config = self.mock_get_config.start()
+
+        self.mock_load_config = patch(
+            "ansible_collections.vyos.vyos.plugins.modules.vyos_system.load_config",
+        )
+        self.load_config = self.mock_load_config.start()
+
+        self.mock_get_os_version = patch(
+            "ansible_collections.vyos.vyos.plugins.modules.vyos_system.get_os_version",
+        )
+        self.test_version = "1.4"
+        self.get_os_version = self.mock_get_os_version.start()
+        self.get_os_version.return_value = self.test_version
+        self.mock_facts_get_os_version = patch(
+            "ansible_collections.vyos.vyos.plugins.modules.vyos_system.get_os_version",
+        )
+        self.get_facts_os_version = self.mock_facts_get_os_version.start()
+        self.get_facts_os_version.return_value = self.test_version
+        self.maxDiff = None
+
+    def tearDown(self):
+        super(TestVyosSystemModule14, self).tearDown()
+
+        self.mock_get_config.stop()
+        self.mock_load_config.stop()
+        self.mock_get_os_version.stop()
+        self.mock_facts_get_os_version.stop()
+
+    def load_fixtures(self, commands=None, filename=None):
+        self.get_config.return_value = load_fixture("vyos_config_config.cfg")
+
+    def test_vyos_system_domain_search(self):
+        set_module_args(dict(domain_search=["foo.example.com", "bar.example.com"]))
+        commands = [
+            "set system domain-search 'foo.example.com'",
+            "set system domain-search 'bar.example.com'",
+        ]
+        self.execute_module(changed=True, commands=commands)
+
+    def test_vyos_system_clear_domain_search(self):
+        set_module_args(dict(domain_search=[]))
+        commands = ["delete system domain-search"]
+        self.execute_module(changed=True, commands=commands)
+
+    def test_vyos_system_clear_all(self):
+        set_module_args(dict(state="absent"))
+        commands = [
+            "delete system host-name",
+            "delete system domain-search",
+            "delete system domain-name",
+            "delete system name-server",
+        ]
+        self.execute_module(changed=True, commands=commands)