Merge branch 'current' into 2fa

1 files changed, 12 insertions, 11 deletions

diff --git a/smoketest/scripts/cli/test_system_conntrack.py b/smoketest/scripts/cli/test_system_conntrack.py
index 21d626d2f..a2380981b 100755
--- a/smoketest/scripts/cli/test_system_conntrack.py
+++ b/smoketest/scripts/cli/test_system_conntrack.py
@@ -147,8 +147,8 @@ class TestSystemConntrack(VyOSUnitTestSHIM.TestCase):
             self.assertEqual(get_sysctl(f'{parameter}'), parameter_config['default_value'])
 
 
-    def test_conntrack_module_disable(self):
-        # Some features are disabled by onloading the kernel helper module(s)
+    def test_conntrack_module_enable(self):
+        # conntrack helper modules are disabled by default
         modules = {
             'ftp' : {
                 'driver' : ['nf_nat_ftp', 'nf_conntrack_ftp'],
@@ -176,38 +176,39 @@ class TestSystemConntrack(VyOSUnitTestSHIM.TestCase):
              },
         }
 
+        # load modules
         for module in modules:
-            self.cli_set(base_path + ['modules', module, 'disable'])
+            self.cli_set(base_path + ['modules', module])
 
         # commit changes
         self.cli_commit()
 
-        # verify modules are no longer loaded on the system
+        # verify modules are loaded on the system
         for module, module_options in modules.items():
             if 'driver' in module_options:
                 for driver in module_options['driver']:
-                    self.assertFalse(os.path.isdir(f'/sys/module/{driver}'))
+                    self.assertTrue(os.path.isdir(f'/sys/module/{driver}'))
             if 'iptables' in module_options:
                 rules = cmd('sudo iptables-save -t raw')
                 for ruleset in module_options['iptables']:
-                    self.assertNotIn(ruleset, rules)
+                    self.assertIn(ruleset, rules)
 
-        # reload modules
+        # unload modules
         for module in modules:
-            self.cli_delete(base_path + ['modules', module, 'disable'])
+            self.cli_delete(base_path + ['modules', module])
 
         # commit changes
         self.cli_commit()
 
-        # verify modules are again loaded on the system
+        # verify modules are not loaded on the system
         for module, module_options in modules.items():
             if 'driver' in module_options:
                 for driver in module_options['driver']:
-                    self.assertTrue(os.path.isdir(f'/sys/module/{driver}'))
+                    self.assertFalse(os.path.isdir(f'/sys/module/{driver}'))
             if 'iptables' in module_options:
                 rules = cmd('sudo iptables-save -t raw')
                 for ruleset in module_options['iptables']:
-                    self.assertIn(ruleset, rules)
+                    self.assertNotIn(ruleset, rules)
 
     def test_conntrack_hash_size(self):
         hash_size = '65536'