smoketest: nhrp: T2199: fix nftables rule/chain names

1 files changed, 61 insertions, 45 deletions

diff --git a/smoketest/scripts/cli/test_protocols_nhrp.py b/smoketest/scripts/cli/test_protocols_nhrp.py
index 636caf950..9a00b86fc 100755
--- a/smoketest/scripts/cli/test_protocols_nhrp.py
+++ b/smoketest/scripts/cli/test_protocols_nhrp.py
@@ -26,65 +26,81 @@ nhrp_path = ['protocols', 'nhrp']
 vpn_path = ['vpn', 'ipsec']
 
 class TestProtocolsNHRP(VyOSUnitTestSHIM.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestProtocolsNHRP, cls).setUpClass()
+
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        cls.cli_delete(cls, nhrp_path)
+        cls.cli_delete(cls, tunnel_path)
+
     def tearDown(self):
         self.cli_delete(nhrp_path)
         self.cli_delete(tunnel_path)
         self.cli_commit()
 
     def test_config(self):
-        self.cli_delete(nhrp_path)
-        self.cli_delete(tunnel_path)
+        tunnel_if = "tun100"
+        tunnel_source = "192.0.2.1"
+        tunnel_encapsulation = "gre"
+        esp_group = "ESP-HUB"
+        ike_group = "IKE-HUB"
+        nhrp_secret = "vyos123"
+        nhrp_profile = "NHRPVPN"
+        ipsec_secret = "secret"
 
         # Tunnel
-        self.cli_set(tunnel_path + ["tun100", "address", "172.16.253.134/29"])
-        self.cli_set(tunnel_path + ["tun100", "encapsulation", "gre"])
-        self.cli_set(tunnel_path + ["tun100", "source-address", "192.0.2.1"])
-        self.cli_set(tunnel_path + ["tun100", "multicast", "enable"])
-        self.cli_set(tunnel_path + ["tun100", "parameters", "ip", "key", "1"])
+        self.cli_set(tunnel_path + [tunnel_if, "address", "172.16.253.134/29"])
+        self.cli_set(tunnel_path + [tunnel_if, "encapsulation", tunnel_encapsulation])
+        self.cli_set(tunnel_path + [tunnel_if, "source-address", tunnel_source])
+        self.cli_set(tunnel_path + [tunnel_if, "multicast", "enable"])
+        self.cli_set(tunnel_path + [tunnel_if, "parameters", "ip", "key", "1"])
 
         # NHRP
-        self.cli_set(nhrp_path + ["tunnel", "tun100", "cisco-authentication", "secret"])
-        self.cli_set(nhrp_path + ["tunnel", "tun100", "holding-time", "300"])
-        self.cli_set(nhrp_path + ["tunnel", "tun100", "multicast", "dynamic"])
-        self.cli_set(nhrp_path + ["tunnel", "tun100", "redirect"])
-        self.cli_set(nhrp_path + ["tunnel", "tun100", "shortcut"])
+        self.cli_set(nhrp_path + ["tunnel", tunnel_if, "cisco-authentication", nhrp_secret])
+        self.cli_set(nhrp_path + ["tunnel", tunnel_if, "holding-time", "300"])
+        self.cli_set(nhrp_path + ["tunnel", tunnel_if, "multicast", "dynamic"])
+        self.cli_set(nhrp_path + ["tunnel", tunnel_if, "redirect"])
+        self.cli_set(nhrp_path + ["tunnel", tunnel_if, "shortcut"])
 
         # IKE/ESP Groups
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "compression", "disable"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "lifetime", "1800"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "mode", "transport"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "pfs", "dh-group2"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "proposal", "1", "encryption", "aes256"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "proposal", "1", "hash", "sha1"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "proposal", "2", "encryption", "3des"])
-        self.cli_set(vpn_path + ["esp-group", "ESP-HUB", "proposal", "2", "hash", "md5"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "ikev2-reauth", "no"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "key-exchange", "ikev1"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "lifetime", "3600"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "proposal", "1", "dh-group", "2"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "proposal", "1", "encryption", "aes256"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "proposal", "1", "hash", "sha1"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "proposal", "2", "dh-group", "2"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "proposal", "2", "encryption", "aes128"])
-        self.cli_set(vpn_path + ["ike-group", "IKE-HUB", "proposal", "2", "hash", "sha1"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "compression", "disable"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "lifetime", "1800"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "mode", "transport"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "pfs", "dh-group2"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "proposal", "1", "encryption", "aes256"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "proposal", "1", "hash", "sha1"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "proposal", "2", "encryption", "3des"])
+        self.cli_set(vpn_path + ["esp-group", esp_group, "proposal", "2", "hash", "md5"])
+
+        self.cli_set(vpn_path + ["ike-group", ike_group, "ikev2-reauth", "no"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "key-exchange", "ikev1"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "lifetime", "3600"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "proposal", "1", "dh-group", "2"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "proposal", "1", "encryption", "aes256"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "proposal", "1", "hash", "sha1"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "proposal", "2", "dh-group", "2"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "proposal", "2", "encryption", "aes128"])
+        self.cli_set(vpn_path + ["ike-group", ike_group, "proposal", "2", "hash", "sha1"])
 
         # Profile - Not doing full DMVPN checks here, just want to verify the profile name in the output
         self.cli_set(vpn_path + ["interface", "eth0"])
-        self.cli_set(vpn_path + ["profile", "NHRPVPN", "authentication", "mode", "pre-shared-secret"])
-        self.cli_set(vpn_path + ["profile", "NHRPVPN", "authentication", "pre-shared-secret", "secret"])
-        self.cli_set(vpn_path + ["profile", "NHRPVPN", "bind", "tunnel", "tun100"])
-        self.cli_set(vpn_path + ["profile", "NHRPVPN", "esp-group", "ESP-HUB"])
-        self.cli_set(vpn_path + ["profile", "NHRPVPN", "ike-group", "IKE-HUB"])
+        self.cli_set(vpn_path + ["profile", nhrp_profile, "authentication", "mode", "pre-shared-secret"])
+        self.cli_set(vpn_path + ["profile", nhrp_profile, "authentication", "pre-shared-secret", ipsec_secret])
+        self.cli_set(vpn_path + ["profile", nhrp_profile, "bind", "tunnel", tunnel_if])
+        self.cli_set(vpn_path + ["profile", nhrp_profile, "esp-group", esp_group])
+        self.cli_set(vpn_path + ["profile", nhrp_profile, "ike-group", ike_group])
 
         self.cli_commit()
 
         opennhrp_lines = [
-            'interface tun100 #hub NHRPVPN',
-            'cisco-authentication secret',
-            'holding-time 300',
-            'shortcut',
-            'multicast dynamic',
-            'redirect'
+            f'interface {tunnel_if} #hub {nhrp_profile}',
+            f'cisco-authentication {nhrp_secret}',
+            f'holding-time 300',
+            f'shortcut',
+            f'multicast dynamic',
+            f'redirect'
         ]
 
         tmp_opennhrp_conf = read_file('/run/opennhrp/opennhrp.conf')
@@ -93,13 +109,13 @@ class TestProtocolsNHRP(VyOSUnitTestSHIM.TestCase):
             self.assertIn(line, tmp_opennhrp_conf)
 
         firewall_matches = [
-            'ip protocol gre',
-            'ip saddr 192.0.2.1',
-            'ip daddr 224.0.0.0/4',
-            'comment "VYOS_NHRP_tun100"'
+            f'ip protocol {tunnel_encapsulation}',
+            f'ip saddr {tunnel_source}',
+            f'ip daddr 224.0.0.0/4',
+            f'comment "VYOS_NHRP_{tunnel_if}"'
         ]
 
-        self.assertTrue(find_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', firewall_matches) is not None)
+        self.assertTrue(find_nftables_rule('ip vyos_nhrp_filter', 'VYOS_NHRP_OUTPUT', firewall_matches) is not None)
         self.assertTrue(process_named_running('opennhrp'))
 
 if __name__ == '__main__':