Skip to content

[multi-asic] Use asic_id/asic_name for APIs to get port config data #18452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 6 commits into from
May 23, 2024
Merged

[multi-asic] Use asic_id/asic_name for APIs to get port config data #18452

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1874d56
Use asic_id/asic_name for APIs to get port config related data
anamehra Mar 23, 2024
746c3c8
Add test case
anamehra May 11, 2024
44ff2a0
Update test_multinpu_cfggen.py
anamehra May 11, 2024
4fba8ca
Added test for configdb data validation
anamehra May 13, 2024
ab2f4e6
Merge branch 'master' into anamehra/sonic_cfggen
anamehra May 19, 2024
b468674
Update sonic-cfggen
anamehra May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/sonic-config-engine/sonic-cfggen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,9 @@ def main():
}}}
deep_update(data, hardware_data)
if args.port_config is None:
args.port_config = device_info.get_path_to_port_config_file(hwsku)
args.port_config = device_info.get_path_to_port_config_file(hwsku, asic_id)
load_namespace_config(asic_name)
(ports, _, _) = get_port_config(hwsku, platform, args.port_config, asic_id)
(ports, _, _) = get_port_config(hwsku, platform, args.port_config, hwsku_config_file=args.hwsku_config, asic_name=asic_name)
if ports is None:
print('Failed to get port config', file=sys.stderr)
sys.exit(1)
Expand Down
24 changes: 24 additions & 0 deletions src/sonic-config-engine/tests/test_multinpu_cfggen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
import os
import shutil
import subprocess
import sys
import unittest
import yaml
import tests.common_utils as utils

from unittest import TestCase
from sonic_py_common.general import getstatusoutput_noshell

if sys.version_info.major == 3:
from unittest import mock
else:
import mock

SKU = 'multi-npu-01'
ASIC_SKU = 'multi-npu-asic'
Expand All @@ -27,6 +32,7 @@ def setUp(self):
self.sample_graph = os.path.join(self.test_data_dir, 'sample-minigraph.xml')
self.sample_graph1 = os.path.join(self.test_data_dir, 'sample-minigraph-noportchannel.xml')
self.sample_port_config = os.path.join(self.test_data_dir, 'sample_port_config.ini')
self.sample_port_config_0 = os.path.join(self.test_data_dir, 'sample_port_config-0.ini')
self.port_config = []
for asic in range(NUM_ASIC):
self.port_config.append(os.path.join(self.test_data_dir, "sample_port_config-{}.ini".format(asic)))
Expand Down Expand Up @@ -227,6 +233,24 @@ def test_frontend_asic_ports(self):
"Ethernet-BP8": { "admin_status": "up", "alias": "Eth6-ASIC0", "asic_port_name": "Eth6-ASIC0", "description": "ASIC3:Eth0-ASIC3", "index": "2", "lanes": "21,22,23,24", "mtu": "9100", "tpid": "0x8100", "pfc_asym": "off", "role": "Int", "speed": "40000" },
"Ethernet-BP12": { "admin_status": "up", "alias": "Eth7-ASIC0", "asic_port_name": "Eth7-ASIC0", "description": "ASIC3:Eth1-ASIC3", "index": "3", "lanes": "25,26,27,28", "mtu": "9100", "tpid": "0x8100", "pfc_asym": "off", "role": "Int", "speed": "40000" }})

def test_hwsku_option_port_list_port_config_ini(self):
mock.patch('device_info.get_path_to_port_config_file', mock.MagicMock(return_value=self.sample_port_config_0))
argument = ["-k", ASIC_SKU, "-n", "asic0", "-v", "PORT.keys()|list"]
output = self.run_script(argument)
self.assertEqual(
utils.liststr_to_dict(output.strip()),
utils.liststr_to_dict("['Ethernet0','Ethernet4','Ethernet8','Ethernet12','Ethernet-BP0','Ethernet-BP4','Ethernet-BP8','Ethernet-BP12']")
)

def test_hwsku_option_port_list_configdb(self):
mock.patch('device_info.get_path_to_port_config_file', mock.MagicMock(return_value=None))
argument = ["-k", ASIC_SKU, "-n", "asic0", "-v", "PORT.keys()|list"]
output = self.run_script(argument)
self.assertEqual(
utils.liststr_to_dict(output.strip()),
utils.liststr_to_dict("['Ethernet0','Ethernet4','Ethernet8','Ethernet12','Ethernet-BP0','Ethernet-BP4','Ethernet-BP8','Ethernet-BP12']")
)

def test_frontend_asic_ports_config_db(self):
argument = ["-m", self.sample_graph, "-p", self.port_config[0], "-n", "asic0", "--var-json", "PORT"]
output = json.loads(self.run_script(argument))
Expand Down