Skip to content

fix: fix port does not exist error test_bgp_queue #15949

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 1 commit into from
Dec 11, 2024
Merged

fix: fix port does not exist error test_bgp_queue #15949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion tests/bgp/test_bgp_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def get_queue_counters(asichost, port, queue):
Return the counter for a given queue in given port
"""
cmd = "show queue counters {}".format(port)
output = asichost.command(cmd)['stdout_lines']
output = asichost.command(cmd, new_format=True)['stdout_lines']

txq = "UC{}".format(queue)
for line in output:
fields = line.split()
Expand Down
9 changes: 7 additions & 2 deletions tests/common/devices/sonic_asic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,12 @@ def create_ssh_tunnel_sai_rpc(self):
" -L *:{}:{}:{} localhost").format(self.get_rpc_port_ssh_tunnel(), ns_docker_if_ipv4,
self._RPC_PORT_FOR_SSH_TUNNEL))

def command(self, cmdstr):
def command(self, cmdstr, new_format=False):
"""
Prepend 'ip netns' option for commands meant for this ASIC

If new format is provided (new_format=True) we use the syntax "{cmd} -n asic{index}" instead.

Args:
cmdstr
Returns:
Expand All @@ -419,7 +421,10 @@ def command(self, cmdstr):
if not self.sonichost.is_multi_asic or self.namespace == DEFAULT_NAMESPACE:
return self.sonichost.command(cmdstr)

cmdstr = "sudo ip netns exec {} {}".format(self.namespace, cmdstr)
if new_format:
Copy link
Collaborator

@yejianquan yejianquan Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this change will go to 202405 branch
Could you please confirm the new format works well on single ASIC devices?

Copy link
Contributor Author

@auspham auspham Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yejianquan passed single-asic 202405 image

cmdstr = "sudo {} {}".format(cmdstr, self.cli_ns_option)
else:
cmdstr = "sudo ip netns exec {} {}".format(self.namespace, cmdstr)

return self.sonichost.command(cmdstr)

Expand Down