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

…into 202205
sonic-net · Aug 10, 2023 · b879c20 · b879c20
2 parents 87d7d21 + 69d348d
commit b879c20
Show file tree

Hide file tree

Showing 74 changed files with 1,886 additions and 173 deletions.
diff --git a/config/main.py b/config/main.py
@@ -1812,14 +1812,24 @@ def override_config_table(db, input_config_db, dry_run):
         current_config = config_db.get_config()
         # Serialize to the same format as json input
         sonic_cfggen.FormatConverter.to_serialized(current_config)
-
-        if multi_asic.is_multi_asic():
+        ns_config_input = None
+        if multi_asic.is_multi_asic() and len(config_input):
             # Golden Config will use "localhost" to represent host name
             if ns == DEFAULT_NAMESPACE:
-                ns_config_input = config_input["localhost"]
+                if "localhost" in config_input.keys():
+                    ns_config_input = config_input["localhost"]
+                else:
+                    click.secho("Wrong config format! 'localhost' not found in host config! cannot override.. abort")
+                    sys.exit(1)
             else:
-                ns_config_input = config_input[ns]
-        else:
+                if ns in config_input.keys():
+                    ns_config_input = config_input[ns]
+                else:
+                    click.secho("Wrong config format! {} not found in asic config! cannot override.. abort".format(ns))
+                    sys.exit(1)
+        if not ns_config_input:
+            # if ns_config_input is not defined, define it
+            # it could be single-asic dut, or config_input is empty
             ns_config_input = config_input
         # Generate sysinfo if missing in ns_config_input
         generate_sysinfo(current_config, ns_config_input, ns)

diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py
@@ -616,6 +616,21 @@ def migrate_route_table(self):
                     route_key = "ROUTE_TABLE:{}".format(route_prefix)
                 self.appDB.set(self.appDB.APPL_DB, route_key, 'weight','')
 
+    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
@@ -985,6 +1000,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()