Skip to content

Commit dd34d7c

Browse files
Revert "Skip default lanes dup check (sonic-net#3489)" (sonic-net#3572)
Reverts sonic-net/sonic-utilities#3489 since the PR: sonic-net#19968 has merged.
1 parent 6c8007f commit dd34d7c

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

generic_config_updater/gu_common.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ def validate_lanes(self, config_db):
239239
for port in port_to_lanes_map:
240240
lanes = port_to_lanes_map[port]
241241
for lane in lanes:
242-
# default lane would be 0, it does not need validate duplication.
243-
if lane in existing and lane != '0':
242+
if lane in existing:
244243
return False, f"'{lane}' lane is used multiple times in PORT: {set([port, existing[lane]])}"
245244
existing[lane] = port
246245
return True, None

tests/generic_config_updater/gu_common_test.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,6 @@ def test_validate_lanes__same_valid_lanes_multi_ports_no_spaces__failure(self):
361361
}}
362362
self.validate_lanes(config, '67')
363363

364-
def test_validate_lanes_default_value_duplicate_check(self):
365-
config = {"PORT": {
366-
"Ethernet0": {"lanes": "0", "speed": "10000"},
367-
"Ethernet1": {"lanes": "0", "speed": "10000"},
368-
}}
369-
self.validate_lanes(config)
370-
371364
def validate_lanes(self, config_db, expected_error=None):
372365
# Arrange
373366
config_wrapper = gu_common.ConfigWrapper()

0 commit comments

Comments
 (0)