Add recover asic_id config if load golden config. (#3711)

* Add recover hardware config if load golden config.

* fix format

* Refactor with exist function.

* Fix format

* Remove deprecated tests

* fix asicid

* remove unrelated changes

* Remove unrelated changes.

* Recover the old implementation

* Remove unused test.

* Recover the old tests

* Adjust comments.

Author: xincunli-sonic

config/main.py

@@ -2208,12 +2208,16 @@ def generate_sysinfo(cur_config, config_input, ns=None):
 
     mac = None
     platform = None
+    asic_id = None
     cur_device_metadata = cur_config.get('DEVICE_METADATA')
 
-    # Reuse current config's mac and platform. Generate if absent
+    # Reuse the existing configuration's MAC address, platform, and asic_id
+    # if available; generate these values only if they are missing.
     if cur_device_metadata is not None:
         mac = cur_device_metadata.get('localhost', {}).get('mac')
         platform = cur_device_metadata.get('localhost', {}).get('platform')
+        if ns != DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+            asic_id = cur_device_metadata.get('localhost', {}).get('asic_id')
 
     if not mac:
         if ns:
@@ -2231,8 +2235,14 @@ def generate_sysinfo(cur_config, config_input, ns=None):
     if not platform:
         platform = device_info.get_platform()
 
+    if not asic_id and ns != DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+        asic_name = multi_asic.get_asic_id_from_name(ns)
+        asic_id = multi_asic.get_asic_device_id(asic_name)
+
     device_metadata['localhost']['mac'] = mac.rstrip('\n')
     device_metadata['localhost']['platform'] = platform.rstrip('\n')
+    if ns != DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+        device_metadata['localhost']['asic_id'] = asic_id.rstrip('\n')
 
     return
 

tests/config_override_test.py

@@ -6,6 +6,7 @@
 
 from click.testing import CliRunner
 from unittest import mock
+from generic_config_updater.gu_common import HOST_NAMESPACE
 from utilities_common.db import Db
 from utilities_common.general import load_module_from_source
 from minigraph import minigraph_encoder
@@ -345,6 +346,9 @@ def read_json_file_side_effect(filename):
             orig_sysinfo[ns] = {}
             orig_sysinfo[ns]['platform'] = platform
             orig_sysinfo[ns]['mac'] = mac
+            if ns != config.DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+                asic_id = config_db.get_config()['DEVICE_METADATA']['localhost'].get('asic_id')
+                orig_sysinfo[ns]['asic_id'] = asic_id
 
         with mock.patch('config.main.read_json_file',
                 mock.MagicMock(side_effect=read_json_file_side_effect)):
@@ -358,6 +362,9 @@ def read_json_file_side_effect(filename):
             mac = config_db.get_config()['DEVICE_METADATA']['localhost'].get('mac')
             assert platform == orig_sysinfo[ns]['platform']
             assert mac == orig_sysinfo[ns]['mac']
+            if ns != config.DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+                asic_id = config_db.get_config()['DEVICE_METADATA']['localhost'].get('asic_id')
+                assert asic_id == orig_sysinfo[ns]['asic_id']
 
     def test_device_metadata_gen_sysinfo(self):
         def read_json_file_side_effect(filename):
@@ -372,14 +379,18 @@ def read_json_file_side_effect(filename):
             metadata = config_db.get_config()['DEVICE_METADATA']['localhost']
             metadata.pop('platform', None)
             metadata.pop('mac', None)
+            if ns != config.DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+                metadata.pop('asic_id', None)
             config_db.set_entry('DEVICE_METADATA', 'localhost', metadata)
 
         with mock.patch('config.main.read_json_file',
                         mock.MagicMock(side_effect=read_json_file_side_effect)),\
              mock.patch('sonic_py_common.device_info.get_platform',
                         return_value="multi_asic"),\
              mock.patch('sonic_py_common.device_info.get_system_mac',
-                        return_value="11:22:33:44:55:66\n"):
+                        return_value="11:22:33:44:55:66\n"),\
+             mock.patch('sonic_py_common.multi_asic.get_asic_device_id',
+                        return_value="06:00:00\n"):
             runner = CliRunner()
             result = runner.invoke(config.config.commands["override-config-table"],
                                    ['golden_config_db.json'], obj=db)
@@ -390,6 +401,9 @@ def read_json_file_side_effect(filename):
             mac = config_db.get_config()['DEVICE_METADATA']['localhost'].get('mac')
             assert platform == "multi_asic"
             assert mac == "11:22:33:44:55:66"
+            if ns != config.DEFAULT_NAMESPACE and ns != HOST_NAMESPACE:
+                asic_id = config_db.get_config()['DEVICE_METADATA']['localhost'].get('asic_id')
+                assert asic_id == "06:00:00"
 
     def test_masic_missig_localhost_override(self):
         def read_json_file_side_effect(filename):