From f38da6ba4d8218f945c3e6ca6c08dcd5460024be Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 30 Aug 2022 17:58:48 +0200
Subject: firewall: T4605: Rename filter tables to vyos_filter

---
 python/vyos/firewall.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'python')

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)
-- 
cgit v1.2.3