diff options
| -rw-r--r-- | rumba/prototypes/ouroboros.py | 16 | ||||
| -rw-r--r-- | rumba/testbeds/jfed.py | 1 | ||||
| -rw-r--r-- | rumba/testbeds/local.py | 1 |
3 files changed, 12 insertions, 6 deletions
diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index c8d286f..2c16ea5 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -130,10 +130,11 @@ class Experiment(mod.Experiment): server_decorator=OurServer ) - _required = ['ip', 'port', 'org', 'token'] - for field in _required: - if field not in influxdb: - raise(Exception("Missing field %s in influx_db: %s" % field)) + if influxdb is not None: + _required = ['ip', 'port', 'org', 'token'] + for field in _required: + if field not in influxdb: + raise (Exception("Missing field %s in influx_db: %s" % field)) self.r_ipcps = dict() self.irmd = None @@ -303,9 +304,14 @@ class Experiment(mod.Experiment): def _set_phy_link_rate_to(self, src, dst, megabit): + autoneg = 'off' + + if megabit == 1000: + autoneg = 'on' + commands = ["route | grep $(ping server -c 1 | head -n1 | cut -f3 -d' ' | head -c -3 | tail -c +2) | " "grep -o '[^ ]*$' > iface ".format(dst), - "sudo ethtool -s $(cat iface) speed {} duplex full autoneg off".format(megabit), + "sudo ethtool -s $(cat iface) speed {} duplex full autoneg {}".format(megabit, autoneg), "sudo ip link set $(cat iface) down", "sudo ip link set $(cat iface) up && sleep 10", "sudo ethtool $(cat iface) | grep '{}Mb/s'".format(megabit), diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index be914cd..e9e281d 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -28,7 +28,6 @@ import subprocess import getpass import xml.dom.minidom as xml import os.path -import time import tarfile import sys diff --git a/rumba/testbeds/local.py b/rumba/testbeds/local.py index 85e9e95..9326d94 100644 --- a/rumba/testbeds/local.py +++ b/rumba/testbeds/local.py @@ -31,6 +31,7 @@ from rumba.executors.local import LocalExecutor logger = log.get_logger(__name__) + class Testbed(mod.Testbed): """ Local testbed, does not do anything. In the case of the Ouroboros |