From 06bee69e0561f681a69037ce7aebe21dca25959b Mon Sep 17 00:00:00 2001
From: omnom62 <75066712+omnom62@users.noreply.github.com>
Date: Fri, 23 May 2025 17:15:01 +1000
Subject: 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>
---
 .../unit/modules/network/vyos/test_vyos_system.py  | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)

(limited to 'tests/unit/modules/network')

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)
-- 
cgit v1.2.3