From 901e40dc3b52fb3d8dc7308f54da42b858b61798 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 1 Jan 2022 10:53:11 +0100
Subject: nat: T2199: rename iptables -> nftables variable prefix

---
 src/conf_mode/nat.py   | 10 +++++-----
 src/conf_mode/nat66.py | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py
index 62fb9abad..96f8f6fb6 100755
--- a/src/conf_mode/nat.py
+++ b/src/conf_mode/nat.py
@@ -42,7 +42,7 @@ if LooseVersion(kernel_version()) > LooseVersion('5.1'):
 else:
     k_mod = ['nft_nat', 'nft_chain_nat_ipv4']
 
-iptables_nat_config = '/tmp/vyos-nat-rules.nft'
+nftables_nat_config = '/tmp/vyos-nat-rules.nft'
 
 def get_handler(json, chain, target):
     """ Get nftable rule handler number of given chain/target combination.
@@ -179,14 +179,14 @@ def verify(nat):
     return None
 
 def generate(nat):
-    render(iptables_nat_config, 'firewall/nftables-nat.tmpl', nat,
+    render(nftables_nat_config, 'firewall/nftables-nat.tmpl', nat,
            permission=0o755)
     return None
 
 def apply(nat):
-    cmd(f'{iptables_nat_config}')
-    if os.path.isfile(iptables_nat_config):
-        os.unlink(iptables_nat_config)
+    cmd(f'{nftables_nat_config}')
+    if os.path.isfile(nftables_nat_config):
+        os.unlink(nftables_nat_config)
 
     return None
 
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index d0b6d27ac..8bf2e8073 100755
--- a/src/conf_mode/nat66.py
+++ b/src/conf_mode/nat66.py
@@ -35,7 +35,7 @@ airbag.enable()
 
 k_mod = ['nft_nat', 'nft_chain_nat']
 
-iptables_nat_config = '/tmp/vyos-nat66-rules.nft'
+nftables_nat66_config = '/tmp/vyos-nat66-rules.nft'
 ndppd_config = '/run/ndppd/ndppd.conf'
 
 def get_handler(json, chain, target):
@@ -145,22 +145,22 @@ def verify(nat):
     return None
 
 def generate(nat):
-    render(iptables_nat_config, 'firewall/nftables-nat66.tmpl', nat, permission=0o755)
+    render(nftables_nat66_config, 'firewall/nftables-nat66.tmpl', nat, permission=0o755)
     render(ndppd_config, 'ndppd/ndppd.conf.tmpl', nat, permission=0o755)
     return None
 
 def apply(nat):
     if not nat:
         return None
-    cmd(f'{iptables_nat_config}')
+    cmd(f'{nftables_nat66_config}')
     if 'deleted' in nat or not dict_search('source.rule', nat):
         cmd('systemctl stop ndppd')
         if os.path.isfile(ndppd_config):
             os.unlink(ndppd_config)
     else:
         cmd('systemctl restart ndppd')
-    if os.path.isfile(iptables_nat_config):
-        os.unlink(iptables_nat_config)
+    if os.path.isfile(nftables_nat66_config):
+        os.unlink(nftables_nat66_config)
 
     return None
 
-- 
cgit v1.2.3