Merge ~kissiel/plainbox-provider-checkbox:iperf-fixes into plainbox-provider-checkbox:master

[Maciej Kisielewski]

This MR brings fixes iperf testing for commercial projects.
See individual commits for details.

[Jonathan Cave (jocave)]

I think previously we had discussed a resource manager type design that would try to catch crashes/errors and restore the initial state. Was that idea rejected for some reason?

[Maciej Kisielewski (kissiel)]

> I think previously we had discussed a resource manager type design that would
> try to catch crashes/errors and restore the initial state. Was that idea
> rejected for some reason?

Not rejected, but ... scheduled for a later date.
With all the things happening, I wanted to fix the most annoying problem first.

The 'architecture' of network.py makes any major refactor a significant undertaking. I don't know if it's of the highest priority.

[Jonathan Cave (jocave)]

Thanks, I'm ok with that approach. Code looks good to me.

review: Approve

diff --git a/bin/network.py b/bin/network.py
index 60f7b0a..3ed4770 100755
--- a/bin/network.py
+++ b/bin/network.py
@@ -631,18 +631,19 @@ def interface_test(args):
 
     error_number = 0
     # Stop all other interfaces
-    extra_interfaces = \
-        [iface for iface in os.listdir("/sys/class/net")
-         if iface != "lo" and iface != args.interface]
+    if not args.dont_toggle_ifaces:
+        extra_interfaces = \
+            [iface for iface in os.listdir("/sys/class/net")
+             if iface != "lo" and iface != args.interface]
 
-    for iface in extra_interfaces:
-        logging.debug("Shutting down interface:%s", iface)
-        try:
-            check_call(["ip", "link", "set", "dev", iface, "down"])
-        except CalledProcessError as interface_failure:
-            logging.error("Failed to shut down %s:%s",
-                          iface, interface_failure)
-            error_number = 3
+        for iface in extra_interfaces:
+            logging.debug("Shutting down interface:%s", iface)
+            try:
+                check_call(["ip", "link", "set", "dev", iface, "down"])
+            except CalledProcessError as interface_failure:
+                logging.error("Failed to shut down %s:%s",
+                              iface, interface_failure)
+                error_number = 3
 
     if error_number == 0:
         start_time = datetime.datetime.now()
@@ -664,14 +665,16 @@ def interface_test(args):
                 time.sleep(30)
                 first_loop = False
 
-    for iface in extra_interfaces:
-        logging.debug("Restoring interface:%s", iface)
-        try:
-            check_call(["ip", "link", "set", "dev", iface, "up"])
-            wait_for_iface_up(iface, args.iface_timeout)
-        except CalledProcessError as interface_failure:
-            logging.error("Failed to restore %s:%s", iface, interface_failure)
-            error_number = 3
+    if not args.dont_toggle_ifaces:
+        for iface in extra_interfaces:
+            logging.debug("Restoring interface:%s", iface)
+            try:
+                check_call(["ip", "link", "set", "dev", iface, "up"])
+                wait_for_iface_up(iface, args.iface_timeout)
+            except CalledProcessError as interface_failure:
+                logging.error(
+                    "Failed to restore %s:%s", iface, interface_failure)
+                error_number = 3
 
     # Restore routing table to original state
     temp.seek(0)
@@ -833,6 +836,9 @@ TEST_TARGET_IPERF = iperf-server.example.com
     test_parser.add_argument(
         '--reverse', default=False, action="store_true",
         help="Run in reverse mode (server sends, client receives)")
+    test_parser.add_argument(
+        '--dont-toggle-ifaces', default=False, action="store_true",
+        help="Do not turn of other interfaces while testing.")
 
     # Sub info options
     info_parser.add_argument(
diff --git a/units/ethernet/test-plan.pxu b/units/ethernet/test-plan.pxu
index 5e003ae..cfc23bd 100644
--- a/units/ethernet/test-plan.pxu
+++ b/units/ethernet/test-plan.pxu
@@ -68,6 +68,9 @@ include:
     ethernet/ethtool_info
     ethernet/ethertool_check_.*
     ethernet/multi_iperf3_nic_device.*
+bootstrap_include:
+    device
+    executable
 
 id: server-ethernet-underspeed
 unit: test plan
@@ -79,3 +82,6 @@ include:
     ethernet/ethtool_info
     ethernet/ethertool_check_.*
     ethernet/multi_iperf3_nic_underspeed_device.*
+bootstrap_include:
+    device
+    executable