summaryrefslogtreecommitdiff
path: root/src/migration-scripts/interfaces/5-to-6
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-01-16 18:17:24 +0100
committerChristian Poessinger <christian@poessinger.com>2022-01-16 18:17:24 +0100
commit7e731c0ef503334eaab2bfd723163a9749d64da2 (patch)
treecaad5bfb699244f2aff754d720db202dce510c33 /src/migration-scripts/interfaces/5-to-6
parent9f52a4f4ea9990bcf3b8c27a472fb47653bbeb0d (diff)
downloadvyos-1x-7e731c0ef503334eaab2bfd723163a9749d64da2.tar.gz
vyos-1x-7e731c0ef503334eaab2bfd723163a9749d64da2.zip
Revert "migrator: interfaces: T4171: bugfix ConfigTreeError"
This reverts commit 29efbf51efea559773f61703f11a77a8aee6de36.
Diffstat (limited to 'src/migration-scripts/interfaces/5-to-6')
-rwxr-xr-xsrc/migration-scripts/interfaces/5-to-69
1 files changed, 2 insertions, 7 deletions
diff --git a/src/migration-scripts/interfaces/5-to-6 b/src/migration-scripts/interfaces/5-to-6
index dc8d9554f..ae79c1d1b 100755
--- a/src/migration-scripts/interfaces/5-to-6
+++ b/src/migration-scripts/interfaces/5-to-6
@@ -107,15 +107,10 @@ if __name__ == '__main__':
config_file = f.read()
config = ConfigTree(config_file)
- base = ['interfaces']
-
- if not config.exists(base):
- # Nothing to do
- exit(0)
# list all individual interface types like dummy, ethernet and so on
- for if_type in config.list_nodes(base):
- base_if_type = base + [if_type]
+ for if_type in config.list_nodes(['interfaces']):
+ base_if_type = ['interfaces', if_type]
# for every individual interface we need to check if there is an
# ipv6 ra configured ... and also for every VIF (VLAN) interface