From 78c97cb758d576c330da58fd4136b6ed90f8f3a4 Mon Sep 17 00:00:00 2001 From: Rida Hanif <61490193+ridahanif96@users.noreply.github.com> Date: Thu, 28 Dec 2023 18:30:29 +0000 Subject: [PATCH] Fix for failures --- .../tests/sample_output/py2/l2switch.json | 96 ++++++++++++------- .../tests/sample_output/py3/l2switch.json | 96 ++++++++++++------- .../tests/t0-sample-autoneg-port-config.ini | 66 ++++++------- src/sonic-config-engine/tests/test_cfggen.py | 4 +- 4 files changed, 163 insertions(+), 99 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/py2/l2switch.json b/src/sonic-config-engine/tests/sample_output/py2/l2switch.json index 5c38ba7201..957b660c77 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/l2switch.json +++ b/src/sonic-config-engine/tests/sample_output/py2/l2switch.json @@ -4,162 +4,194 @@ "Ethernet8": { "alias": "fortyGigE0/8", "lanes": "37,38,39,40", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet0": { "alias": "fortyGigE0/0", "lanes": "29,30,31,32", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet4": { "alias": "fortyGigE0/4", "lanes": "25,26,27,28", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet108": { "alias": "fortyGigE0/108", "lanes": "81,82,83,84", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet100": { "alias": "fortyGigE0/100", "lanes": "125,126,127,128", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet104": { "alias": "fortyGigE0/104", "lanes": "85,86,87,88", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet68": { "alias": "fortyGigE0/68", "lanes": "69,70,71,72", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet96": { "alias": "fortyGigE0/96", "lanes": "121,122,123,124", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet124": { "alias": "fortyGigE0/124", "lanes": "101,102,103,104", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet92": { "alias": "fortyGigE0/92", "lanes": "113,114,115,116", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet120": { "alias": "fortyGigE0/120", "lanes": "97,98,99,100", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet52": { "alias": "fortyGigE0/52", "lanes": "53,54,55,56", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet56": { "alias": "fortyGigE0/56", "lanes": "61,62,63,64", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet76": { "alias": "fortyGigE0/76", "lanes": "73,74,75,76", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet72": { "alias": "fortyGigE0/72", "lanes": "77,78,79,80", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet64": { "alias": "fortyGigE0/64", "lanes": "65,66,67,68", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet32": { "alias": "fortyGigE0/32", "lanes": "9,10,11,12", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet16": { "alias": "fortyGigE0/16", "lanes": "41,42,43,44", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet36": { "alias": "fortyGigE0/36", "lanes": "13,14,15,16", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet12": { "alias": "fortyGigE0/12", "lanes": "33,34,35,36", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet88": { "alias": "fortyGigE0/88", "lanes": "117,118,119,120", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet116": { "alias": "fortyGigE0/116", "lanes": "93,94,95,96", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet80": { "alias": "fortyGigE0/80", "lanes": "105,106,107,108", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet112": { "alias": "fortyGigE0/112", "lanes": "89,90,91,92", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet84": { "alias": "fortyGigE0/84", "lanes": "109,110,111,112", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet48": { "alias": "fortyGigE0/48", "lanes": "49,50,51,52", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet44": { "alias": "fortyGigE0/44", "lanes": "17,18,19,20", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet40": { "alias": "fortyGigE0/40", "lanes": "21,22,23,24", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet28": { "alias": "fortyGigE0/28", "lanes": "1,2,3,4", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet60": { "alias": "fortyGigE0/60", "lanes": "57,58,59,60", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet20": { "alias": "fortyGigE0/20", "lanes": "45,46,47,48", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet24": { "alias": "fortyGigE0/24", "lanes": "5,6,7,8", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" } }, "VLAN": { diff --git a/src/sonic-config-engine/tests/sample_output/py3/l2switch.json b/src/sonic-config-engine/tests/sample_output/py3/l2switch.json index fa3363ab74..7315eae695 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/l2switch.json +++ b/src/sonic-config-engine/tests/sample_output/py3/l2switch.json @@ -4,162 +4,194 @@ "Ethernet0": { "alias": "fortyGigE0/0", "lanes": "29,30,31,32", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet4": { "alias": "fortyGigE0/4", "lanes": "25,26,27,28", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet8": { "alias": "fortyGigE0/8", "lanes": "37,38,39,40", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet12": { "alias": "fortyGigE0/12", "lanes": "33,34,35,36", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet16": { "alias": "fortyGigE0/16", "lanes": "41,42,43,44", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet20": { "alias": "fortyGigE0/20", "lanes": "45,46,47,48", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet24": { "alias": "fortyGigE0/24", "lanes": "5,6,7,8", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet28": { "alias": "fortyGigE0/28", "lanes": "1,2,3,4", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet32": { "alias": "fortyGigE0/32", "lanes": "9,10,11,12", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet36": { "alias": "fortyGigE0/36", "lanes": "13,14,15,16", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet40": { "alias": "fortyGigE0/40", "lanes": "21,22,23,24", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet44": { "alias": "fortyGigE0/44", "lanes": "17,18,19,20", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet48": { "alias": "fortyGigE0/48", "lanes": "49,50,51,52", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet52": { "alias": "fortyGigE0/52", "lanes": "53,54,55,56", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet56": { "alias": "fortyGigE0/56", "lanes": "61,62,63,64", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet60": { "alias": "fortyGigE0/60", "lanes": "57,58,59,60", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet64": { "alias": "fortyGigE0/64", "lanes": "65,66,67,68", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet68": { "alias": "fortyGigE0/68", "lanes": "69,70,71,72", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet72": { "alias": "fortyGigE0/72", "lanes": "77,78,79,80", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet76": { "alias": "fortyGigE0/76", "lanes": "73,74,75,76", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet80": { "alias": "fortyGigE0/80", "lanes": "105,106,107,108", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet84": { "alias": "fortyGigE0/84", "lanes": "109,110,111,112", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet88": { "alias": "fortyGigE0/88", "lanes": "117,118,119,120", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet92": { "alias": "fortyGigE0/92", "lanes": "113,114,115,116", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet96": { "alias": "fortyGigE0/96", "lanes": "121,122,123,124", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet100": { "alias": "fortyGigE0/100", "lanes": "125,126,127,128", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet104": { "alias": "fortyGigE0/104", "lanes": "85,86,87,88", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet108": { "alias": "fortyGigE0/108", "lanes": "81,82,83,84", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet112": { "alias": "fortyGigE0/112", "lanes": "89,90,91,92", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet116": { "alias": "fortyGigE0/116", "lanes": "93,94,95,96", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet120": { "alias": "fortyGigE0/120", "lanes": "97,98,99,100", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" }, "Ethernet124": { "alias": "fortyGigE0/124", "lanes": "101,102,103,104", - "admin_status": "up" + "admin_status": "up", + "mode": "trunk" } }, "VLAN": { diff --git a/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini b/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini index 91e2283eb4..dff05ce2fa 100644 --- a/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini +++ b/src/sonic-config-engine/tests/t0-sample-autoneg-port-config.ini @@ -1,33 +1,33 @@ -# name lanes alias autoneg -Ethernet0 29,30,31,32 fortyGigE0/0 off -Ethernet4 25,26,27,28 fortyGigE0/4 off -Ethernet8 37,38,39,40 fortyGigE0/8 off -Ethernet12 33,34,35,36 fortyGigE0/12 off -Ethernet16 41,42,43,44 fortyGigE0/16 off -Ethernet20 45,46,47,48 fortyGigE0/20 off -Ethernet24 5,6,7,8 fortyGigE0/24 off -Ethernet28 1,2,3,4 fortyGigE0/28 off -Ethernet32 9,10,11,12 fortyGigE0/32 off -Ethernet36 13,14,15,16 fortyGigE0/36 off -Ethernet40 21,22,23,24 fortyGigE0/40 off -Ethernet44 17,18,19,20 fortyGigE0/44 off -Ethernet48 49,50,51,52 fortyGigE0/48 off -Ethernet52 53,54,55,56 fortyGigE0/52 off -Ethernet56 61,62,63,64 fortyGigE0/56 off -Ethernet60 57,58,59,60 fortyGigE0/60 off -Ethernet64 65,66,67,68 fortyGigE0/64 off -Ethernet68 69,70,71,72 fortyGigE0/68 off -Ethernet72 77,78,79,80 fortyGigE0/72 off -Ethernet76 73,74,75,76 fortyGigE0/76 off -Ethernet80 105,106,107,108 fortyGigE0/80 off -Ethernet84 109,110,111,112 fortyGigE0/84 off -Ethernet88 117,118,119,120 fortyGigE0/88 off -Ethernet92 113,114,115,116 fortyGigE0/92 off -Ethernet96 121,122,123,124 fortyGigE0/96 off -Ethernet100 125,126,127,128 fortyGigE0/100 off -Ethernet104 85,86,87,88 fortyGigE0/104 off -Ethernet108 81,82,83,84 fortyGigE0/108 off -Ethernet112 89,90,91,92 fortyGigE0/112 on -Ethernet116 93,94,95,96 fortyGigE0/116 on -Ethernet120 97,98,99,100 fortyGigE0/120 on -Ethernet124 101,102,103,104 fortyGigE0/124 on +# name lanes alias autoneg mode +Ethernet0 29,30,31,32 fortyGigE0/0 off routed +Ethernet4 25,26,27,28 fortyGigE0/4 off trunk +Ethernet8 37,38,39,40 fortyGigE0/8 off trunk +Ethernet12 33,34,35,36 fortyGigE0/12 off trunk +Ethernet16 41,42,43,44 fortyGigE0/16 off trunk +Ethernet20 45,46,47,48 fortyGigE0/20 off trunk +Ethernet24 5,6,7,8 fortyGigE0/24 off trunk +Ethernet28 1,2,3,4 fortyGigE0/28 off trunk +Ethernet32 9,10,11,12 fortyGigE0/32 off trunk +Ethernet36 13,14,15,16 fortyGigE0/36 off trunk +Ethernet40 21,22,23,24 fortyGigE0/40 off trunk +Ethernet44 17,18,19,20 fortyGigE0/44 off trunk +Ethernet48 49,50,51,52 fortyGigE0/48 off trunk +Ethernet52 53,54,55,56 fortyGigE0/52 off trunk +Ethernet56 61,62,63,64 fortyGigE0/56 off trunk +Ethernet60 57,58,59,60 fortyGigE0/60 off trunk +Ethernet64 65,66,67,68 fortyGigE0/64 off trunk +Ethernet68 69,70,71,72 fortyGigE0/68 off trunk +Ethernet72 77,78,79,80 fortyGigE0/72 off trunk +Ethernet76 73,74,75,76 fortyGigE0/76 off trunk +Ethernet80 105,106,107,108 fortyGigE0/80 off trunk +Ethernet84 109,110,111,112 fortyGigE0/84 off trunk +Ethernet88 117,118,119,120 fortyGigE0/88 off trunk +Ethernet92 113,114,115,116 fortyGigE0/92 off trunk +Ethernet96 121,122,123,124 fortyGigE0/96 off trunk +Ethernet100 125,126,127,128 fortyGigE0/100 off trunk +Ethernet104 85,86,87,88 fortyGigE0/104 off trunk +Ethernet108 81,82,83,84 fortyGigE0/108 off trunk +Ethernet112 89,90,91,92 fortyGigE0/112 on trunk +Ethernet116 93,94,95,96 fortyGigE0/116 on trunk +Ethernet120 97,98,99,100 fortyGigE0/120 on trunk +Ethernet124 101,102,103,104 fortyGigE0/124 on routed diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py index 3dd01eee2d..f4924e94e0 100644 --- a/src/sonic-config-engine/tests/test_cfggen.py +++ b/src/sonic-config-engine/tests/test_cfggen.py @@ -335,7 +335,7 @@ class TestCfgGen(TestCase): output = self.run_script(argument) self.assertEqual( utils.to_dict(output.strip()), - utils.to_dict("{'PortChannel1': {'admin_status': 'up', 'min_links': '1', 'mtu': '9100', 'tpid': '0x8100','mode': 'routed', 'lacp_key': 'auto'}}") + utils.to_dict("{'PortChannel1': {'admin_status': 'up', 'min_links': '1', 'mtu': '9100', 'tpid': '0x8100','lacp_key': 'auto'}}") ) def test_minigraph_portchannel_with_more_member(self): @@ -343,7 +343,7 @@ class TestCfgGen(TestCase): output = self.run_script(argument) self.assertEqual( utils.to_dict(output.strip()), - utils.to_dict("{'PortChannel01': {'admin_status': 'up', 'min_links': '3', 'mode':'routed', 'mtu': '9100','tpid': '0x8100', 'lacp_key': 'auto'}}")) + utils.to_dict("{'PortChannel01': {'admin_status': 'up', 'min_links': '3', 'mtu': '9100','tpid': '0x8100', 'lacp_key': 'auto'}}")) def test_minigraph_portchannel_members(self): argument = ['-m', self.sample_graph_pc_test, '-p', self.port_config, '-v', "PORTCHANNEL_MEMBER.keys()|list"]