Merge branch 'master' of https://github.com/sonic-net/sonic-utilities …

…into route_check_master
sonic-net · Jul 11, 2023 · e2e3194 · e2e3194
2 parents d39f0bd + 7ca3147
commit e2e3194
Show file tree

Hide file tree

Showing 47 changed files with 77 additions and 45 deletions.
diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py
@@ -613,6 +613,7 @@ def migrate_feature_timer(self):
                 config['delayed'] = state
                 config.pop('has_timer')
                 self.configDB.set_entry('FEATURE', feature, config)
+
     def migrate_route_table(self):
         """
         Handle route table migration. Migrations handled:
@@ -636,6 +637,21 @@ def migrate_route_table(self):
             if 'protocol' not in route_attr:
                 self.appDB.set(self.appDB.APPL_DB, route_key, 'protocol', '')
 
+    def migrate_routing_config_mode(self):
+        # DEVICE_METADATA - synchronous_mode entry
+        if not self.minigraph_data or 'DEVICE_METADATA' not in self.minigraph_data:
+            return
+        device_metadata_old = self.configDB.get_entry('DEVICE_METADATA', 'localhost')
+        device_metadata_new = self.minigraph_data['DEVICE_METADATA']['localhost']
+        # overwrite the routing-config-mode as per minigraph parser
+        # Criteria for update:
+        # if config mode is missing in base OS or if base and target modes are not same
+        #  Eg. in 201811 mode is "unified", and in newer branches mode is "separated" 
+        if ('docker_routing_config_mode' not in device_metadata_old and 'docker_routing_config_mode' in device_metadata_new) or \
+        (device_metadata_old.get('docker_routing_config_mode') != device_metadata_new.get('docker_routing_config_mode')):
+            device_metadata_old['docker_routing_config_mode'] = device_metadata_new.get('docker_routing_config_mode')
+            self.configDB.set_entry('DEVICE_METADATA', 'localhost', device_metadata_old)
+
     def update_edgezone_aggregator_config(self):
         """
         Update cable length configuration in ConfigDB for T0 neighbor interfaces
@@ -1057,6 +1073,8 @@ def common_migration_ops(self):
 
         # Updating edgezone aggregator cable length config for T0 devices
         self.update_edgezone_aggregator_config()
+        # update FRR config mode based on minigraph parser on target image
+        self.migrate_routing_config_mode()
 
     def migrate(self):
         version = self.get_version()

diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_0.json
@@ -681,7 +681,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",

diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t0-version_3_0_3.json
@@ -681,7 +681,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",

diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_0.json
@@ -762,7 +762,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {
         "small_packet_percentage": "100",

diff --git a/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/acs-msn2700-t1-version_3_0_3.json
@@ -761,7 +761,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "LOSSLESS_TRAFFIC_PATTERN|AZURE": {

diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_expected.json
@@ -22,5 +22,8 @@
         },
     "CONSOLE_SWITCH|console_mgmt": {
             "enabled": "no"
-        }
-}
+        },
+    "DEVICE_METADATA|localhost": {
+        "docker_routing_config_mode": "separated"
+    }
+}
diff --git a/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json b/tests/db_migrator_input/config_db/cross_branch_upgrade_to_version_2_0_2_input.json
@@ -1,3 +1,6 @@
 {
+    "DEVICE_METADATA|localhost": {
+        "docker_routing_config_mode": "unified"
+    }
 }
 
diff --git a/tests/db_migrator_input/config_db/empty-config-expected.json b/tests/db_migrator_input/config_db/empty-config-expected.json
@@ -3,6 +3,7 @@
         "VERSION": "version_3_0_3"
     },
     "DEVICE_METADATA|localhost": {
-        "synchronous_mode": "enable"
+        "synchronous_mode": "enable",
+        "docker_routing_config_mode": "separated"
     }
 }
diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_0.json
@@ -735,7 +735,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_0.json
@@ -740,7 +740,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t0-version_3_0_3.json
@@ -739,7 +739,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_0.json
@@ -833,7 +833,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-c28d8-t1-version_3_0_3.json
@@ -832,7 +832,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_0.json
@@ -735,7 +735,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t0-version_3_0_3.json
@@ -734,7 +734,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable" 
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d40c8s8-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_0.json
@@ -735,7 +735,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t0-version_3_0_3.json
@@ -734,7 +734,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_0.json
@@ -740,7 +740,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t0-version_3_0_3.json
@@ -739,7 +739,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_0.json
@@ -833,7 +833,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-d48c8-t1-version_3_0_3.json
@@ -832,7 +832,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_0.json
@@ -726,7 +726,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t0-version_3_0_3.json
@@ -726,7 +726,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "Mellanox-SN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_0.json
@@ -828,7 +828,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-single-pool-t1-version_3_0_3.json
@@ -827,7 +827,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_0.json
@@ -740,7 +740,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t0-version_3_0_3.json
@@ -739,7 +739,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_0.json
@@ -833,7 +833,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json b/tests/db_migrator_input/config_db/mellanox-sn2700-t1-version_3_0_3.json
@@ -832,7 +832,7 @@
         "bgp_asn": "65100",
         "buffer_model": "traditional",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "synchronous_mode": "enable"
     },
     "PORT|Ethernet0": {

diff --git a/tests/db_migrator_input/config_db/non-default-config-expected.json b/tests/db_migrator_input/config_db/non-default-config-expected.json
@@ -754,7 +754,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",

diff --git a/tests/db_migrator_input/config_db/non-default-config-input.json b/tests/db_migrator_input/config_db/non-default-config-input.json
@@ -730,7 +730,7 @@
     "DEVICE_METADATA|localhost": {
         "hwsku": "ACS-MSN2700",
         "default_bgp_status": "up",
-        "docker_routing_config_mode": "unified",
+        "docker_routing_config_mode": "separated",
         "hostname": "sonic",
         "platform": "x86_64-mlnx_msn2700-r0",
         "mac": "00:01:02:03:04:00",

diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-expected.json
@@ -207,7 +207,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-double-pools-input.json
@@ -123,7 +123,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",

diff --git a/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json b/tests/db_migrator_input/config_db/reclaiming-buffer-dynamic-single-pool-expected.json
@@ -203,7 +203,7 @@
         "bgp_asn": "65100",
         "buffer_model": "dynamic",
         "deployment_id": "1",
-        "docker_routing_config_mode": "unified"
+        "docker_routing_config_mode": "separated"
     },
     "PORT|Ethernet0": {
         "lanes": "0,1,2,3",