Skip to content

GCU Fix for DHCP Head PR #10109

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
yejianquan merged 2 commits into from
Sep 26, 2023
Merged

GCU Fix for DHCP Head PR #10109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9290b1d
GCU Fix
ridahanif96 Sep 24, 2023
8e160a4
Fix for checks
ridahanif96 Sep 25, 2023
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
11 changes: 7 additions & 4 deletions tests/common/fixtures/duthost_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ def utils_create_test_vlans(duthost, cfg_facts, vlan_ports_list, vlan_intfs_dict
delete_untagged_vlan: check to delete unttaged vlan
'''
cmds = []
port_mode_added = {} # Keep track of whether switchport mode has been added for each port
logger.info("Add vlans, assign IPs")
for k, v in list(vlan_intfs_dict.items()):
if v['orig']:
Expand All @@ -438,8 +439,10 @@ def utils_create_test_vlans(duthost, cfg_facts, vlan_ports_list, vlan_intfs_dict
for permit_vlanid in vlan_port['permit_vlanid']:
if vlan_intfs_dict[int(permit_vlanid)]['orig']:
continue
if (check_switchport_cmd(duthost, vlan_port['dev']) is True):
cmds.append('config switchport mode trunk {port}'.format(port=vlan_port['dev']))
if vlan_port['dev'] not in port_mode_added:
if (check_switchport_cmd(duthost, vlan_port['dev']) is True):
cmds.append('config switchport mode trunk {port}'.format(port=vlan_port['dev']))
port_mode_added[vlan_port['dev']] = True
cmds.append('config vlan member add {tagged} {id} {port}'.format(
tagged=('--untagged' if vlan_port['pvid'] == permit_vlanid else ''),
id=permit_vlanid,
Expand All @@ -458,8 +461,8 @@ def check_switchport_cmd(duthost, tport):
cmds = 'config switchport mode routed {port}'.format(port=tport)
logger.info("Commands: {}".format(cmds))
out = duthost.shell(cmds, module_ignore_errors=True)
return True

if out['rc'] == 0:
return True
return False


Expand Down