diff --git a/tests/bgp/test_bgp_queue.py b/tests/bgp/test_bgp_queue.py index 35666cf1204..88ff7b50387 100644 --- a/tests/bgp/test_bgp_queue.py +++ b/tests/bgp/test_bgp_queue.py @@ -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() diff --git a/tests/common/devices/sonic_asic.py b/tests/common/devices/sonic_asic.py index 89e1b33f8b7..7bffb324027 100644 --- a/tests/common/devices/sonic_asic.py +++ b/tests/common/devices/sonic_asic.py @@ -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: @@ -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: + cmdstr = "sudo {} {}".format(cmdstr, self.cli_ns_option) + else: + cmdstr = "sudo ip netns exec {} {}".format(self.namespace, cmdstr) return self.sonichost.command(cmdstr)