From 41fdbae4e5bbfaf9f7539b93a78a851981037cd8 Mon Sep 17 00:00:00 2001 From: Nicolas Fort Date: Mon, 11 Dec 2023 10:08:59 +0000 Subject: T5804: nat: remove inbound|outbound interface from old configuration when it was set to . (cherry picked from commit 5cb95aed965b45a900c6ba97c0bccefed83332b6) --- src/migration-scripts/nat/6-to-7 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/migration-scripts/nat') diff --git a/src/migration-scripts/nat/6-to-7 b/src/migration-scripts/nat/6-to-7 index b5f6328ef..a2e735394 100755 --- a/src/migration-scripts/nat/6-to-7 +++ b/src/migration-scripts/nat/6-to-7 @@ -21,6 +21,7 @@ # to # 'set nat [source|destination] rule X [inbound-interface|outbound interface] name ' # 'set nat [source|destination] rule X [inbound-interface|outbound interface] group ' +# Also remove command if interface == any from sys import argv,exit from vyos.configtree import ConfigTree @@ -56,8 +57,11 @@ for direction in ['source', 'destination']: if config.exists(base + [iface]): if config.exists(base + [iface, 'interface-name']): tmp = config.return_value(base + [iface, 'interface-name']) - config.delete(base + [iface, 'interface-name']) - config.set(base + [iface, 'name'], value=tmp) + if tmp != 'any': + config.delete(base + [iface, 'interface-name']) + config.set(base + [iface, 'name'], value=tmp) + else: + config.delete(base + [iface]) try: with open(file_name, 'w') as f: -- cgit v1.2.3