matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[minigraph.py]: Add peer switch hostname to device metadata (#6405)

Browse Source 
To make the peer switch hostname easily accessible from config DB. Add peer_switch field to DEVICE_METADATA table

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
This commit is contained in:
Lawrence Lee 2021-01-11 10:18:39 -08:00 committed by GitHub
parent 281651510c
commit 3dd993e019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sonic-config-engine/minigraph.py
View File

@ -1178,6 +1178,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
if bool(results['PEER_SWITCH']): if bool(results['PEER_SWITCH']):
results['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR' results['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR'
if len(results['PEER_SWITCH'].keys()) > 1:
print("Warning: more than one peer switch was found. Only the first will be parsed: {}".format(results['PEER_SWITCH'].keys()[0]))
results['DEVICE_METADATA']['localhost']['peer_switch'] = list(results['PEER_SWITCH'].keys())[0]
if is_storage_device: if is_storage_device:
results['DEVICE_METADATA']['localhost']['storage_device'] = "true" results['DEVICE_METADATA']['localhost']['storage_device'] = "true"

5
src/sonic-config-engine/tests/test_minigraph_case.py
View File

@ -57,6 +57,11 @@ class TestCfgGenCaseInsensitive(TestCase):
output = self.run_script(argument) output = self.run_script(argument)
self.assertEqual(output.strip(), 'DualToR') self.assertEqual(output.strip(), 'DualToR')
def test_minigraph_peer_switch_hostname(self):
argument = '-m "' + self.sample_graph + '" -v "DEVICE_METADATA[\'localhost\'][\'peer_switch\']"'
output = self.run_script(argument)
self.assertEqual(output.strip(), 'switch2-t0')
def test_additional_json_data(self): def test_additional_json_data(self):
argument = '-a \'{"key1":"value1"}\' -v key1' argument = '-a \'{"key1":"value1"}\' -v key1'
output = self.run_script(argument) output = self.run_script(argument)