smoketest: T5687: simplify "dns forwarding" test setup

Commit eb76729d6324 ("dns forwarding: T5687: Implement ECS settings for PowerDNS
recursor") added a helper "_set_required_options()" method to reduce duplicate
code when setting up the base interface test.

This refactors the test class to call this code always in setUp() so we have
it written only once.

(cherry picked from commit 112376a4ccb96ceee647a4cba5c4f131597b0ea4)

1 files changed, 7 insertions, 58 deletions

diff --git a/smoketest/scripts/cli/test_service_dns_forwarding.py b/smoketest/scripts/cli/test_service_dns_forwarding.py
index 2a32fa292..079c584ba 100755
--- a/smoketest/scripts/cli/test_service_dns_forwarding.py
+++ b/smoketest/scripts/cli/test_service_dns_forwarding.py
@@ -59,7 +59,9 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
         # Check for running process
         self.assertFalse(process_named_running(PROCESS_NAME))
 
-    def _set_required_options(self):
+    def setUp(self):
+        # forward to base class
+        super().setUp()
         for network in allow_from:
             self.cli_set(base_path + ['allow-from', network])
         for address in listen_adress:
@@ -70,6 +72,10 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
         cache_size = '20'
         negative_ttl = '120'
 
+        # remove code from setUp() as in this test-case we validate the proper
+        # handling of assertions when specific CLI nodes are missing
+        self.cli_delete(base_path)
+
         self.cli_set(base_path + ['cache-size', cache_size])
         self.cli_set(base_path + ['negative-ttl', negative_ttl])
 
@@ -124,12 +130,6 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
 
     def test_dnssec(self):
         # DNSSEC option testing
-
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         options = ['off', 'process-no-validate', 'process', 'log-fail', 'validate']
         for option in options:
             self.cli_set(base_path + ['dnssec', option])
@@ -142,12 +142,6 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
 
     def test_external_nameserver(self):
         # Externe Domain Name Servers (DNS) addresses
-
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         nameservers = {'192.0.2.1': {}, '192.0.2.2': {'port': '53'}, '2001:db8::1': {'port': '853'}}
         for h,p in nameservers.items():
             if 'port' in p:
@@ -169,11 +163,6 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
         self.assertEqual(tmp, 'yes')
 
     def test_domain_forwarding(self):
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         domains = ['vyos.io', 'vyos.net', 'vyos.com']
         nameservers = {'192.0.2.1': {}, '192.0.2.2': {'port': '53'}, '2001:db8::1': {'port': '853'}}
         for domain in domains:
@@ -210,11 +199,6 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
                 self.assertIn(f'addNTA("{domain}", "static")', hosts_conf)
 
     def test_no_rfc1918_forwarding(self):
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         self.cli_set(base_path + ['no-serve-rfc1918'])
 
         # commit changes
@@ -226,12 +210,6 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
 
     def test_dns64(self):
         dns_prefix = '64:ff9b::/96'
-
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         # Check dns64-prefix - must be prefix /96
         self.cli_set(base_path + ['dns64-prefix', '2001:db8:aabb::/64'])
         with self.assertRaises(ConfigSessionError):
@@ -252,12 +230,6 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
             '2001:db8:85a3:8d3:1319:8a2e:370:7348',
             '64:ff9b::/96'
         ]
-
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         for exclude_throttle_adress in exclude_throttle_adress_examples:
             self.cli_set(base_path + ['exclude-throttle-address', exclude_throttle_adress])
 
@@ -270,16 +242,9 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
 
     def test_serve_stale_extension(self):
         server_stale = '20'
-        for network in allow_from:
-            self.cli_set(base_path + ['allow-from', network])
-        for address in listen_adress:
-            self.cli_set(base_path + ['listen-address', address])
-
         self.cli_set(base_path + ['serve-stale-extension', server_stale])
-
         # commit changes
         self.cli_commit()
-
         # verify configuration
         tmp = get_config_value('serve-stale-extensions')
         self.assertEqual(tmp, server_stale)
@@ -288,48 +253,33 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
         # We can listen on a different port compared to '53' but only one at a time
         for port in ['10053', '10054']:
             self.cli_set(base_path + ['port', port])
-            for network in allow_from:
-                self.cli_set(base_path + ['allow-from', network])
-            for address in listen_adress:
-                self.cli_set(base_path + ['listen-address', address])
-
             # commit changes
             self.cli_commit()
-
             # verify local-port configuration
             tmp = get_config_value('local-port')
             self.assertEqual(tmp, port)
 
     def test_ecs_add_for(self):
-        self._set_required_options()
-
         options = ['0.0.0.0/0', '!10.0.0.0/8', 'fc00::/7', '!fe80::/10']
         for param in options:
             self.cli_set(base_path + ['options', 'ecs-add-for', param])
 
         # commit changes
         self.cli_commit()
-
         # verify ecs_add_for configuration
         tmp = get_config_value('ecs-add-for')
         self.assertEqual(tmp, ','.join(options))
 
     def test_ecs_ipv4_bits(self):
-        self._set_required_options()
-
         option_value = '24'
         self.cli_set(base_path + ['options', 'ecs-ipv4-bits', option_value])
-
         # commit changes
         self.cli_commit()
-
         # verify ecs_ipv4_bits configuration
         tmp = get_config_value('ecs-ipv4-bits')
         self.assertEqual(tmp, option_value)
 
     def test_edns_subnet_allow_list(self):
-        self._set_required_options()
-
         options = ['192.0.2.1/32', 'example.com', 'fe80::/10']
         for param in options:
             self.cli_set(base_path + ['options', 'edns-subnet-allow-list', param])
@@ -341,6 +291,5 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase):
         tmp = get_config_value('edns-subnet-allow-list')
         self.assertEqual(tmp, ','.join(options))
 
-
 if __name__ == '__main__':
     unittest.main(verbosity=2)