Merge pull request #4493 from jestabro/vrf-migration-err-1-to-2

T7417: check existence of paths before set_tag/return_value in migration scripts vrf/1-to-2; vrf/2-to-3

2 files changed, 6 insertions, 2 deletions

diff --git a/src/migration-scripts/vrf/1-to-2 b/src/migration-scripts/vrf/1-to-2
index 557a9ec58..89b0f708a 100644
--- a/src/migration-scripts/vrf/1-to-2
+++ b/src/migration-scripts/vrf/1-to-2
@@ -37,7 +37,10 @@ def migrate(config: ConfigTree) -> None:
         new_static_base = vrf_base + [vrf, 'protocols']
         config.set(new_static_base)
         config.copy(static_base, new_static_base + ['static'])
-        config.set_tag(new_static_base + ['static', 'route'])
+        if config.exists(new_static_base + ['static', 'route']):
+            config.set_tag(new_static_base + ['static', 'route'])
+        if config.exists(new_static_base + ['static', 'route6']):
+            config.set_tag(new_static_base + ['static', 'route6'])
 
     # Now delete the old configuration
     config.delete(base)
diff --git a/src/migration-scripts/vrf/2-to-3 b/src/migration-scripts/vrf/2-to-3
index acacffb41..5f396e7ed 100644
--- a/src/migration-scripts/vrf/2-to-3
+++ b/src/migration-scripts/vrf/2-to-3
@@ -76,7 +76,8 @@ def migrate(config: ConfigTree) -> None:
     # Get a list of all currently used VRFs and tables
     vrfs_current = {}
     for vrf in config.list_nodes(base):
-        vrfs_current[vrf] = int(config.return_value(base + [vrf, 'table']))
+        if config.exists(base + [vrf, 'table']):
+            vrfs_current[vrf] = int(config.return_value(base + [vrf, 'table']))
 
     # Check VRF names and table numbers
     name_regex = re.compile(r'^\d.*$')