summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjack9603301 <jack9603301@163.com>2021-03-17 02:06:17 +0800
committerjack9603301 <jack9603301@163.com>2021-03-17 02:58:15 +0800
commit2ee759f3cbd698ac53fcb0a87c095eb3ef9bbe85 (patch)
tree23a9cbcf357146ee5deddea2d09744f29e25cbff
parentf8e91ecebb69328300ddc3d863005209541b1225 (diff)
downloadvyos-1x-2ee759f3cbd698ac53fcb0a87c095eb3ef9bbe85.tar.gz
vyos-1x-2ee759f3cbd698ac53fcb0a87c095eb3ef9bbe85.zip
nat66: T2518: use Python3 format identifiers
-rwxr-xr-xsrc/op_mode/show_nat66_rules.py8
-rwxr-xr-xsrc/op_mode/show_nat_rules.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/op_mode/show_nat66_rules.py b/src/op_mode/show_nat66_rules.py
index 736ba2063..fe5113015 100755
--- a/src/op_mode/show_nat66_rules.py
+++ b/src/op_mode/show_nat66_rules.py
@@ -33,9 +33,9 @@ if args.source or args.destination:
tmp = cmd('sudo nft -j list table ip6 nat')
tmp = json.loads(tmp)
- format_nat66_rule = '%-10s %-50s %-50s %-10s'
- print(format_nat66_rule % ("Rule", "Source" if args.source else "Destination", "Translation", "Outbound Interface" if args.source else "Inbound Interface"))
- print(format_nat66_rule % ("----", "------" if args.source else "-----------", "-----------", "------------------" if args.source else "-----------------"))
+ format_nat66_rule = '{0: <10} {1: <50} {2: <50} {3: <10}'
+ print(format_nat66_rule.format("Rule", "Source" if args.source else "Destination", "Translation", "Outbound Interface" if args.source else "Inbound Interface"))
+ print(format_nat66_rule.format("----", "------" if args.source else "-----------", "-----------", "------------------" if args.source else "-----------------"))
data_json = jmespath.search('nftables[?rule].rule[?chain]', tmp)
for idx in range(0, len(data_json)):
@@ -71,7 +71,7 @@ if args.source or args.destination:
else:
tran_addr = dict_search('snat.addr' if args.source else 'dnat.addr', data['expr'][3])
- print(format_nat66_rule % (rule, srcdest, tran_addr, interface))
+ print(format_nat66_rule.format(rule, srcdest, tran_addr, interface))
exit(0)
else:
diff --git a/src/op_mode/show_nat_rules.py b/src/op_mode/show_nat_rules.py
index 1a02f6602..511c33610 100755
--- a/src/op_mode/show_nat_rules.py
+++ b/src/op_mode/show_nat_rules.py
@@ -33,9 +33,9 @@ if args.source or args.destination:
tmp = cmd('sudo nft -j list table ip nat')
tmp = json.loads(tmp)
- format_nat66_rule = '%-10s %-50s %-50s %-10s'
- print(format_nat66_rule % ("Rule", "Source" if args.source else "Destination", "Translation", "Outbound Interface" if args.source else "Inbound Interface"))
- print(format_nat66_rule % ("----", "------" if args.source else "-----------", "-----------", "------------------" if args.source else "-----------------"))
+ format_nat66_rule = '{0: <10} {1: <50} {2: <50} {3: <10}'
+ print(format_nat66_rule.format("Rule", "Source" if args.source else "Destination", "Translation", "Outbound Interface" if args.source else "Inbound Interface"))
+ print(format_nat66_rule.format("----", "------" if args.source else "-----------", "-----------", "------------------" if args.source else "-----------------"))
data_json = jmespath.search('nftables[?rule].rule[?chain]', tmp)
for idx in range(0, len(data_json)):
@@ -68,7 +68,7 @@ if args.source or args.destination:
else:
tran_addr = dict_search('snat.addr' if args.source else 'dnat.addr', data['expr'][3])
- print(format_nat66_rule % (rule, srcdest, tran_addr, interface))
+ print(format_nat66_rule.format(rule, srcdest, tran_addr, interface))
exit(0)
else: