firewall: T4605: Rename filter tables to vyos_filter

10 files changed, 36 insertions, 37 deletions

diff --git a/data/templates/firewall/nftables-geoip-update.j2 b/data/templates/firewall/nftables-geoip-update.j2
index f9e61a274..832ccc3e9 100644
--- a/data/templates/firewall/nftables-geoip-update.j2
+++ b/data/templates/firewall/nftables-geoip-update.j2
@@ -2,10 +2,10 @@
 
 {% if ipv4_sets is vyos_defined %}
 {%     for setname, ip_list in ipv4_sets.items() %}
-flush set ip filter {{ setname }}
+flush set ip vyos_filter {{ setname }}
 {%     endfor %}
 
-table ip filter {
+table ip vyos_filter {
 {%     for setname, ip_list in ipv4_sets.items() %}
     set {{ setname }} {
         type ipv4_addr
@@ -18,10 +18,10 @@ table ip filter {
 
 {% if ipv6_sets is vyos_defined %}
 {%     for setname, ip_list in ipv6_sets.items() %}
-flush set ip6 filter {{ setname }}
+flush set ip6 vyos_filter {{ setname }}
 {%     endfor %}
 
-table ip6 filter {
+table ip6 vyos_filter {
 {%     for setname, ip_list in ipv6_sets.items() %}
     set {{ setname }} {
         type ipv6_addr
diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2
index be9ff3a82..dde88d09d 100644
--- a/data/templates/firewall/nftables.j2
+++ b/data/templates/firewall/nftables.j2
@@ -5,7 +5,7 @@
 {% if first_install is not vyos_defined %}
 delete table ip vyos_filter
 {% endif %}
-table ip filter {
+table ip vyos_filter {
     chain VYOS_FW_FORWARD {
         type filter hook forward priority 0; policy accept;
 {% if state_policy is vyos_defined %}
@@ -115,7 +115,7 @@ table ip filter {
 {% if first_install is not vyos_defined %}
 delete table ip6 vyos_filter
 {% endif %}
-table ip6 filter {
+table ip6 vyos_filter {
     chain VYOS_FW6_FORWARD {
         type filter hook forward priority 0; policy accept;
 {% if state_policy is vyos_defined %}
diff --git a/python/vyos/firewall.py b/python/vyos/firewall.py
index 2fbaef0e9..b56caef71 100644
--- a/python/vyos/firewall.py
+++ b/python/vyos/firewall.py
@@ -52,9 +52,9 @@ def get_ips_domains_dict(list_domains):
 
     return ip_dict
 
-def nft_init_set(group_name, table="filter", family="ip"):
+def nft_init_set(group_name, table="vyos_filter", family="ip"):
     """
-    table ip filter {
+    table ip vyos_filter {
         set GROUP_NAME
             type ipv4_addr
            flags interval
@@ -63,9 +63,9 @@ def nft_init_set(group_name, table="filter", family="ip"):
     return call(f'nft add set ip {table} {group_name} {{ type ipv4_addr\\; flags interval\\; }}')
 
 
-def nft_add_set_elements(group_name, elements, table="filter", family="ip"):
+def nft_add_set_elements(group_name, elements, table="vyos_filter", family="ip"):
     """
-    table ip filter {
+    table ip vyos_filter {
         set GROUP_NAME {
             type ipv4_addr
             flags interval
@@ -75,18 +75,18 @@ def nft_add_set_elements(group_name, elements, table="filter", family="ip"):
     elements = ", ".join(elements)
     return call(f'nft add element {family} {table} {group_name} {{ {elements} }} ')
 
-def nft_flush_set(group_name, table="filter", family="ip"):
+def nft_flush_set(group_name, table="vyos_filter", family="ip"):
     """
     Flush elements of nft set
     """
     return call(f'nft flush set {family} {table} {group_name}')
 
-def nft_update_set_elements(group_name, elements, table="filter", family="ip"):
+def nft_update_set_elements(group_name, elements, table="vyos_filter", family="ip"):
     """
     Update elements of nft set
     """
-    flush_set = nft_flush_set(group_name, table="filter", family="ip")
-    nft_add_set = nft_add_set_elements(group_name, elements, table="filter", family="ip")
+    flush_set = nft_flush_set(group_name, table="vyos_filter", family="ip")
+    nft_add_set = nft_add_set_elements(group_name, elements, table="vyos_filter", family="ip")
     return flush_set, nft_add_set
 
 # END firewall group domain-group (sets)
diff --git a/smoketest/scripts/cli/test_firewall.py b/smoketest/scripts/cli/test_firewall.py
index cc436d4d0..218062ef1 100755
--- a/smoketest/scripts/cli/test_firewall.py
+++ b/smoketest/scripts/cli/test_firewall.py
@@ -63,7 +63,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             ['chain NAME_smoketest']
         ]
 
-        self.verify_nftables(nftables_search, 'ip filter', inverse=True)
+        self.verify_nftables(nftables_search, 'ip vyos_filter', inverse=True)
 
     def verify_nftables(self, nftables_search, table, inverse=False, args=''):
         nftables_output = cmd(f'sudo nft {args} list table {table}')
@@ -93,7 +93,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
         ]
 
         # -t prevents 1000+ GeoIP elements being returned
-        self.verify_nftables(nftables_search, 'ip filter', args='-t')
+        self.verify_nftables(nftables_search, 'ip vyos_filter', args='-t')
 
     def test_groups(self):
         hostmap_path = ['system', 'static-host-mapping', 'host-name']
@@ -137,7 +137,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             ['192.0.2.10, 192.0.2.11 }'],
             ['ip saddr @D_smoketest_domain', 'return']
         ]
-        self.verify_nftables(nftables_search, 'ip filter')
+        self.verify_nftables(nftables_search, 'ip vyos_filter')
 
         self.cli_delete(['system', 'static-host-mapping'])
         self.cli_commit()
@@ -172,7 +172,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             ['elements = { 53, 123 }']
         ]
 
-        self.verify_nftables(nftables_search, 'ip filter')
+        self.verify_nftables(nftables_search, 'ip vyos_filter')
 
     def test_ipv4_basic_rules(self):
         name = 'smoketest'
@@ -224,7 +224,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             [f'tcp flags & syn == syn tcp option maxseg size {mss_range}'],
         ]
 
-        self.verify_nftables(nftables_search, 'ip filter')
+        self.verify_nftables(nftables_search, 'ip vyos_filter')
 
     def test_ipv4_advanced(self):
         name = 'smoketest-adv'
@@ -257,7 +257,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             [f'log prefix "[{name}-default-D]" drop']
         ]
 
-        self.verify_nftables(nftables_search, 'ip filter')
+        self.verify_nftables(nftables_search, 'ip vyos_filter')
 
     def test_ipv6_basic_rules(self):
         name = 'v6-smoketest'
@@ -287,7 +287,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             ['smoketest default-action', f'log prefix "[{name}-default-D]"', 'drop']
         ]
 
-        self.verify_nftables(nftables_search, 'ip6 filter')
+        self.verify_nftables(nftables_search, 'ip6 vyos_filter')
 
     def test_ipv6_advanced(self):
         name = 'v6-smoketest-adv'
@@ -320,7 +320,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             [f'log prefix "[{name}-default-D]"', 'drop']
         ]
 
-        self.verify_nftables(nftables_search, 'ip6 filter')
+        self.verify_nftables(nftables_search, 'ip6 vyos_filter')
 
     def test_state_policy(self):
         self.cli_set(['firewall', 'state-policy', 'established', 'action', 'accept'])
@@ -330,11 +330,11 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         chains = {
-            'ip filter': ['VYOS_FW_FORWARD', 'VYOS_FW_OUTPUT', 'VYOS_FW_LOCAL'],
-            'ip6 filter': ['VYOS_FW6_FORWARD', 'VYOS_FW6_OUTPUT', 'VYOS_FW6_LOCAL']
+            'ip vyos_filter': ['VYOS_FW_FORWARD', 'VYOS_FW_OUTPUT', 'VYOS_FW_LOCAL'],
+            'ip6 vyos_filter': ['VYOS_FW6_FORWARD', 'VYOS_FW6_OUTPUT', 'VYOS_FW6_LOCAL']
         }
 
-        for table in ['ip filter', 'ip6 filter']:
+        for table in ['ip vyos_filter', 'ip6 vyos_filter']:
             for chain in chains[table]:
                 nftables_output = cmd(f'sudo nft list chain {table} {chain}')
                 self.assertTrue('jump VYOS_STATE_POLICY' in nftables_output)
@@ -371,7 +371,7 @@ class TestFirewall(VyOSUnitTestSHIM.TestCase):
             ['drop', f'comment "{name} default-action drop"']
         ]
 
-        self.verify_nftables(nftables_search, 'ip filter')
+        self.verify_nftables(nftables_search, 'ip vyos_filter')
 
     def test_sysfs(self):
         for name, conf in sysfs_config.items():
diff --git a/smoketest/scripts/cli/test_protocols_nhrp.py b/smoketest/scripts/cli/test_protocols_nhrp.py
index 40b19fec7..636caf950 100755
--- a/smoketest/scripts/cli/test_protocols_nhrp.py
+++ b/smoketest/scripts/cli/test_protocols_nhrp.py
@@ -99,7 +99,7 @@ class TestProtocolsNHRP(VyOSUnitTestSHIM.TestCase):
             'comment "VYOS_NHRP_tun100"'
         ]
 
-        self.assertTrue(find_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', firewall_matches) is not None)
+        self.assertTrue(find_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', firewall_matches) is not None)
         self.assertTrue(process_named_running('opennhrp'))
 
 if __name__ == '__main__':
diff --git a/smoketest/scripts/cli/test_zone_policy.py b/smoketest/scripts/cli/test_zone_policy.py
index 2c580e2f1..8add589e8 100755
--- a/smoketest/scripts/cli/test_zone_policy.py
+++ b/smoketest/scripts/cli/test_zone_policy.py
@@ -54,7 +54,7 @@ class TestZonePolicy(VyOSUnitTestSHIM.TestCase):
             ['oifname { "eth0" }', 'jump NAME_smoketest']
         ]
 
-        nftables_output = cmd('sudo nft list table ip filter')
+        nftables_output = cmd('sudo nft list table ip vyos_filter')
 
         for search in nftables_search:
             matched = False
diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py
index f6caf2f0b..f8ad1f798 100755
--- a/src/conf_mode/firewall.py
+++ b/src/conf_mode/firewall.py
@@ -48,7 +48,6 @@ airbag.enable()
 policy_route_conf_script = '/usr/libexec/vyos/conf_mode/policy-route.py'
 
 nftables_conf = '/run/nftables.conf'
-
 nftables_zone_conf = '/run/nftables_zone.conf'
 nftables6_zone_conf = '/run/nftables_zone6.conf'
 
diff --git a/src/conf_mode/protocols_nhrp.py b/src/conf_mode/protocols_nhrp.py
index b247ce2ab..991fcc7eb 100755
--- a/src/conf_mode/protocols_nhrp.py
+++ b/src/conf_mode/protocols_nhrp.py
@@ -94,15 +94,15 @@ def apply(nhrp):
                 comment = f'VYOS_NHRP_{tunnel}'
                 source_address = nhrp['if_tunnel'][tunnel]['source_address']
 
-                rule_handle = find_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', ['ip protocol gre', f'ip saddr {source_address}', 'ip daddr 224.0.0.0/4'])
+                rule_handle = find_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', ['ip protocol gre', f'ip saddr {source_address}', 'ip daddr 224.0.0.0/4'])
                 if not rule_handle:
-                    run(f'sudo nft insert rule ip filter VYOS_FW_OUTPUT ip protocol gre ip saddr {source_address} ip daddr 224.0.0.0/4 counter drop comment "{comment}"')
+                    run(f'sudo nft insert rule ip vyos_filter VYOS_FW_OUTPUT ip protocol gre ip saddr {source_address} ip daddr 224.0.0.0/4 counter drop comment "{comment}"')
 
     for tunnel in nhrp['del_tunnels']:
         comment = f'VYOS_NHRP_{tunnel}'
-        rule_handle = find_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', [f'comment "{comment}"'])
+        rule_handle = find_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', [f'comment "{comment}"'])
         if rule_handle:
-            remove_nftables_rule('ip filter', 'VYOS_FW_OUTPUT', rule_handle)
+            remove_nftables_rule('ip vyos_filter', 'VYOS_FW_OUTPUT', rule_handle)
 
     action = 'restart' if nhrp and 'tunnel' in nhrp else 'stop'
     run(f'systemctl {action} opennhrp.service')
diff --git a/src/conf_mode/service_monitoring_telegraf.py b/src/conf_mode/service_monitoring_telegraf.py
index 53df006a4..427cb6911 100755
--- a/src/conf_mode/service_monitoring_telegraf.py
+++ b/src/conf_mode/service_monitoring_telegraf.py
@@ -42,7 +42,7 @@ systemd_override = '/etc/systemd/system/telegraf.service.d/10-override.conf'
 
 def get_nft_filter_chains():
     """ Get nft chains for table filter """
-    nft = cmd('nft --json list table ip filter')
+    nft = cmd('nft --json list table ip vyos_filter')
     nft = json.loads(nft)
     chain_list = []
 
diff --git a/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py b/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py
index bf4bfd05d..cbc2bfe6b 100755
--- a/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py
+++ b/src/etc/telegraf/custom_scripts/show_firewall_input_filter.py
@@ -11,7 +11,7 @@ def get_nft_filter_chains():
     """
     Get list of nft chains for table filter
     """
-    nft = cmd('/usr/sbin/nft --json list table ip filter')
+    nft = cmd('/usr/sbin/nft --json list table ip vyos_filter')
     nft = json.loads(nft)
     chain_list = []
 
@@ -27,7 +27,7 @@ def get_nftables_details(name):
     """
     Get dict, counters packets and bytes for chain
     """
-    command = f'/usr/sbin/nft list chain ip filter {name}'
+    command = f'/usr/sbin/nft list chain ip vyos_filter {name}'
     try:
         results = cmd(command)
     except:
@@ -60,7 +60,7 @@ def get_nft_telegraf(name):
     Get data for telegraf in influxDB format
     """
     for rule, rule_config in get_nftables_details(name).items():
-        print(f'nftables,table=filter,chain={name},'
+        print(f'nftables,table=vyos_filter,chain={name},'
               f'ruleid={rule} '
               f'pkts={rule_config["packets"]}i,'
               f'bytes={rule_config["bytes"]}i '