T5160: firewall refactor: re-add missing code in template.py which was accidentaly removed. Update smokestest: remove zone test and fix test_sysfs test

2 files changed, 2 insertions, 31 deletions

diff --git a/python/vyos/template.py b/python/vyos/template.py
index 5a3505b91..e167488c6 100644
--- a/python/vyos/template.py
+++ b/python/vyos/template.py
@@ -44,6 +44,7 @@ def _get_environment(location=None):
         loader=loc_loader,
         trim_blocks=True,
         undefined=ChainableUndefined,
+        extensions=['jinja2.ext.loopcontrols']
     )
     env.filters.update(_FILTERS)
     env.tests.update(_TESTS)
diff --git a/smoketest/scripts/cli/test_firewall.py b/smoketest/scripts/cli/test_firewall.py
index 153793453..640b7971c 100755
--- a/smoketest/scripts/cli/test_firewall.py
+++ b/smoketest/scripts/cli/test_firewall.py
@@ -517,7 +517,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
                 with open(path, 'r') as f:
                     self.assertEqual(f.read().strip(), conf['default'], msg=path)
 
-            self.cli_set(['firewall', name.replace("_", "-"), conf['test_value']])
+            self.cli_set(['firewall', 'global-options', name.replace("_", "-"), conf['test_value']])
 
         self.cli_commit()
 
@@ -527,35 +527,5 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
                 with open(path, 'r') as f:
                     self.assertNotEqual(f.read().strip(), conf['default'], msg=path)
 
-    def test_zone_basic(self):
-        self.cli_set(['firewall', 'ip', 'name', 'smoketest', 'default-action', 'drop'])
-        self.cli_set(['firewall', 'zone', 'smoketest-eth0', 'interface', 'eth0'])
-        self.cli_set(['firewall', 'zone', 'smoketest-eth0', 'from', 'smoketest-local', 'firewall', 'name', 'smoketest'])
-        self.cli_set(['firewall', 'zone', 'smoketest-local', 'local-zone'])
-        self.cli_set(['firewall', 'zone', 'smoketest-local', 'from', 'smoketest-eth0', 'firewall', 'name', 'smoketest'])
-
-        self.cli_commit()
-
-        nftables_search = [
-            ['chain VZONE_smoketest-eth0'],
-            ['chain VZONE_smoketest-local_IN'],
-            ['chain VZONE_smoketest-local_OUT'],
-            ['oifname "eth0"', 'jump VZONE_smoketest-eth0'],
-            ['jump VZONE_smoketest-local_IN'],
-            ['jump VZONE_smoketest-local_OUT'],
-            ['iifname "eth0"', 'jump NAME_smoketest'],
-            ['oifname "eth0"', 'jump NAME_smoketest']
-        ]
-
-        nftables_output = cmd('sudo nft list table ip vyos_filter')
-
-        for search in nftables_search:
-            matched = False
-            for line in nftables_output.split("\n"):
-                if all(item in line for item in search):
-                    matched = True
-                    break
-            self.assertTrue(matched)
-
 if __name__ == '__main__':
     unittest.main(verbosity=2)