Skip to content

Commit 72ee4fc

Browse files
authored
[config db] Trim garbage charactor in "DEVICE_METADATA" of config db (sonic-net#3345)
the garbage char could be generated with "load_minigraph" if '-override-config' is specified, and if golden_config has garbage char. it could also be introduced by "config reload"
1 parent b2ba082 commit 72ee4fc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

config/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2206,8 +2206,8 @@ def generate_sysinfo(cur_config, config_input, ns=None):
22062206
if not platform:
22072207
platform = device_info.get_platform()
22082208

2209-
device_metadata['localhost']['mac'] = mac
2210-
device_metadata['localhost']['platform'] = platform
2209+
device_metadata['localhost']['mac'] = mac.rstrip('\n')
2210+
device_metadata['localhost']['platform'] = platform.rstrip('\n')
22112211

22122212
return
22132213

tests/config_override_test.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,10 @@ def read_json_file_side_effect(filename):
386386

387387
with mock.patch('config.main.read_json_file',
388388
mock.MagicMock(side_effect=read_json_file_side_effect)),\
389-
mock.patch('sonic_py_common.device_info.get_platform',
389+
mock.patch('sonic_py_common.device_info.get_platform',
390390
return_value="multi_asic"),\
391-
mock.patch('sonic_py_common.device_info.get_system_mac',
392-
return_value="11:22:33:44:55:66"):
391+
mock.patch('sonic_py_common.device_info.get_system_mac',
392+
return_value="11:22:33:44:55:66\n"):
393393
runner = CliRunner()
394394
result = runner.invoke(config.config.commands["override-config-table"],
395395
['golden_config_db.json'], obj=db)

0 commit comments

Comments
 (0)