From 32f8696c6bc9aecc0030e659a3b0c2ae56271501 Mon Sep 17 00:00:00 2001 From: Rida Hanif <61490193+ridahanif96@users.noreply.github.com> Date: Sun, 28 Jan 2024 10:19:09 +0000 Subject: [PATCH] Fixing spaces and other issues --- src/sonic-config-engine/minigraph.py | 2 +- .../tests/sample_output/platform_output.json | 2 +- .../tests/t0-sample-autoneg-port-config.ini | 6 +++--- .../tests/t0-sample-port-config.ini | 10 +++++----- src/sonic-config-engine/tests/test_cfggen.py | 10 ++-------- src/sonic-config-engine/tests/test_multinpu_cfggen.py | 1 - 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index bd6f92cd43..0d97619d79 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -1953,7 +1953,7 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw for pc_mbr_del_key in pc_mbr_del_keys: del pc_members[pc_mbr_del_key] - # set default port channel MTU as 9100 and admin status up and default TPID 0x8100 + # set default port channel MTU as 9100 and admin status up and default TPID 0x8100 for pc in pcs.values(): pc['mtu'] = '9100' pc['tpid'] = '0x8100' diff --git a/src/sonic-config-engine/tests/sample_output/platform_output.json b/src/sonic-config-engine/tests/sample_output/platform_output.json index 8528a557ac..d62461ba36 100644 --- a/src/sonic-config-engine/tests/sample_output/platform_output.json +++ b/src/sonic-config-engine/tests/sample_output/platform_output.json @@ -1012,4 +1012,4 @@ "fec": "rs", "mode": "routed" } -} \ No newline at end of file +} 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 dff05ce2fa..547d7a4af8 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,11 +1,11 @@ # name lanes alias autoneg mode Ethernet0 29,30,31,32 fortyGigE0/0 off routed -Ethernet4 25,26,27,28 fortyGigE0/4 off trunk +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 +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 +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 diff --git a/src/sonic-config-engine/tests/t0-sample-port-config.ini b/src/sonic-config-engine/tests/t0-sample-port-config.ini index 17237f7d3e..acc03db9ac 100644 --- a/src/sonic-config-engine/tests/t0-sample-port-config.ini +++ b/src/sonic-config-engine/tests/t0-sample-port-config.ini @@ -9,16 +9,16 @@ Ethernet24 5,6,7,8 fortyGigE0/24 trunk Ethernet28 1,2,3,4 fortyGigE0/28 trunk Ethernet32 9,10,11,12 fortyGigE0/32 trunk Ethernet36 13,14,15,16 fortyGigE0/36 trunk -Ethernet40 21,22,23,24 fortyGigE0/40 trunk +Ethernet40 21,22,23,24 fortyGigE0/40 trunk Ethernet44 17,18,19,20 fortyGigE0/44 trunk Ethernet48 49,50,51,52 fortyGigE0/48 trunk Ethernet52 53,54,55,56 fortyGigE0/52 trunk Ethernet52 53,54,55,56 fortyGigE0/52 trunk Ethernet56 61,62,63,64 fortyGigE0/56 trunk Ethernet60 57,58,59,60 fortyGigE0/60 trunk -Ethernet64 65,66,67,68 fortyGigE0/64 trunk +Ethernet64 65,66,67,68 fortyGigE0/64 trunk Ethernet68 69,70,71,72 fortyGigE0/68 trunk -Ethernet72 77,78,79,80 fortyGigE0/72 trunk +Ethernet72 77,78,79,80 fortyGigE0/72 trunk Ethernet76 73,74,75,76 fortyGigE0/76 trunk Ethernet80 105,106,107,108 fortyGigE0/80 trunk Ethernet84 109,110,111,112 fortyGigE0/84 trunk @@ -26,9 +26,9 @@ Ethernet88 117,118,119,120 fortyGigE0/88 trunk Ethernet92 113,114,115,116 fortyGigE0/92 trunk Ethernet96 121,122,123,124 fortyGigE0/96 trunk Ethernet100 125,126,127,128 fortyGigE0/100 trunk -Ethernet104 85,86,87,88 fortyGigE0/104 trunk +Ethernet104 85,86,87,88 fortyGigE0/104 trunk Ethernet108 81,82,83,84 fortyGigE0/108 trunk Ethernet112 89,90,91,92 fortyGigE0/112 trunk Ethernet116 93,94,95,96 fortyGigE0/116 trunk Ethernet120 97,98,99,100 fortyGigE0/120 trunk -Ethernet124 101,102,103,104 fortyGigE0/124 trunk +Ethernet124 101,102,103,104 fortyGigE0/124 trunk diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py index 7810cd07f8..77f3f8992a 100644 --- a/src/sonic-config-engine/tests/test_cfggen.py +++ b/src/sonic-config-engine/tests/test_cfggen.py @@ -553,7 +553,7 @@ class TestCfgGen(TestCase): def test_minigraph_neighbor_interfaces(self): argument = ['-m', self.sample_graph_simple_case, '-p', self.port_config, '-v', "PORT"] output = self.run_script(argument) - self.maxDiff = None + self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( @@ -596,7 +596,7 @@ class TestCfgGen(TestCase): # test to check if PORT table is retrieved from config_db argument = ['-m', self.sample_graph_simple_case, '-p', self.port_config, '-v', "PORT"] output = self.run_script(argument) - self.maxDiff = None + self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( @@ -639,7 +639,6 @@ class TestCfgGen(TestCase): graph_file = kwargs.get('graph_file', self.sample_graph_simple) argument = ['-m', graph_file, '-p', self.port_config, '-v', "PORT"] output = self.run_script(argument) - self.maxDiff = None self.assertEqual( utils.to_dict(output.strip()), @@ -969,7 +968,6 @@ class TestCfgGen(TestCase): argument = ["-j", self.macsec_profile, "-m", self.sample_graph_voq, "-p", self.voq_port_config, "--var-json", "PORT"] output = self.run_script(argument) output_dict = utils.to_dict(output.strip()) - self.maxDiff = None self.assertDictEqual( output_dict['Ethernet-IB0'], { "lanes": "222", @@ -1085,7 +1083,6 @@ class TestCfgGen(TestCase): def test_minigraph_400g_to_100G_speed(self): argument = ["-j", self.macsec_profile, "-m", self.voq_sample_masic_graph, "-p", self.voq_port_config_400g, "-n", "asic0", "-v", "PORT"] output = self.run_script(argument) - self.maxDiff = None self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( @@ -1115,7 +1112,6 @@ class TestCfgGen(TestCase): argument = ["-m", self.sample_cisco_100_graph, "-p", self.sample_cisco_port_config_400g, "-v", "PORT"] self.assertTrue(self.yang.validate(argument)) output = self.run_script(argument) - self.maxDiff = None self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( @@ -1125,7 +1121,6 @@ class TestCfgGen(TestCase): def test_minigraph_cisco_400G_to_400G_speed(self): argument = ["-m", self.sample_cisco_400_graph, "-p", self.sample_cisco_port_config_400g, "-v", "PORT"] output = self.run_script(argument) - self.maxDiff = None self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( @@ -1138,7 +1133,6 @@ class TestCfgGen(TestCase): argument = ["-m", self.sample_cisco_8111_graph, "-p", self.sample_cisco_8111_port_config, "-v", "PORT"] self.assertTrue(self.yang.validate(argument)) output = self.run_script(argument) - self.maxDiff = None self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( diff --git a/src/sonic-config-engine/tests/test_multinpu_cfggen.py b/src/sonic-config-engine/tests/test_multinpu_cfggen.py index 2e78ab29d4..c60ab92448 100644 --- a/src/sonic-config-engine/tests/test_multinpu_cfggen.py +++ b/src/sonic-config-engine/tests/test_multinpu_cfggen.py @@ -187,7 +187,6 @@ class TestMultiNpuCfgGen(TestCase): output = self.run_script(argument) self.assertEqual( utils.liststr_to_dict(output.strip()), - utils.liststr_to_dict("['PortChannel4013|Ethernet-BP384', 'PortChannel4014|Ethernet-BP392', 'PortChannel4014|Ethernet-BP396', 'PortChannel4013|Ethernet-BP388']") )