Skip to content
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

Jump to bottom

set the queue length to original values after test #2893

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

set the queue length to original values after test #2893

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
54 changes: 29 additions & 25 deletions io/net/ethtool_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def test_ethtool(self):
"-l", self.interface, self.elapse)
output = process.run(cmd_l, shell=True, verbose=True,
ignore_status=True).stdout_text \
.splitlines()[2:6]
.splitlines()[7:11]
for i in range(len(output)):
default.append(output[i].split(':')[1])
if 'n/a' in output[i]:
Expand Down Expand Up @@ -193,10 +193,24 @@ def test_ethtool(self):
else:
self.fail("%s %s" % (
self.args, result.stderr_text))
cmd = "ethtool %s %s %s %s %s %s %s %s %s %s" % (
self.args, self.interface, self.param[0], value[0],
self.param[1], value[1], self.param[2], value[2],
self.param[3], value[3])
#cmd = "ethtool %s %s %s %s %s %s %s %s %s %s" % (
cmd = (
f"ethtool {self.args} {self.interface} {self.param[0]} {value[0]}"
f"{self.param[1]} {value[1]} {self.param[2]} {value[2]}"
f"{self.param[3]} {value[3]}"
)
ret = process.run(cmd, shell=True, verbose=True,
ignore_status=True)
if ret.exit_status != 0:
#self.fail("%s %s" % (self.args, ret.stderr_text))
self.fail(f"{self.args} {ret.stderr_text}")
# Set queue values to original values
#cmd = "ethtool %s %s %s %s %s %s %s %s %s %s" % (
Copy link
Collaborator

Choose a reason for hiding this comment

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

@vaishnavibhat Thanks for incorporating the changes, can you please remove the commented lines?

cmd = (
f"ethtool {self.args} {self.interface} {self.param[0]} {self.default_set[0]}"
f"{self.param[1]} {self.default_set[1]} {self.param[2]}"
f"{self.default_set[2]} {self.param[3]} {self.default_set[3]}"
)
ret = process.run(cmd, shell=True, verbose=True,
ignore_status=True)
if ret.exit_status != 0:
Expand All @@ -213,7 +227,7 @@ def test_ethtool(self):
self.fail("%s failed" % self.args)
if not wait.wait_for(lambda: self.networkinterface.are_packets_lost(
self.peer, options=['-c 10000', '-f']), timeout=30):
self.cancel("Packet received in Ping flood is not 100 percent \
self.cancel("Packet recieved in Ping flood is not 100 percent \
after waiting for 30sec")
if self.priv_test:
self.ethtool_toggle_priv_flags()
Expand Down Expand Up @@ -252,22 +266,12 @@ def tearDown(self):
'''
Set the interface up at the end of test.
'''
if self.interface:
if self.args == "-L":
cmd = "ethtool %s %s %s %s %s %s %s %s %s %s" % (
self.args, self.interface, self.param[0], self.default_set[0],
self.param[1], self.default_set[1], self.param[2],
self.default_set[2], self.param[3], self.default_set[3])
ret = process.run(cmd, shell=True, verbose=True,
ignore_status=True)
if ret.exit_status != 0:
self.fail("%s %s" % (self.args, ret.stderr_text))
self.interface_state_change(self.interface, "up", "yes")
self.networkinterface.remove_ipaddr(self.ipaddr, self.netmask)
try:
self.networkinterface.restore_from_backup()
except Exception:
self.networkinterface.remove_cfg_file()
self.log.info("backup file not available, could not restore file.")
if self.hbond:
self.networkinterface.restore_slave_cfg_file()
self.interface_state_change(self.interface, "up", "yes")
self.networkinterface.remove_ipaddr(self.ipaddr, self.netmask)
try:
self.networkinterface.restore_from_backup()
except Exception:
self.networkinterface.remove_cfg_file()
self.log.info("backup file not availbale, could not restore file.")
if self.hbond:
self.networkinterface.restore_slave_cfg_file()
Loading