[PATCH-next 0/3] Test set completeness patch set No 1

From: Christos Sfakianakis <csfakian(a)redhat.com&gt;

Hi,

this patchset is the first in a potential series relating to the complete recipe set.
It handles issues popped up after python2->3 move, reduces code repetition in recipes
and addresses generic recipe bugs.

Christos 

Christos Sfakianakis (3):
  lnst.{Recipes.ENRT,Tests}: fixes with respect to python 3 switch
  lnst.{Recipes.ENRT,RecipeCommon}: remove unnecessary code, fix typos,
    names, logical errors, mtu setters
  lnst.Recipes.ENRT: reduce code repetition

 .../Perf/Measurements/IperfFlowMeasurement.py |  4 +-
 lnst/Recipes/ENRT/BaseEnrtRecipe.py           |  6 +-
 lnst/Recipes/ENRT/BondRecipe.py               | 28 ++++----
 lnst/Recipes/ENRT/DoubleBondRecipe.py         | 28 ++++----
 lnst/Recipes/ENRT/DoubleTeamRecipe.py         | 47 +++++--------
 lnst/Recipes/ENRT/IpsecEspAeadRecipe.py       | 11 +--
 lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py     | 17 ++---
 lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py     | 14 ++--
 lnst/Recipes/ENRT/PingFloodRecipe.py          | 11 +--
 .../ENRT/ShortLivedConnectionsRecipe.py       | 11 +--
 lnst/Recipes/ENRT/SimpleMacsecRecipe.py       |  7 +-
 lnst/Recipes/ENRT/SimplePerfRecipe.py         | 12 ++--
 lnst/Recipes/ENRT/TeamRecipe.py               | 21 +++---
 lnst/Recipes/ENRT/TeamVsBondRecipe.py         | 36 ++++------
 lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py       | 13 ++--
 .../VirtualBridgeVlanInGuestMirroredRecipe.py | 52 ++++++--------
 .../ENRT/VirtualBridgeVlanInGuestRecipe.py    | 35 ++++------
 .../VirtualBridgeVlanInHostMirroredRecipe.py  | 43 +++++-------
 .../ENRT/VirtualBridgeVlanInHostRecipe.py     | 26 +++----
 .../ENRT/VirtualBridgeVlansOverBondRecipe.py  | 34 +++-------
 ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 62 ++++++-----------
 .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 34 ++++------
 ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 43 +++++-------
 .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py  | 26 +++----
 .../VirtualOvsBridgeVlansOverBondRecipe.py    | 67 +++++--------------
 lnst/Recipes/ENRT/VlansOverBondRecipe.py      | 30 ++++-----
 lnst/Recipes/ENRT/VlansOverTeamRecipe.py      | 21 ++----
 lnst/Recipes/ENRT/VlansRecipe.py              | 12 ++--
 lnst/Recipes/ENRT/VxlanMulticastRecipe.py     | 26 +++----
 lnst/Recipes/ENRT/VxlanRemoteRecipe.py        | 11 ++-
 lnst/Recipes/ENRT/XfrmTools.py                |  4 +-
 lnst/Tests/PacketAssert.py                    |  4 +-
 32 files changed, 286 insertions(+), 510 deletions(-)

-- 
2.17.1

[PATCH-next 1/3] lnst.{Recipes.ENRT,Tests}: fixes with respect to python 3 switch

From: Christos Sfakianakis <csfakian(a)redhat.com&gt;

Make the following changes to comply with python 3:
    - lnst.Recipes.ENRT.BaseEnrtRecipe: convert regex and 'split' arguments
      in _pin_dev_interrupts from text into bytes.
    - lnst.Recipes.ENRT.XfrmTools: in the case of 'ipsec_esp_aead', use new
integer
      division operator for the key construction. Decode bytes to text in the case of
      'esp_ah_comp' fucntion.
    - lnst.Tests.PacketAssert: convert the output/error of the packet assert process
      into text.
    - lnst.Recipes.ENRT.SimpleMacsecRecipe: convert zip result into a sequence to
      support indexing.

Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com&gt;
---
 lnst/Recipes/ENRT/BaseEnrtRecipe.py     | 6 +++---
 lnst/Recipes/ENRT/SimpleMacsecRecipe.py | 2 +-
 lnst/Recipes/ENRT/XfrmTools.py          | 4 ++--
 lnst/Tests/PacketAssert.py              | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index 249fffa..60f61ad 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -341,7 +341,7 @@ class BaseEnrtRecipe(PingTestAndEvaluate, PerfRecipe):
     def _pin_dev_interrupts(self, dev, cpu):
         netns = dev.netns
         cpu_info = netns.run("lscpu").stdout
-        regex = "CPU\(s\): *([0-9]*)"
+        regex = b"CPU\(s\): *([0-9]*)"
         num_cpus = int(re.search(regex, cpu_info).groups()[0])
         if cpu < 0 or cpu > num_cpus - 1:
             raise RecipeError("Invalid CPU value given: %d. Accepted value %s."
%
@@ -351,14 +351,14 @@ class BaseEnrtRecipe(PingTestAndEvaluate, PerfRecipe):
         res = netns.run("grep {} /proc/interrupts | cut -f1 -d: | sed 's/
//'"
                         .format(dev.name))
         intrs = res.stdout
-        split = res.stdout.split("\n")
+        split = res.stdout.split(b"\n")
         if len(split) == 1 and split[0] == '':
             res = netns.run("dev_irqs=/sys/class/net/{}/device/msi_irqs; "
                             "[ -d $dev_irqs ] && ls -1 $dev_irqs"
                             .format(dev.name))
             intrs = res.stdout
 
-        for intr in intrs.split("\n"):
+        for intr in intrs.split(b"\n"):
             try:
                 int(intr)
                 netns.run("echo -n {} > /proc/irq/{}/smp_affinity_list"
diff --git a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
index 47ab907..1da586d 100644
--- a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
+++ b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
@@ -129,7 +129,7 @@ class SimpleMacsecRecipe(BaseEnrtRecipe):
             net_addr = "192.168.100"
             net_addr6 = "fc00:0:0:0"
             host1, host2 = main_config.host1, main_config.host2
-            k_ids = zip(self.ids, self.keys)
+            k_ids = list(zip(self.ids, self.keys))
             hosts_and_keys = [(host1, host2, k_ids), (host2, host1, k_ids[::-1])]
             for host_a, host_b, k_ids in hosts_and_keys:
                 host_a.msec0 = MacsecDevice(realdev=host_a.eth0,
encrypt=sub_config.encrypt)
diff --git a/lnst/Recipes/ENRT/XfrmTools.py b/lnst/Recipes/ENRT/XfrmTools.py
index 468259e..d6dadb4 100644
--- a/lnst/Recipes/ENRT/XfrmTools.py
+++ b/lnst/Recipes/ENRT/XfrmTools.py
@@ -2,7 +2,7 @@ from lnst.Common.LnstError import LnstError
 
 def generate_key(length):
     key = "0x"
-    key = key + (length/8) * "0b"
+    key = key + (length//8) * "0b"
     return key
 
 def configure_ipsec_esp_aead(m1, ip1, m2, ip2, algo, algo_key, icv_len,
@@ -40,7 +40,7 @@ def configure_ipsec_esp_ah_comp(m1, ip1, m2, ip2, ciph_alg, ciph_key,
hash_alg,
     m_keys = []
     for m in [m1, m2]:
         res = m.run("rpm -qa iproute")
-        if (res.stdout.find("iproute-2") != -1):
+        if (res.stdout.decode().find("iproute-2") != -1):
             m_keys.append("0x")
         else:
             m_keys.append("")
diff --git a/lnst/Tests/PacketAssert.py b/lnst/Tests/PacketAssert.py
index 9452a4f..25a92ba 100644
--- a/lnst/Tests/PacketAssert.py
+++ b/lnst/Tests/PacketAssert.py
@@ -76,8 +76,8 @@ class PacketAssert(BaseTestModule):
             raise LnstError("Could not handle interrupt properly.")
 
         with packet_assert_process.stdout, packet_assert_process.stderr:
-            stderr=packet_assert_process.stderr.read()
-            stdout=packet_assert_process.stdout.read()
+            stderr=packet_assert_process.stderr.read().decode()
+            stdout=packet_assert_process.stdout.read().decode()
 
         self._res_data["stderr"] = stderr
 
-- 
2.17.1

[PATCH-next 2/3] lnst.{Recipes.ENRT,RecipeCommon}: remove unnecessary code, fix typos, names, logical errors, mtu setters

From: Christos Sfakianakis <csfakian(a)redhat.com&gt;

Make the following changes:
    - lnst.Recipes.ENRT.DoubleBondRecipe: replace 3 of the 6 references to
      'adaptive_tx_coalescing' to 'adaptive_rx_coalescing'.
    - lnst.RecipeCommon.Perf.Measurements.IperfFlowMeasurement: when cpupin is zero, we
      get the message that it is negative. Correct this by checking its value against
      'None' explicitly at the first 'if' clause.
    - lnst.Recipes.ENRT.IpsecEspAhCompRecipe: the second packet assert config should have
      a pass threshold equal to the count of the corresponding ping config.
    - lnst.Recipes.ENRT: remove 'vlan' from the comment sections in all recipes,
as the
      2-endpoint limitation applies to all.
    - lnst.Recipes.ENRT.PingFloodRecipe: define 'mtu' as IntParam (currently
undefined).
      Redefine size as optional param. Remove 'TODO' comment.
    - lnst.Recipes.ENRT.SimplePerfRecipe: remove line where configuration.params are set,
      as these are not used in the code subsequently.
    - lnst.Recipes.ENRT.VirtualBridgeVlansOverBondRecipe: remove '1.2.3.4' ip from
the bond
      devices (previous NM requirement, not applicable to this branch). Correct host name
      reference used for MTU settings.
    - lnst.Recipes.ENRT.VirtualOvsBridgeVlanInGuestMirroredRecipe: rename 'eth1'
to 'eth0'
      to match adopted naming scheme. Remove checks on host2.eth0 and host2.tap0 prior to
      enslaving them in the bridge (not necessary).
    - lnst.Recipes.ENRT.VlansOverBondRecipe: change bond name to follow the conventional
      naming scheme.
    - lnst.Recipes.ENRT.VlansOverTeamRecipe: remove ip address from the team device as it
      is not used (previous issue with NM, now not applicable).
    - lnst.Recipes.ENRT.VxlanMulticastRecipe: if mtu is defined, have it set during vxlan
      initialization, rather than post-setting it. This is to avoid netlink errors,
similar
      in nature with vlan-related recipes.
    - lnst.Recipes.ENRT.VxlanRemoteRecipe: if defined, have mtu being set during
initialization
      of the vxlan devices to avoid netlink errors (similar to vlan related recipes).

Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com&gt;
---
 .../Perf/Measurements/IperfFlowMeasurement.py |  4 +-
 lnst/Recipes/ENRT/DoubleBondRecipe.py         |  4 +-
 lnst/Recipes/ENRT/IpsecEspAeadRecipe.py       |  2 +-
 lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py     |  8 ++--
 lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py     |  2 +-
 lnst/Recipes/ENRT/PingFloodRecipe.py          | 11 ++++--
 .../ENRT/ShortLivedConnectionsRecipe.py       |  2 +-
 lnst/Recipes/ENRT/SimplePerfRecipe.py         |  1 -
 lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py       |  2 +-
 .../VirtualBridgeVlanInGuestMirroredRecipe.py |  2 +-
 .../ENRT/VirtualBridgeVlanInGuestRecipe.py    |  2 +-
 .../ENRT/VirtualBridgeVlansOverBondRecipe.py  | 13 +++----
 ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 37 +++++++------------
 .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py |  2 +-
 .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py  |  2 +-
 lnst/Recipes/ENRT/VlansOverBondRecipe.py      | 16 ++++----
 lnst/Recipes/ENRT/VlansOverTeamRecipe.py      |  3 +-
 lnst/Recipes/ENRT/VlansRecipe.py              |  2 +-
 lnst/Recipes/ENRT/VxlanMulticastRecipe.py     | 12 +++---
 lnst/Recipes/ENRT/VxlanRemoteRecipe.py        | 11 +++---
 20 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
b/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
index c16eb94..b1795be 100644
--- a/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
+++ b/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
@@ -113,7 +113,7 @@ class IperfFlowMeasurement(BaseFlowMeasurement):
         server_params = dict(bind = ipaddress(flow.receiver_bind),
                              oneoff = True)
 
-        if flow.cpupin and flow.cpupin >= 0:
+        if flow.cpupin is not None and flow.cpupin >= 0:
             if flow.parallel_streams == 1:
                 server_params["cpu_bind"] = flow.cpupin
             else:
@@ -140,7 +140,7 @@ class IperfFlowMeasurement(BaseFlowMeasurement):
         else:
             raise RecipeError("Unsupported flow type
'{}'".format(flow.type))
 
-        if flow.cpupin and flow.cpupin >= 0:
+        if flow.cpupin is not None and flow.cpupin >= 0:
             if flow.parallel_streams == 1:
                 client_params["cpu_bind"] = flow.cpupin
             else:
diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py
b/lnst/Recipes/ENRT/DoubleBondRecipe.py
index 3b437af..c9fdc50 100644
--- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
@@ -53,10 +53,10 @@ class DoubleBondRecipe(BaseEnrtRecipe):
             host.eth1.up()
             host.bond0.up()
 
-        if "adaptive_tx_coalescing" in self.params:
+        if "adaptive_rx_coalescing" in self.params:
             for host in [host1, host2]:
                 for dev in [host.eth0, host.eth1]:
-                    dev.adaptive_tx_coalescing = self.params.adaptive_tx_coalescing
+                    dev.adaptive_rx_coalescing = self.params.adaptive_rx_coalescing
         if "adaptive_tx_coalescing" in self.params:
             for host in [host1, host2]:
                 for dev in [host.eth0, host.eth1]:
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
index c78b130..ded15a6 100644
--- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
@@ -176,7 +176,7 @@ class IpsecEspAeadRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
             host.eth0.ip_add(ipaddress(net_addr6 + str(i+1) + "::1/64"))
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.eth0
         configuration.endpoint2 = host2.eth0
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
index 70a52cd..b4ab4a7 100644
--- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
@@ -158,15 +158,17 @@ class IpsecEspAhCompRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
 
         dump2 = m1.run("tcpdump -i %s -nn -vv" % if1_name, bg=True)
         no_trans = self.params.ipsec_mode != 'transport'
+        ping_config2 = copy(ping_config)
+        ping_config2[0].size = 1500
         if no_trans:
             pa_kwargs2 = copy(pa_kwargs)
             pa_kwargs2["p_filter"] = ''
             pa_kwargs2["grep_for"] = ["IPComp"]
+            if ping_config2[0].count:
+                pa_kwargs2["p_min"] = ping_config2[0].count
             pa_config2 = PacketAssertConf(m2, if2, **pa_kwargs2)
             self.packet_assert_test_start(pa_config2)
         self.ctl.wait(2)
-        ping_config2 = copy(ping_config)
-        ping_config2[0].size = 1500
         ping_result2 = super(IpsecEspAhCompRecipe, self).ping_test(ping_config2)
         self.ctl.wait(2)
         if no_trans:
@@ -204,7 +206,7 @@ class IpsecEspAhCompRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
             host.eth0.ip_add(ipaddress(net_addr6 + str(i+1) + "::1/64"))
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.eth0
         configuration.endpoint2 = host2.eth0
diff --git a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
index 31e2635..4c365a2 100644
--- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
@@ -41,7 +41,7 @@ class NoVirtOvsVxlanRecipe(BaseEnrtRecipe):
             host.br0.flows_add(flow_entries)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.int0
         configuration.endpoint2 = host2.int0
diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py
index 0b0c574..b7dabc8 100644
--- a/lnst/Recipes/ENRT/PingFloodRecipe.py
+++ b/lnst/Recipes/ENRT/PingFloodRecipe.py
@@ -17,12 +17,12 @@ class PingFloodRecipe(PingTestAndEvaluate):
     host2 = HostReq()
     host2.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
 
-    #TODO: use a parameter for the network
     src_addr = StrParam(default = "192.168.1.1/24")
     dst_addr = StrParam(default = "192.168.1.2/24")
     count = IntParam(default = 100)
     interval = StrParam(default = 0.2)
-    size = IntParam(default = None)
+    size = IntParam(mandatory = False)
+    mtu = IntParam(mandatory = False)
 
     def test(self):
         host1, host2 = self.matched.host1, self.matched.host2
@@ -41,9 +41,12 @@ class PingFloodRecipe(PingTestAndEvaluate):
         ip2 = host2.eth0.ips[0]
         cn = self.params.count
         iv = self.params.interval
-        sz = self.params.size
+        if "size" in self.params:
+            sz = self.params.size
+        else:
+            sz = None
 
-        pcfg=PingConf(host1, if1, host2, ip2, count = cn, interval = iv, size = sz or
None)
+        pcfg=PingConf(host1, if1, host2, ip2, count = cn, interval = iv, size = sz)
 
         result = self.ping_test([pcfg])
         self.ping_evaluate_and_report(pcfg, result)
diff --git a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
index 422e68b..42a2d86 100644
--- a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
+++ b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
@@ -31,7 +31,7 @@ class ShortLivedConnectionsRecipe(BaseEnrtRecipe):
             host.eth0.ip_add(ipaddress(net_addr + "." + str(i) +
"/24"))
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.eth0
         configuration.endpoint2 = host2.eth0
diff --git a/lnst/Recipes/ENRT/SimplePerfRecipe.py
b/lnst/Recipes/ENRT/SimplePerfRecipe.py
index 263bc83..bc23a97 100644
--- a/lnst/Recipes/ENRT/SimplePerfRecipe.py
+++ b/lnst/Recipes/ENRT/SimplePerfRecipe.py
@@ -26,7 +26,6 @@ class SimplePerfRecipe(BaseEnrtRecipe):
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.eth0
         configuration.endpoint2 = host2.eth0
-        configuration.params = self.params
 
         if "mtu" in self.params:
             host1.eth0.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
index 3c25bc8..0b04e39 100644
--- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
@@ -67,7 +67,7 @@ class VirtOvsVxlanRecipe(BaseEnrtRecipe):
             guest.eth0.ip_add(ipaddress(vxlan_net_addr6 + "::" + str (i+1) +
"/64"))
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = guest1.eth0
         configuration.endpoint2 = guest3.eth0
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 9a2ae93..83d9f41 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -69,7 +69,7 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         guest2.vlan0 = VlanDevice(**guest2_vlan_args0)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = guest1.vlan0
         configuration.endpoint2 = guest2.vlan0
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index 02e15b3..c712e28 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -57,7 +57,7 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
         guest1.vlan0 = VlanDevice(**guest1_vlan_args0)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = guest1.vlan0
         configuration.endpoint2 = host2.vlan0
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index 39d1866..d40f3a0 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -70,11 +70,11 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
         host2_vlan_args1 = dict(realdev=host2.bond0, vlan_id=20, master=host2.br1)
         if "mtu" in self.params:
             for host in [host1, host2]:
-                host1.bond0.mtu = self.params.mtu
-                host1.tap0.mtu = self.params.mtu
-                host1.tap1.mtu = self.params.mtu
-                host1.br0.mtu = self.params.mtu
-                host1.br1.mtu = self.params.mtu
+                host.bond0.mtu = self.params.mtu
+                host.tap0.mtu = self.params.mtu
+                host.tap1.mtu = self.params.mtu
+                host.br0.mtu = self.params.mtu
+                host.br1.mtu = self.params.mtu
             for guest in [guest1, guest2, guest3, guest4]:
                 guest.eth0.mtu = self.params.mtu
             for vlan_args in (host1_vlan_args0, host1_vlan_args1,
@@ -87,7 +87,7 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
         host2.vlan1 = VlanDevice(**host2_vlan_args1)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = guest1.eth0
         configuration.endpoint2 = guest3.eth0
@@ -98,7 +98,6 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
         net_addr6_2 = "fc00:0:0:2"
 
         for host, (guest_a, guest_b), n in [(host1, (guest1, guest2), 1), (host2,
(guest3, guest4), 3)]:
-            host.bond0.ip_add(ipaddress("1.2.3.4"))
             host.br0.ip_add(ipaddress(net_addr_1 + "." + str(n) +
"/24"))
             host.br1.ip_add(ipaddress(net_addr_2 + "." + str(n) +
"/24"))
             guest_a.eth0.ip_add(ipaddress(net_addr_1 + "." + str(n+1) +
"/24"))
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index a744337..61510af 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -13,11 +13,11 @@ from lnst.Common.LnstError import LnstError
 
 class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
     host1 = HostReq()
-    host1.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
+    host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
 
     host2 = HostReq()
-    host2.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
+    host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host2.tap0 = DeviceReq(label="to_guest2")
 
     guest1 = HostReq()
@@ -36,20 +36,11 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1, guest2 = self.matched.host1, self.matched.host2,
self.matched.guest1, self.matched.guest2
 
-        host1.eth1.down()
-        host1.tap0.down()
-        host1.br0 = OvsBridgeDevice()
-        for host, dev in [(host1, host1.eth1), (host1, host1.tap0)]:
-            host.br0.port_add(dev)
-
-        host2.eth1.down()
-        host2.tap0.down()
-        host2.br0 = OvsBridgeDevice()
-        for host, dev in [(host2, host2.eth1), (host2, host2.tap0)]:
-            if dev.master != None:
-                if "ovs" not in dev.master.name:
-                    host.br0.port_add(dev)
-            else:
+        for host in [host1, host2]:
+            host.eth0.down()
+            host.tap0.down()
+            host.br0 = OvsBridgeDevice()
+            for dev in [host.eth0, host.tap0]:
                 host.br0.port_add(dev)
 
         guest1.eth0.down()
@@ -59,10 +50,10 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
         guest2_vlan_args0 = dict(realdev=guest2.eth0, vlan_id=10)
         if "mtu" in self.params:
-            host1.eth1.mtu = self.params.mtu
+            host1.eth0.mtu = self.params.mtu
             host1.tap0.mtu = self.params.mtu
             host1.br0.mtu = self.params.mtu
-            host2.eth1.mtu = self.params.mtu
+            host2.eth0.mtu = self.params.mtu
             host2.tap0.mtu = self.params.mtu
             host2.br0.mtu = self.params.mtu
             guest1.eth0.mtu = self.params.mtu
@@ -74,7 +65,7 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         guest2.vlan0 = VlanDevice(**guest2_vlan_args0)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = guest1.vlan0
         configuration.endpoint2 = guest2.vlan0
@@ -87,10 +78,10 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         guest2.vlan0.ip_add(ipaddress(net_addr_1 + ".4/24"))
         guest2.vlan0.ip_add(ipaddress(net_addr6_1 + "::4/64"))
 
-        host1.eth1.up()
+        host1.eth0.up()
         host1.tap0.up()
         host1.br0.up()
-        host2.eth1.up()
+        host2.eth0.up()
         host2.tap0.up()
         host2.br0.up()
         guest1.eth0.up()
@@ -105,11 +96,11 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         if "dev_intr_cpu" in self.params:
             for host in [host1, host2]:
                 host.run("service irqbalance stop")
-                self._pin_dev_interrupts(host.eth1, self.params.dev_intr_cpu)
+                self._pin_dev_interrupts(host.eth0, self.params.dev_intr_cpu)
 
         if self.params.perf_parallel_streams > 1:
             for host in [host1, host2]:
-                host.run("tc qdisc replace dev %s root mq" % host.eth1.name)
+                host.run("tc qdisc replace dev %s root mq" % host.eth0.name)
 
         return configuration
 
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index d719e84..8f628b6 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -56,7 +56,7 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
         guest1.vlan0 = VlanDevice(**guest1_vlan_args0)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = guest1.vlan0
         configuration.endpoint2 = host2.vlan0
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index 397bebe..ce646ec 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -54,7 +54,7 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
         host2.vlan0 = VlanDevice(**host2_vlan_args0)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host2.vlan0
         configuration.endpoint2 = guest1.eth0
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index b48cf4d..9c788c1 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -30,18 +30,18 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        host1.bond = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
+        host1.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
         host1.eth0.down()
         host1.eth1.down()
-        host1.bond.slave_add(host1.eth0)
-        host1.bond.slave_add(host1.eth1)
+        host1.bond0.slave_add(host1.eth0)
+        host1.bond0.slave_add(host1.eth1)
 
-        host1_vlan_args0 = dict(realdev=host1.bond, vlan_id=10)
-        host1_vlan_args1 = dict(realdev=host1.bond, vlan_id=20)
+        host1_vlan_args0 = dict(realdev=host1.bond0, vlan_id=10)
+        host1_vlan_args1 = dict(realdev=host1.bond0, vlan_id=20)
         host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
         host2_vlan_args1 = dict(realdev=host2.eth0, vlan_id=20)
         if "mtu" in self.params:
-            host1.bond.mtu = self.params.mtu
+            host1.bond0.mtu = self.params.mtu
             host2.eth0.mtu = self.params.mtu
             for vlan_args in (host1_vlan_args0, host1_vlan_args1,
                               host2_vlan_args0, host2_vlan_args1):
@@ -53,7 +53,7 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
         host2.vlan1 = VlanDevice(**host2_vlan_args1)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.vlan0
         configuration.endpoint2 = host2.vlan0
@@ -71,7 +71,7 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
 
         host1.eth0.up()
         host1.eth1.up()
-        host1.bond.up()
+        host1.bond0.up()
         host1.vlan0.up()
         host1.vlan1.up()
         host2.eth0.up()
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index 0867677..a470512 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -53,7 +53,7 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
         host2.vlan1 = VlanDevice(**host2_vlan_args1)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.vlan0
         configuration.endpoint2 = host2.vlan0
@@ -63,7 +63,6 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
         net_addr6_1 = "fc00:0:0:1"
         net_addr6_2 = "fc00:0:0:2"
 
-        host1.team0.ip_add(ipaddress("1.2.3.4/24"))
         for i, host in enumerate([host1, host2]):
             host.vlan0.ip_add(ipaddress(net_addr_1 + "." + str(i+1) +
"/24"))
             host.vlan0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+1) +
"/64"))
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index 95a70a2..8e20535 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -45,7 +45,7 @@ class VlansRecipe(BaseEnrtRecipe):
         host2.vlan1 = VlanDevice(**host2_vlan_args1)
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.vlan0
         configuration.endpoint2 = host2.vlan0
diff --git a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
index 53ada96..b489278 100644
--- a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
@@ -35,24 +35,24 @@ class VxlanMulticastRecipe(BaseEnrtRecipe):
         host1.br0.slave_add(host1.eth0)
         host1.br0.slave_add(host1.tap0)
 
+        vxlan_args = dict(vxlan_id=1, group=vxlan_group_ip)
+        if "mtu" in self.params:
+            vxlan_args["mtu"] = self.params.mtu
+
         for i, (machine, dev) in enumerate([(host1, host1.br0), (guest1, guest1.eth0),
                                             (host2, host2.eth0)]):
             dev.ip_add(ipaddress(net_addr + "." + str(i+1) + "/24"))
-            machine.vxlan0 = VxlanDevice(vxlan_id='1', group=vxlan_group_ip)
+            machine.vxlan0 = VxlanDevice(**vxlan_args)
             machine.vxlan0.realdev = dev
             machine.vxlan0.ip_add(ipaddress(vxlan_net_addr + "." + str (i+1) +
"/24"))
             machine.vxlan0.ip_add(ipaddress(vxlan_net_addr6 + "::" + str (i+1)
+ "/64"))
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.vxlan0
         configuration.endpoint2 = host2.vxlan0
 
-        if "mtu" in self.params:
-            for machine in [host1, host2, guest1]:
-                machine.vxlan0.mtu = self.params.mtu
-
         for machine in [host1, host2, guest1]:
             machine.eth0.up()
         host1.tap0.up()
diff --git a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
index 99e2522..2890851 100644
--- a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
@@ -26,21 +26,20 @@ class VxlanRemoteRecipe(BaseEnrtRecipe):
 
         for i, host in enumerate([host1, host2]):
             host.eth0.ip_add(ipaddress(net_addr + "." + str(i+1) +
"/24"))
-            host.vxlan0 = VxlanDevice(vxlan_id='1', remote=net_addr +
"." + str(2-i))
+            vxlan_args = dict(vxlan_id='1', remote=net_addr + "." +
str(2-i))
+            if "mtu" in self.params:
+                vxlan_args["mtu"] = self.params.mtu
+            host.vxlan0 = VxlanDevice(**vxlan_args)
             host.vxlan0.realdev = host.eth0
             host.vxlan0.ip_add(ipaddress(vxlan_net_addr + "." + str (i+1) +
"/24"))
             host.vxlan0.ip_add(ipaddress(vxlan_net_addr6 + "::" + str (i+1) +
"/64"))
 
         #Due to limitations in the current EnrtConfiguration
-        #class, a single vlan test pair is chosen
+        #class, a single test pair is chosen
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.vxlan0
         configuration.endpoint2 = host2.vxlan0
 
-        if "mtu" in self.params:
-            for host in [host1, host2]:
-                host.vxlan0.mtu = self.params.mtu
-
         for host in [host1, host2]:
             host.eth0.up()
             host.vxlan0.up()
-- 
2.17.1

[PATCH-next 3/3] lnst.Recipes.ENRT: reduce code repetition

From: Christos Sfakianakis <csfakian(a)redhat.com&gt;

Reduce repetitive coding in recipes using loops while maintaining
readability.

Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com&gt;
---
 lnst/Recipes/ENRT/BondRecipe.py               | 28 ++++----
 lnst/Recipes/ENRT/DoubleBondRecipe.py         | 24 +++----
 lnst/Recipes/ENRT/DoubleTeamRecipe.py         | 47 +++++--------
 lnst/Recipes/ENRT/IpsecEspAeadRecipe.py       |  9 +--
 lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py     |  9 +--
 lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py     | 12 ++--
 .../ENRT/ShortLivedConnectionsRecipe.py       |  9 +--
 lnst/Recipes/ENRT/SimpleMacsecRecipe.py       |  5 +-
 lnst/Recipes/ENRT/SimplePerfRecipe.py         | 11 ++-
 lnst/Recipes/ENRT/TeamRecipe.py               | 21 +++---
 lnst/Recipes/ENRT/TeamVsBondRecipe.py         | 36 ++++------
 lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py       | 11 +--
 .../VirtualBridgeVlanInGuestMirroredRecipe.py | 50 +++++---------
 .../ENRT/VirtualBridgeVlanInGuestRecipe.py    | 33 ++++-----
 .../VirtualBridgeVlanInHostMirroredRecipe.py  | 43 +++++-------
 .../ENRT/VirtualBridgeVlanInHostRecipe.py     | 26 +++----
 .../ENRT/VirtualBridgeVlansOverBondRecipe.py  | 31 +++------
 ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 33 ++++-----
 .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 32 +++------
 ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 43 +++++-------
 .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py  | 24 ++-----
 .../VirtualOvsBridgeVlansOverBondRecipe.py    | 67 +++++--------------
 lnst/Recipes/ENRT/VlansOverBondRecipe.py      | 18 ++---
 lnst/Recipes/ENRT/VlansOverTeamRecipe.py      | 18 ++---
 lnst/Recipes/ENRT/VlansRecipe.py              | 10 +--
 lnst/Recipes/ENRT/VxlanMulticastRecipe.py     | 14 ++--
 26 files changed, 224 insertions(+), 440 deletions(-)

diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py
index bbe2d57..3a18354 100644
--- a/lnst/Recipes/ENRT/BondRecipe.py
+++ b/lnst/Recipes/ENRT/BondRecipe.py
@@ -29,31 +29,27 @@ class BondRecipe(BaseEnrtRecipe):
         host1, host2 = self.matched.host1, self.matched.host2
 
         host1.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
-        host1.eth0.down()
-        host1.eth1.down()
-        host1.bond0.slave_add(host1.eth0)
-        host1.bond0.slave_add(host1.eth1)
+        for dev in [host1.eth0, host1.eth1]:
+            dev.down()
+            host1.bond0.slave_add(dev)
 
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.bond0
         configuration.endpoint2 = host2.eth0
 
+        net_addr = "192.168.101"
+        net_addr6 = "fc00:0:0:0"
+        for i, dev in enumerate([host1.bond0, host2.eth0]):
+            dev.ip_add(ipaddress(net_addr + "." + str(i+1) + "/24"))
+            dev.ip_add(ipaddress(net_addr6 + "::" + str(i+1) +
"/64"))
+
+        for dev in [host1.eth0, host1.eth1, host1.bond0, host2.eth0]:
+            dev.up()
+
         if "mtu" in self.params:
             host1.bond0.mtu = self.params.mtu
             host2.eth0.mtu = self.params.mtu
 
-        net_addr = "192.168.101"
-        net_addr6 = "fc00:0:0:0"
-        host1.bond0.ip_add(ipaddress(net_addr + ".1/24"))
-        host1.bond0.ip_add(ipaddress(net_addr6 + "::1/64"))
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.bond0.up()
-
-        host2.eth0.ip_add(ipaddress(net_addr + ".2/24"))
-        host2.eth0.ip_add(ipaddress(net_addr6 + "::2/64"))
-        host2.eth0.up()
-
         if "adaptive_rx_coalescing" in self.params:
             for dev in [host1.eth0, host1.eth1, host2.eth0]:
                 dev.adaptive_rx_coalescing = self.params.adaptive_rx_coalescing
diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py
b/lnst/Recipes/ENRT/DoubleBondRecipe.py
index c9fdc50..599563a 100644
--- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
@@ -29,12 +29,17 @@ class DoubleBondRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        for host in (host1, host2):
+        net_addr = "192.168.101"
+        net_addr6 = "fc00:0:0:0"
+        for i, host in enumerate([host1, host2]):
             host.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
-            host.eth0.down()
-            host.eth1.down()
-            host.bond0.slave_add(host.eth0)
-            host.bond0.slave_add(host.eth1)
+            for dev in [host.eth0, host.eth1]:
+                dev.down()
+                host.bond0.slave_add(dev)
+            host.bond0.ip_add(ipaddress(net_addr + "." + str(i+1) +
"/24"))
+            host.bond0.ip_add(ipaddress(net_addr6 + "::" + str(i+1) +
"/64"))
+            for dev in [host.eth0, host.eth1, host.bond0]:
+                dev.up()
 
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.bond0
@@ -44,15 +49,6 @@ class DoubleBondRecipe(BaseEnrtRecipe):
             host1.bond0.mtu = self.params.mtu
             host2.bond0.mtu = self.params.mtu
 
-        net_addr = "192.168.101"
-        net_addr6 = "fc00:0:0:0"
-        for i, host in enumerate([host1, host2]):
-            host.bond0.ip_add(ipaddress(net_addr + "." + str(i+1) +
"/24"))
-            host.bond0.ip_add(ipaddress(net_addr6 + "::" + str(i+1) +
"/64"))
-            host.eth0.up()
-            host.eth1.up()
-            host.bond0.up()
-
         if "adaptive_rx_coalescing" in self.params:
             for host in [host1, host2]:
                 for dev in [host.eth0, host.eth1]:
diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
index cea3542..1191430 100644
--- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
@@ -29,44 +29,27 @@ class DoubleTeamRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        host1.eth0.down()
-        host1.eth1.down()
-        #The config argument needs to be used with a team device normally (e.g  to
specify
-        #the runner mode), but it is not used here due to a bug in the TeamDevice module
-        host1.team0 = TeamDevice()
-        host1.team0.slave_add(host1.eth0)
-        host1.team0.slave_add(host1.eth1)
-
-        host2.eth0.down()
-        host2.eth1.down()
-        host2.team0 = TeamDevice()
-        host2.team0.slave_add(host2.eth0)
-        host2.team0.slave_add(host2.eth1)
+        net_addr_1 = "192.168.10"
+        net_addr6_1 = "fc00:0:0:1"
+        for i, host in enumerate([host1, host2]):
+            #The config argument needs to be used with a team device normally (e.g  to
specify
+            #the runner mode), but it is not used here due to a bug in the TeamDevice
module
+            host.team0 = TeamDevice()
+            for dev in [host.eth0, host.eth1]:
+                dev.down()
+                host.team0.slave_add(dev)
+            if "mtu" in self.params:
+                host.team0.mtu = self.params.mtu
+            host.team0.ip_add(ipaddress(net_addr_1 + "." + str(i+1) +
"/24"))
+            host.team0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+1) +
"/64"))
+            for dev in [host.eth0, host.eth1, host.team0]:
+                dev.up()
 
         #EnrtConfiguration and both-side Netperf config need to be checked
         configuration = EnrtConfiguration()
         configuration.endpoint1 = host1.team0
         configuration.endpoint2 = host2.team0
 
-        if "mtu" in self.params:
-            host1.team0.mtu = self.params.mtu
-            host2.team0.mtu = self.params.mtu
-
-        net_addr_1 = "192.168.10"
-        net_addr6_1 = "fc00:0:0:1"
-
-        host1.team0.ip_add(ipaddress(net_addr_1 + ".1/24"))
-        host1.team0.ip_add(ipaddress(net_addr6_1 + "::1/64"))
-        host2.team0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.team0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.team0.up()
-        host2.eth0.up()
-        host2.eth1.up()
-        host2.team0.up()
-
         if "adaptive_rx_coalescing" in self.params:
             for host in [host1, host2]:
                 for dev in [host.eth0, host.eth1]:
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
index ded15a6..ae615a7 100644
--- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
@@ -165,15 +165,13 @@ class IpsecEspAeadRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        for host in [host1, host2]:
-            host.eth0.down()
-
         net_addr = "192.168."
         net_addr6 = "fc00:"
-
         for i, host in enumerate([host1, host2]):
+            host.eth0.down()
             host.eth0.ip_add(ipaddress(net_addr + str(i+99) + ".1/24"))
             host.eth0.ip_add(ipaddress(net_addr6 + str(i+1) + "::1/64"))
+            host.eth0.up()
 
         #Due to limitations in the current EnrtConfiguration
         #class, a single test pair is chosen
@@ -189,9 +187,6 @@ class IpsecEspAeadRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
             for host in [host1, host2]:
                 host.eth0.mtu = self.params.mtu
 
-        for host in [host1, host2]:
-            host.eth0.up()
-
         for host, dst in [(host1, host2), (host2, host1)]:
             for family in [AF_INET, AF_INET6]:
                 host.run("ip route add %s dev %s" %
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
index b4ab4a7..6c74fae 100644
--- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
@@ -195,15 +195,13 @@ class IpsecEspAhCompRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        for host in [host1, host2]:
-            host.eth0.down()
-
         net_addr = "192.168."
         net_addr6 = "fc00:"
-
         for i, host in enumerate([host1, host2]):
+            host.eth0.down()
             host.eth0.ip_add(ipaddress(net_addr + str(i+99) + ".1/24"))
             host.eth0.ip_add(ipaddress(net_addr6 + str(i+1) + "::1/64"))
+            host.eth0.up()
 
         #Due to limitations in the current EnrtConfiguration
         #class, a single test pair is chosen
@@ -219,9 +217,6 @@ class IpsecEspAhCompRecipe(BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
             for host in [host1, host2]:
                 host.eth0.mtu = self.params.mtu
 
-        for host in [host1, host2]:
-            host.eth0.up()
-
         for host, dst in [(host1, host2), (host2, host1)]:
             for family in [AF_INET, AF_INET6]:
                 host.run("ip route add %s dev %s" %
diff --git a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
index 4c365a2..6e246df 100644
--- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
@@ -17,9 +17,6 @@ class NoVirtOvsVxlanRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        for host in [host1, host2]:
-            host.eth0.down()
-
         net_addr = "192.168.2"
         vxlan_net_addr = "192.168.100"
         vxlan_net_addr6 = "fc00:0:0:0"
@@ -30,6 +27,7 @@ class NoVirtOvsVxlanRecipe(BaseEnrtRecipe):
         flow_entries.append("table=0,priority=100,actions=drop")
 
         for i, host in enumerate([host1, host2]):
+            host.eth0.down()
             host.eth0.ip_add(ipaddress(net_addr + "." + str (i+1) +
"/24"))
             host.br0 = OvsBridgeDevice()
             host.int0 = host.br0.internal_port_add(ofport_request='5',
name="int0")
@@ -39,6 +37,9 @@ class NoVirtOvsVxlanRecipe(BaseEnrtRecipe):
                            "ofport_request" : "10"}
             host.br0.tunnel_add("vxlan", tunnel_opts)
             host.br0.flows_add(flow_entries)
+            host.eth0.up()
+            host.int0.up()
+            host.br0.up()
 
         #Due to limitations in the current EnrtConfiguration
         #class, a single test pair is chosen
@@ -50,11 +51,6 @@ class NoVirtOvsVxlanRecipe(BaseEnrtRecipe):
             for host in [host1, host2]:
                 host.int0.mtu = self.params.mtu
 
-        for host in [host1, host2]:
-            host.eth0.up()
-            host.int0.up()
-            host.br0.up()
-
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
             for host in [host1, host2]:
diff --git a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
index 42a2d86..3af503d 100644
--- a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
+++ b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
@@ -22,13 +22,11 @@ class ShortLivedConnectionsRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        for host in [host1, host2]:
-            host.eth0.down()
-
         net_addr = "192.168.101"
-
         for i, host in enumerate([host1, host2], 10):
+            host.eth0.down()
             host.eth0.ip_add(ipaddress(net_addr + "." + str(i) +
"/24"))
+            host.eth0.up()
 
         #Due to limitations in the current EnrtConfiguration
         #class, a single test pair is chosen
@@ -40,9 +38,6 @@ class ShortLivedConnectionsRecipe(BaseEnrtRecipe):
             for host in [host1, host2]:
                 host.eth0.mtu = self.params.mtu
 
-        for host in [host1, host2]:
-            host.eth0.up()
-
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
             for host in [host1, host2]:
diff --git a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
index 1da586d..17cbc68 100644
--- a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
+++ b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
@@ -71,12 +71,9 @@ class SimpleMacsecRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        for host in [host1, host2]:
-            host.eth0.down()
-
         net_addr = "192.168.0"
-
         for i, host in enumerate([host1, host2]):
+            host.eth0.down()
             host.eth0.ip_add(ipaddress(net_addr + '.' + str(i+1) +
"/24"))
 
         #Due to limitations in the current EnrtConfiguration
diff --git a/lnst/Recipes/ENRT/SimplePerfRecipe.py
b/lnst/Recipes/ENRT/SimplePerfRecipe.py
index bc23a97..53e4086 100644
--- a/lnst/Recipes/ENRT/SimplePerfRecipe.py
+++ b/lnst/Recipes/ENRT/SimplePerfRecipe.py
@@ -31,13 +31,10 @@ class SimplePerfRecipe(BaseEnrtRecipe):
             host1.eth0.mtu = self.params.mtu
             host2.eth0.mtu = self.params.mtu
 
-        host1.eth0.ip_add(ipaddress("192.168.101.1/24"))
-        host1.eth0.ip_add(ipaddress("fc00::1/64"))
-        host1.eth0.up()
-
-        host2.eth0.ip_add(ipaddress("192.168.101.2/24"))
-        host2.eth0.ip_add(ipaddress("fc00::2/64"))
-        host2.eth0.up()
+        for i, host in enumerate([host1, host2]):
+            host.eth0.ip_add(ipaddress("192.168.101." + str(i+1) +
"/24"))
+            host.eth0.ip_add(ipaddress("fc00::" + str(i+1) + "/64"))
+            host.eth0.up()
 
         if "adaptive_rx_coalescing" in self.params:
             for host in [host1, host2]:
diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py
index 93d1c05..3fa866b 100644
--- a/lnst/Recipes/ENRT/TeamRecipe.py
+++ b/lnst/Recipes/ENRT/TeamRecipe.py
@@ -28,13 +28,12 @@ class TeamRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        host1.eth0.down()
-        host1.eth1.down()
         #The config argument needs to be used with a team device normally (e.g  to
specify
         #the runner mode), but it is not used here due to a bug in the TeamDevice module
         host1.team0 = TeamDevice()
-        host1.team0.slave_add(host1.eth0)
-        host1.team0.slave_add(host1.eth1)
+        for dev in [host1.eth0, host1.eth1]:
+            dev.down()
+            host1.team0.slave_add(dev)
 
         #EnrtConfiguration and both-side Netperf config need to be checked
         configuration = EnrtConfiguration()
@@ -47,16 +46,12 @@ class TeamRecipe(BaseEnrtRecipe):
 
         net_addr_1 = "192.168.10"
         net_addr6_1 = "fc00:0:0:1"
+        for i, dev in enumerate([host1.team0, host2.eth0]):
+            dev.ip_add(ipaddress(net_addr_1 + "." + str(i+1) +
"/24"))
+            dev.ip_add(ipaddress(net_addr6_1 + "::" + str(i+1) +
"/64"))
 
-        host1.team0.ip_add(ipaddress(net_addr_1 + ".1/24"))
-        host1.team0.ip_add(ipaddress(net_addr6_1 + "::1/64"))
-        host2.eth0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.eth0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.team0.up()
-        host2.eth0.up()
+        for dev in [host1.eth0, host1.eth1, host1.team0, host2.eth0]:
+            dev.up()
 
         if "adaptive_rx_coalescing" in self.params:
             for dev in [host1.eth0, host1.eth1, host2.eth0]:
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index 5170071..0f3b66e 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -33,19 +33,21 @@ class TeamVsBondRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        host1.eth0.down()
-        host1.eth1.down()
+        net_addr_1 = "192.168.10"
+        net_addr6_1 = "fc00:0:0:1"
         #The config argument needs to be used with a team device normally (e.g  to
specify
         #the runner mode), but it is not used here due to a bug in the TeamDevice module
         host1.team0 = TeamDevice()
-        host1.team0.slave_add(host1.eth0)
-        host1.team0.slave_add(host1.eth1)
 
-        host2.eth0.down()
-        host2.eth1.down()
         host2.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
-        host2.bond0.slave_add(host2.eth0)
-        host2.bond0.slave_add(host2.eth1)
+
+        for i, (host, dev) in enumerate([(host1, host1.team0), (host2, host2.bond0)]):
+            host.eth0.down()
+            host.eth1.down()
+            dev.slave_add(host.eth0)
+            dev.slave_add(host.eth1)
+            dev.ip_add(ipaddress(net_addr_1 + "." + str(i+1) +
"/24"))
+            dev.ip_add(ipaddress(net_addr6_1 + "::" + str(i+1) +
"/64"))
 
         #EnrtConfiguration and both-side Netperf config need to be checked
         configuration = EnrtConfiguration()
@@ -56,20 +58,10 @@ class TeamVsBondRecipe(BaseEnrtRecipe):
             host1.team0.mtu = self.params.mtu
             host2.bond0.mtu = self.params.mtu
 
-        net_addr_1 = "192.168.10"
-        net_addr6_1 = "fc00:0:0:1"
-
-        host1.team0.ip_add(ipaddress(net_addr_1 + ".1/24"))
-        host1.team0.ip_add(ipaddress(net_addr6_1 + "::1/64"))
-        host2.bond0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.bond0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.team0.up()
-        host2.eth0.up()
-        host2.eth1.up()
-        host2.bond0.up()
+        for host, dev in [(host1, host1.team0), (host2, host2.bond0)]:
+            host.eth0.up()
+            host.eth1.up()
+            dev.up()
 
         if "adaptive_rx_coalescing" in self.params:
             for host in [host1, host2]:
diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
index 0b04e39..5a47306 100644
--- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
@@ -61,10 +61,13 @@ class VirtOvsVxlanRecipe(BaseEnrtRecipe):
                            "ofport_request" : '10'}
             host.br0.tunnel_add("vxlan", tunnel_opts)
             host.br0.flows_add(flow_entries)
+            for dev in [host.eth0, host.tap0, host.tap1, host.br0]:
+                dev.up()
 
         for i, guest in enumerate([guest1, guest2, guest3, guest4]):
             guest.eth0.ip_add(ipaddress(vxlan_net_addr + "." + str (i+1) +
"/24"))
             guest.eth0.ip_add(ipaddress(vxlan_net_addr6 + "::" + str (i+1) +
"/64"))
+            guest.eth0.up()
 
         #Due to limitations in the current EnrtConfiguration
         #class, a single test pair is chosen
@@ -76,14 +79,6 @@ class VirtOvsVxlanRecipe(BaseEnrtRecipe):
             for guest in [guest1, guest2, guest3, guest4]:
                 guest.eth0.mtu = self.params.mtu
 
-        for host in [host1, host2]:
-            host.eth0.up()
-            host.tap0.up()
-            host.tap1.up()
-            host.br0.up()
-        for guest in [guest1, guest2, guest3, guest4]:
-            guest.eth0.up()
-
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
             for machine in [host1, host2, guest1, guest2, guest3, guest4]:
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 83d9f41..64d6fa6 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -35,17 +35,11 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1, guest2 = self.matched.host1, self.matched.host2,
self.matched.guest1, self.matched.guest2
 
-        host1.eth0.down()
-        host1.tap0.down()
-        host1.br0 = BridgeDevice()
-        host1.br0.slave_add(host1.eth0)
-        host1.br0.slave_add(host1.tap0)
-
-        host2.eth0.down()
-        host2.tap0.down()
-        host2.br0 = BridgeDevice()
-        host2.br0.slave_add(host2.eth0)
-        host2.br0.slave_add(host2.tap0)
+        for host in [host1, host2]:
+            host.br0 = BridgeDevice()
+            for dev in [host.eth0, host.tap0]:
+                dev.down()
+                host.br0.slave_add(dev)
 
         guest1.eth0.down()
 
@@ -54,12 +48,9 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
         guest2_vlan_args0 = dict(realdev=guest2.eth0, vlan_id=10)
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            host2.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.br0.mtu = self.params.mtu
+            for host in [host1, host2]:
+                for dev in [host.eth0, host.tap0, host.br0]:
+                    dev.mtu = self.params.mtu
             guest1.eth0.mtu = self.params.mtu
             guest2.eth0.mtu = self.params.mtu
             for vlan_args in (guest1_vlan_args0, guest2_vlan_args0):
@@ -79,21 +70,16 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
 
         host1.br0.ip_add(ipaddress(net_addr_1 + ".1/24"))
         host2.br0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        guest1.vlan0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.vlan0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-        guest2.vlan0.ip_add(ipaddress(net_addr_1 + ".4/24"))
-        guest2.vlan0.ip_add(ipaddress(net_addr6_1 + "::4/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.tap0.up()
-        host2.br0.up()
-        guest1.eth0.up()
-        guest1.vlan0.up()
-        guest2.eth0.up()
-        guest2.vlan0.up()
+        for i, guest in enumerate([guest1, guest2]):
+            guest.vlan0.ip_add(ipaddress(net_addr_1 + "." + str(i+3) +
"/24"))
+            guest.vlan0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+3) +
"/64"))
+
+        for host in [host1, host2]:
+            for dev in [host.eth0, host.tap0, host.br0]:
+                dev.up()
+        for guest in [guest1, guest2]:
+            guest.eth0.up()
+            guest.vlan0.up()
 
         #TODO better service handling through HostAPI
         if "perf_tool_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index c712e28..9542437 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -31,11 +31,10 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1 = self.matched.host1, self.matched.host2,
self.matched.guest1
 
-        host1.eth0.down()
-        host1.tap0.down()
         host1.br0 = BridgeDevice()
-        host1.br0.slave_add(host1.eth0)
-        host1.br0.slave_add(host1.tap0)
+        for dev in [host1.eth0, host1.tap0]:
+            dev.down()
+            host1.br0.slave_add(dev)
 
         host2.eth0.down()
 
@@ -45,11 +44,8 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
         guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
 
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            guest1.eth0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
+            for dev in [host1.eth0, host1.tap0, host1.br0, guest1.eth0, host2.eth0]:
+                dev.mtu = self.params.mtu
             for vlan_args in (host2_vlan_args0, guest1_vlan_args0):
                 vlan_args["mtu"] = self.params.mtu
 
@@ -66,18 +62,13 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
         net_addr6_1 = "fc00:0:0:1"
 
         host1.br0.ip_add(ipaddress(net_addr_1 + ".1/24"))
-        host2.vlan0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.vlan0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-        guest1.vlan0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.vlan0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        guest1.eth0.up()
-        guest1.vlan0.up()
+        for i, machine in enumerate([host2, guest1]):
+            machine.vlan0.ip_add(ipaddress(net_addr_1 + "." + str(i+2) +
"/24"))
+            machine.vlan0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+2) +
"/64"))
+
+        for dev in [host1.eth0, host1.tap0, host1.br0, host2.eth0,
+                    host2.vlan0, guest1.eth0, guest1.vlan0]:
+            dev.up()
 
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
index 1c9ea4d..793cebc 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -35,15 +35,11 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1, guest2 = self.matched.host1, self.matched.host2,
self.matched.guest1, self.matched.guest2
 
-        host1.eth0.down()
-        host1.tap0.down()
-        host1.br0 = BridgeDevice()
-        host1.br0.slave_add(host1.tap0)
-
-        host2.eth0.down()
-        host2.tap0.down()
-        host2.br0 = BridgeDevice()
-        host2.br0.slave_add(host2.tap0)
+        for host in [host1, host2]:
+            host.eth0.down()
+            host.tap0.down()
+            host.br0 = BridgeDevice()
+            host.br0.slave_add(host.tap0)
 
         guest1.eth0.down()
 
@@ -52,12 +48,9 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
         host1_vlan_args0 = dict(realdev=host1.eth0, vlan_id=10, master=host1.br0)
         host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10, master=host2.br0)
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            host2.tap0.mtu = self.params.mtu
-            host2.br0.mtu = self.params.mtu
+            for host in [host1, host2]:
+                for dev in [host.eth0, host.tap0, host.br0]:
+                    dev.mtu = self.params.mtu
             guest1.eth0.mtu = self.params.mtu
             guest2.eth0.mtu = self.params.mtu
             for vlan_args in (host1_vlan_args0, host2_vlan_args0):
@@ -75,19 +68,13 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
 
         host1.br0.ip_add(ipaddress(net_addr_1 + ".1/24"))
         host2.br0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        guest1.eth0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-        guest2.eth0.ip_add(ipaddress(net_addr_1 + ".4/24"))
-        guest2.eth0.ip_add(ipaddress(net_addr6_1 + "::4/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.vlan0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.tap0.up()
-        host2.vlan0.up()
-        host2.br0.up()
+        for i, guest in enumerate([guest1, guest2]):
+            guest.eth0.ip_add(ipaddress(net_addr_1 + "." + str(i+3) +
"/24"))
+            guest.eth0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+3) +
"/64"))
+
+        for host in [host1, host2]:
+            for dev in [host.eth0, host.tap0, host.vlan0, host.br0]:
+                dev.up()
         guest1.eth0.up()
         guest2.eth0.up()
 
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index b5d4677..90ba81d 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -43,11 +43,8 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
         host1_vlan_args0 = dict(realdev=host1.eth0, vlan_id=10, master=host1.br0)
         host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            guest1.eth0.mtu = self.params.mtu
+            for dev in [host1.eth0, host1.tap0, host1.br0, host2.eth0, guest1.eth0]:
+                dev.mtu = self.params.mtu
             for vlan_args in (host1_vlan_args0, host2_vlan_args0):
                 vlan_args["mtu"] = self.params.mtu
 
@@ -62,18 +59,13 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
         net_addr6_1 = "fc00:0:0:1"
 
         host1.br0.ip_add(ipaddress(net_addr_1 + ".1/24"))
-        host2.vlan0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.vlan0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-        guest1.eth0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.vlan0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        guest1.eth0.up()
+        for i, dev in enumerate([host2.vlan0, guest1.eth0]):
+            dev.ip_add(ipaddress(net_addr_1 + "." + str(i+2) +
"/24"))
+            dev.ip_add(ipaddress(net_addr6_1 + "::" + str(i+2) +
"/64"))
+
+        for dev in [host1.eth0, host1.tap0, host1.vlan0, host1.br0,
+                    host2.eth0, host2.vlan0, guest1.eth0]:
+            dev.up()
 
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index d40f3a0..2d7058a 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -49,10 +49,8 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
         host1, host2, guest1, guest2, guest3, guest4 = self.matched.host1,
self.matched.host2, self.matched.guest1, self.matched.guest2, self.matched.guest3,
self.matched.guest4
 
         for host in [host1, host2]:
-            host.eth0.down()
-            host.eth1.down()
-            host.tap0.down()
-            host.tap1.down()
+            for dev in [host.eth0, host.eth1, host.tap0, host.tap1]:
+                dev.down()
             host.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
             host.bond0.slave_add(host.eth0)
             host.bond0.slave_add(host.eth1)
@@ -70,11 +68,8 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
         host2_vlan_args1 = dict(realdev=host2.bond0, vlan_id=20, master=host2.br1)
         if "mtu" in self.params:
             for host in [host1, host2]:
-                host.bond0.mtu = self.params.mtu
-                host.tap0.mtu = self.params.mtu
-                host.tap1.mtu = self.params.mtu
-                host.br0.mtu = self.params.mtu
-                host.br1.mtu = self.params.mtu
+                for dev in [host.bond0, host.tap0, host.tap1, host.br0, host.br1]:
+                    dev.mtu = self.params.mtu
             for guest in [guest1, guest2, guest3, guest4]:
                 guest.eth0.mtu = self.params.mtu
             for vlan_args in (host1_vlan_args0, host1_vlan_args1,
@@ -105,18 +100,12 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
             guest_b.eth0.ip_add(ipaddress(net_addr_2 + "." + str(n+1) +
"/24"))
             guest_b.eth0.ip_add(ipaddress(net_addr6_2 + "::" + str(n+1) +
"/64"))
 
-        for host, guest_a, guest_b in [(host1, guest1, guest2), (host2, guest3,
guest4)]:
-            host.eth0.up()
-            host.eth1.up()
-            host.tap0.up()
-            host.tap1.up()
-            host.bond0.up()
-            host.vlan0.up()
-            host.vlan1.up()
-            host.br0.up()
-            host.br1.up()
-            guest_a.eth0.up()
-            guest_b.eth0.up()
+        for host in [host1, host2]:
+            for dev in [host.eth0, host.eth1, host.tap0, host.tap1, host.bond0,
+                        host.vlan0, host.vlan1, host.br0, host.br1]:
+                dev.up()
+        for guest in [guest1, guest2, guest3, guest4]:
+            guest.eth0.up()
 
         #TODO better service handling through HostAPI
         if "perf_tool_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index 61510af..1e66afa 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -50,12 +50,9 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
         guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
         guest2_vlan_args0 = dict(realdev=guest2.eth0, vlan_id=10)
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            host2.tap0.mtu = self.params.mtu
-            host2.br0.mtu = self.params.mtu
+            for host in [host1, host2]:
+                for dev in [host.eth0, host.tap0, host.br0]:
+                    dev.mtu = self.params.mtu
             guest1.eth0.mtu = self.params.mtu
             guest2.eth0.mtu = self.params.mtu
             for vlan_args in (guest1_vlan_args0, guest2_vlan_args0):
@@ -72,22 +69,16 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
 
         net_addr_1 = "192.168.10"
         net_addr6_1 = "fc00:0:0:1"
+        for i, guest in enumerate([guest1, guest2]):
+            guest.vlan0.ip_add(ipaddress(net_addr_1 + "." + str(i+3) +
"/24"))
+            guest.vlan0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+3) +
"/64"))
 
-        guest1.vlan0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.vlan0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-        guest2.vlan0.ip_add(ipaddress(net_addr_1 + ".4/24"))
-        guest2.vlan0.ip_add(ipaddress(net_addr6_1 + "::4/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.tap0.up()
-        host2.br0.up()
-        guest1.eth0.up()
-        guest1.vlan0.up()
-        guest2.eth0.up()
-        guest2.vlan0.up()
+        for host in [host1, host2]:
+            for dev in [host.eth0, host.tap0, host.br0]:
+                dev.up()
+        for guest in [guest1, guest2]:
+            guest.eth0.up()
+            guest.vlan0.up()
 
         #TODO better service handling through HostAPI
         if "perf_tool_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index 8f628b6..6bb5da6 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -31,11 +31,10 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1 = self.matched.host1, self.matched.host2,
self.matched.guest1
 
-        host1.eth0.down()
-        host1.tap0.down()
         host1.br0 = OvsBridgeDevice()
-        host1.br0.port_add(host1.eth0)
-        host1.br0.port_add(host1.tap0)
+        for dev in [host1.eth0, host1.tap0]:
+            dev.down()
+            host1.br0.port_add(dev)
 
         host2.eth0.down()
 
@@ -44,11 +43,8 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
         host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
         guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            guest1.eth0.mtu = self.params.mtu
+            for dev in [host1.eth0, host1.tap0, host1.br0, host2.eth0, guest1.eth0]:
+                dev.mtu = self.params.mtu
             for vlan_args in (host2_vlan_args0, guest1_vlan_args0):
                 vlan_args["mtu"] = self.params.mtu
 
@@ -63,19 +59,13 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
 
         net_addr_1 = "192.168.10"
         net_addr6_1 = "fc00:0:0:1"
+        for i, machine in enumerate([host2, guest1]):
+            machine.vlan0.ip_add(ipaddress(net_addr_1 + "." + str(i+2) +
"/24"))
+            machine.vlan0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+2) +
"/64"))
 
-        host2.vlan0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.vlan0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-        guest1.vlan0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.vlan0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        guest1.eth0.up()
-        guest1.vlan0.up()
+        for dev in [host1.eth0, host1.tap0, host1.br0, host2.eth0,
+                    host2.vlan0, guest1.eth0, guest1.vlan0]:
+            dev.up()
 
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
index 734f5c2..70d10a0 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -35,17 +35,12 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1, guest2 = self.matched.host1, self.matched.host2,
self.matched.guest1, self.matched.guest2
 
-        host1.eth0.down()
-        host1.tap0.down()
-        host1.br0 = OvsBridgeDevice()
-        host1.br0.port_add(host1.eth0)
-        host1.br0.port_add(host1.tap0, tag="10")
-
-        host2.eth0.down()
-        host2.tap0.down()
-        host2.br0 = OvsBridgeDevice()
-        host2.br0.port_add(host2.eth0)
-        host2.br0.port_add(host2.tap0, tag="10")
+        for host in [host1, host2]:
+            host.br0 = OvsBridgeDevice()
+            host.eth0.down()
+            host.tap0.down()
+            host.br0.port_add(host.eth0)
+            host.br0.port_add(host.tap0, tag="10")
 
         guest1.eth0.down()
 
@@ -58,29 +53,21 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
         configuration.endpoint2 = guest2.eth0
 
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            host2.tap0.mtu = self.params.mtu
-            host2.br0.mtu = self.params.mtu
+            for host in [host1, host2]:
+                for dev in [host.eth0, host.tap0, host.br0]:
+                    dev.mtu = self.params.mtu
             guest1.eth0.mtu = self.params.mtu
             guest2.eth0.mtu = self.params.mtu
 
         net_addr_1 = "192.168.10"
         net_addr6_1 = "fc00:0:0:1"
+        for i, guest in enumerate([guest1, guest2]):
+            guest.eth0.ip_add(ipaddress(net_addr_1 + "." + str(i+3) +
"/24"))
+            guest.eth0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+3) +
"/64"))
 
-        guest1.eth0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-        guest2.eth0.ip_add(ipaddress(net_addr_1 + ".4/24"))
-        guest2.eth0.ip_add(ipaddress(net_addr6_1 + "::4/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.tap0.up()
-        host2.br0.up()
+        for host in [host1, host2]:
+            for dev in [host.eth0, host.tap0, host.br0]:
+                dev.up()
         guest1.eth0.up()
         guest2.eth0.up()
 
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index ce646ec..1f55598 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -43,12 +43,8 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
 
         host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            guest1.eth0.mtu = self.params.mtu
-
+            for dev in [host1.eth0, host1.tap0, host1.br0, host2.eth0, guest1.eth0]:
+                dev.mtu = self.params.mtu
             host2_vlan_args0["mtu"] = self.params.mtu
 
         host2.vlan0 = VlanDevice(**host2_vlan_args0)
@@ -61,18 +57,12 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
 
         net_addr_1 = "192.168.10"
         net_addr6_1 = "fc00:0:0:1"
+        for i, dev in enumerate([host2.vlan0, guest1.eth0]):
+            dev.ip_add(ipaddress(net_addr_1 + "." + str(i+2) +
"/24"))
+            dev.ip_add(ipaddress(net_addr6_1 + "::" + str(i+2) +
"/64"))
 
-        host2.vlan0.ip_add(ipaddress(net_addr_1 + ".2/24"))
-        host2.vlan0.ip_add(ipaddress(net_addr6_1 + "::2/64"))
-        guest1.eth0.ip_add(ipaddress(net_addr_1 + ".3/24"))
-        guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
-
-        host1.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        guest1.eth0.up()
+        for dev in [host1.eth0, host1.tap0, host1.br0, host2.eth0, host2.vlan0,
guest1.eth0]:
+            dev.up()
 
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
index bba905b..cbd3b0b 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -48,28 +48,15 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1, guest2, guest3, guest4 = self.matched.host1,
self.matched.host2, self.matched.guest1, self.matched.guest2, self.matched.guest3,
self.matched.guest4
 
-        host1.eth0.down()
-        host1.eth1.down()
-        host1.tap0.down()
-        host1.tap1.down()
-        host1.br0 = OvsBridgeDevice()
-        for dev, tag in [(host1.tap0, "10"), (host1.tap1, "20")]:
-            host1.br0.port_add(dev, tag=tag)
+        for host, port_name in [(host1, "bond_port1"), (host2,
"bond_port2")]:
+            for dev in [host.eth0, host.eth1, host.tap0, host.tap1]:
+                dev.down()
+            host.br0 = OvsBridgeDevice()
+            for dev, tag in [(host.tap0, "10"), (host.tap1, "20")]:
+                host.br0.port_add(dev, tag=tag)
 
-        #miimon cannot be set due to colon in argument name -->
other_config:bond-miimon-interval
-       
#https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/12/html/advanced_overcloud_customization/appe-bonding_options
-        host1.br0.bond_add("bond_host1", (host1.eth0, host1.eth1),
bond_mode=self.params.bonding_mode)
-
-        host2.eth0.down()
-        host2.eth1.down()
-        host2.tap0.down()
-        host2.tap1.down()
-        host2.br0 = OvsBridgeDevice()
-
-        for dev, tag in [(host2.tap0, "10"), (host2.tap1, "20")]:
-            host2.br0.port_add(dev, tag=tag)
-
-        host2.br0.bond_add("bond_host2", (host2.eth0, host2.eth1),
bond_mode=self.params.bonding_mode)
+            #miimon cannot be set due to colon in argument name -->
other_config:bond-miimon-interval
+            host.br0.bond_add(port_name, (host.eth0, host.eth1),
bond_mode=self.params.bonding_mode)
 
         guest1.eth0.down()
 
@@ -86,20 +73,11 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
         configuration.endpoint2 = guest3.eth0
 
         if "mtu" in self.params:
-            host1.eth0.mtu = self.params.mtu
-            host1.eth1.mtu = self.params.mtu
-            host1.tap0.mtu = self.params.mtu
-            host1.tap1.mtu = self.params.mtu
-            host1.br0.mtu = self.params.mtu
-            host2.eth0.mtu = self.params.mtu
-            host2.eth1.mtu = self.params.mtu
-            host2.tap0.mtu = self.params.mtu
-            host2.tap1.mtu = self.params.mtu
-            host2.br0.mtu = self.params.mtu
-            guest1.eth0.mtu = self.params.mtu
-            guest2.eth0.mtu = self.params.mtu
-            guest3.eth0.mtu = self.params.mtu
-            guest4.eth0.mtu = self.params.mtu
+            for host in [host1, host2]:
+                for dev in [host.eth0, host.eth1, host.tap0, host.tap1, host.br0]:
+                    dev.mtu = self.params.mtu
+            for guest in [guest1, guest2, guest3, guest4]:
+                guest.eth0.mtu = self.params.mtu
 
         net_addr_1 = "192.168.10"
         net_addr6_1 = "fc00:0:0:1"
@@ -114,20 +92,11 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
             guest.eth0.ip_add(ipaddress(net_addr_2 + "." + str (i+1) +
"/24"))
             guest.eth0.ip_add(ipaddress(net_addr6_2 + "::" + str (i+1) +
"/64"))
 
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.tap0.up()
-        host1.tap1.up()
-        host1.br0.up()
-        host2.eth0.up()
-        host2.eth1.up()
-        host2.tap0.up()
-        host2.tap1.up()
-        host2.br0.up()
-        guest1.eth0.up()
-        guest2.eth0.up()
-        guest3.eth0.up()
-        guest4.eth0.up()
+        for host in [host1, host2]:
+            for dev in [host.eth0, host.eth1, host.tap0, host.tap1, host.br0]:
+                dev.up()
+        for guest in [guest1, guest2, guest3, guest4]:
+            guest.eth0.up()
 
         #TODO better service handling through HostAPI
         if "perf_tool_cpu" in self.params:
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index 9c788c1..61dfe57 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -31,10 +31,9 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
         host1, host2 = self.matched.host1, self.matched.host2
 
         host1.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
-        host1.eth0.down()
-        host1.eth1.down()
-        host1.bond0.slave_add(host1.eth0)
-        host1.bond0.slave_add(host1.eth1)
+        for dev in [host1.eth0, host1.eth1]:
+            dev.down()
+            host1.bond0.slave_add(dev)
 
         host1_vlan_args0 = dict(realdev=host1.bond0, vlan_id=10)
         host1_vlan_args1 = dict(realdev=host1.bond0, vlan_id=20)
@@ -69,14 +68,9 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
             host.vlan1.ip_add(ipaddress(net_addr_2 + "." + str(i+1) +
"/24"))
             host.vlan1.ip_add(ipaddress(net_addr6_2 + "::" + str(i+1) +
"/64"))
 
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.bond0.up()
-        host1.vlan0.up()
-        host1.vlan1.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        host2.vlan1.up()
+        for dev in [host1.eth0, host1.eth1, host1.bond0, host1.vlan0,
+                    host1.vlan1, host2.eth0, host2.vlan0, host2.vlan1]:
+            dev.up()
 
         if "adaptive_rx_coalescing" in self.params:
             for dev in [host1.eth0, host1.eth1, host2.eth0]:
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index a470512..77ac4e2 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -28,13 +28,12 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2 = self.matched.host1, self.matched.host2
 
-        host1.eth0.down()
-        host1.eth1.down()
         #The config argument needs to be used with a team device normally (e.g  to
specify
         #the runner mode), but it is not used here due to a bug in the TeamDevice module
         host1.team0 = TeamDevice()
-        host1.team0.slave_add(host1.eth0)
-        host1.team0.slave_add(host1.eth1)
+        for dev in [host1.eth0, host1.eth1]:
+            dev.down()
+            host1.team0.slave_add(dev)
 
         host1_vlan_args0 = dict(realdev=host1.team0, vlan_id=10)
         host1_vlan_args1 = dict(realdev=host1.team0, vlan_id=20)
@@ -69,14 +68,9 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
             host.vlan1.ip_add(ipaddress(net_addr_2 + "." + str(i+1) +
"/24"))
             host.vlan1.ip_add(ipaddress(net_addr6_2 + "::" + str(i+1) +
"/64"))
 
-        host1.eth0.up()
-        host1.eth1.up()
-        host1.team0.up()
-        host1.vlan0.up()
-        host1.vlan1.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        host2.vlan1.up()
+        for dev in [host1.eth0, host1.eth1, host1.team0, host1.vlan0,
+                    host1.vlan1, host2.eth0, host2.vlan0, host2.vlan1]:
+            dev.up()
 
         if "adaptive_rx_coalescing" in self.params:
             for dev in [host1.eth0, host1.eth1, host2.eth0]:
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index 8e20535..89a748a 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -60,13 +60,9 @@ class VlansRecipe(BaseEnrtRecipe):
             host.vlan0.ip_add(ipaddress(net_addr6_1 + "::" + str(i+1) +
"/64"))
             host.vlan1.ip_add(ipaddress(net_addr_2 + "." + str(i+1) +
"/24"))
             host.vlan1.ip_add(ipaddress(net_addr6_2 + "::" + str(i+1) +
"/64"))
-
-        host1.eth0.up()
-        host1.vlan0.up()
-        host1.vlan1.up()
-        host2.eth0.up()
-        host2.vlan0.up()
-        host2.vlan1.up()
+            host.eth0.up()
+            host.vlan0.up()
+            host.vlan1.up()
 
         if "adaptive_rx_coalescing" in self.params:
             for host in [host1, host2]:
diff --git a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
index b489278..644c7f8 100644
--- a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
@@ -21,9 +21,8 @@ class VxlanMulticastRecipe(BaseEnrtRecipe):
     def test_wide_configuration(self):
         host1, host2, guest1 = self.matched.host1, self.matched.host2,
self.matched.guest1
 
-        for machine in [host1, host2, guest1]:
-            machine.eth0.down()
-        host1.tap0.down()
+        for dev in [host1.eth0, host2.eth0, guest1.eth0, host1.tap0]:
+            dev.down()
 
         net_addr = "192.168.0"
         vxlan_net_addr = "192.168.100"
@@ -53,12 +52,9 @@ class VxlanMulticastRecipe(BaseEnrtRecipe):
         configuration.endpoint1 = host1.vxlan0
         configuration.endpoint2 = host2.vxlan0
 
-        for machine in [host1, host2, guest1]:
-            machine.eth0.up()
-        host1.tap0.up()
-        host1.br0.up()
-        for machine in [host1, host2, guest1]:
-            machine.vxlan0.up()
+        for dev in [host1.eth0, host2.eth0, guest1.eth0, host1.tap0,
+                    host1.br0, host1.vxlan0, host2.vxlan0, guest1.vxlan0]:
+            dev.up()
 
         #TODO better service handling through HostAPI
         if "dev_intr_cpu" in self.params:
-- 
2.17.1

[PATCH-next 1/3] lnst.{Recipes.ENRT,Tests}: fixes with respect to python 3 switch

[Ondrej Lichtner]

On Thu, Jun 06, 2019 at 06:03:34PM +0200, csfakian(a)redhat.com wrote:
>  From: Christos Sfakianakis <csfakian(a)redhat.com&gt;
>  
>  Make the following changes to comply with python 3:
>      - lnst.Recipes.ENRT.BaseEnrtRecipe: convert regex and 'split' arguments
>        in _pin_dev_interrupts from text into bytes.
>      - lnst.Recipes.ENRT.XfrmTools: in the case of 'ipsec_esp_aead', use new
> integer
>        division operator for the key construction. Decode bytes to text in the case of
>        'esp_ah_comp' fucntion.
>      - lnst.Tests.PacketAssert: convert the output/error of the packet assert process
>        into text.
>      - lnst.Recipes.ENRT.SimpleMacsecRecipe: convert zip result into a sequence to
>        support indexing.
>  
>  Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com&gt;
>  ---
>   lnst/Recipes/ENRT/BaseEnrtRecipe.py     | 6 +++---
>   lnst/Recipes/ENRT/SimpleMacsecRecipe.py | 2 +-
>   lnst/Recipes/ENRT/XfrmTools.py          | 4 ++--
>   lnst/Tests/PacketAssert.py              | 4 ++--
>   4 files changed, 8 insertions(+), 8 deletions(-)
>  
>  diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
>  index 249fffa..60f61ad 100644
>  --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
>  +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
>  @@ -341,7 +341,7 @@ class BaseEnrtRecipe(PingTestAndEvaluate, PerfRecipe):
>       def _pin_dev_interrupts(self, dev, cpu):
>           netns = dev.netns
>           cpu_info = netns.run("lscpu").stdout
>  -        regex = "CPU\(s\): *([0-9]*)"
>  +        regex = b"CPU\(s\): *([0-9]*)"
>           num_cpus = int(re.search(regex, cpu_info).groups()[0])
>           if cpu < 0 or cpu > num_cpus - 1:
>               raise RecipeError("Invalid CPU value given: %d. Accepted value
> %s." %
>  @@ -351,14 +351,14 @@ class BaseEnrtRecipe(PingTestAndEvaluate, PerfRecipe):
>           res = netns.run("grep {} /proc/interrupts | cut -f1 -d: | sed 's/
> //'"
>                           .format(dev.name))
>           intrs = res.stdout
>  -        split = res.stdout.split("\n")
>  +        split = res.stdout.split(b"\n")
>           if len(split) == 1 and split[0] == '':
>               res = netns.run("dev_irqs=/sys/class/net/{}/device/msi_irqs; "
>                               "[ -d $dev_irqs ] && ls -1 $dev_irqs"
>                               .format(dev.name))
>               intrs = res.stdout
>   
>  -        for intr in intrs.split("\n"):
>  +        for intr in intrs.split(b"\n"):
>               try:
>                   int(intr)
>                   netns.run("echo -n {} > /proc/irq/{}/smp_affinity_list"
>  diff --git a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
> b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
>  index 47ab907..1da586d 100644
>  --- a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
>  +++ b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
>  @@ -129,7 +129,7 @@ class SimpleMacsecRecipe(BaseEnrtRecipe):
>               net_addr = "192.168.100"
>               net_addr6 = "fc00:0:0:0"
>               host1, host2 = main_config.host1, main_config.host2
>  -            k_ids = zip(self.ids, self.keys)
>  +            k_ids = list(zip(self.ids, self.keys))
>               hosts_and_keys = [(host1, host2, k_ids), (host2, host1, k_ids[::-1])]
>               for host_a, host_b, k_ids in hosts_and_keys:
>                   host_a.msec0 = MacsecDevice(realdev=host_a.eth0,
> encrypt=sub_config.encrypt)
>  diff --git a/lnst/Recipes/ENRT/XfrmTools.py b/lnst/Recipes/ENRT/XfrmTools.py
>  index 468259e..d6dadb4 100644
>  --- a/lnst/Recipes/ENRT/XfrmTools.py
>  +++ b/lnst/Recipes/ENRT/XfrmTools.py
>  @@ -2,7 +2,7 @@ from lnst.Common.LnstError import LnstError
>   
>   def generate_key(length):
>       key = "0x"
>  -    key = key + (length/8) * "0b"
>  +    key = key + (length//8) * "0b"
>       return key
>   
>   def configure_ipsec_esp_aead(m1, ip1, m2, ip2, algo, algo_key, icv_len,
>  @@ -40,7 +40,7 @@ def configure_ipsec_esp_ah_comp(m1, ip1, m2, ip2, ciph_alg, ciph_key,
> hash_alg,
>       m_keys = []
>       for m in [m1, m2]:
>           res = m.run("rpm -qa iproute")
>  -        if (res.stdout.find("iproute-2") != -1):
>  +        if (res.stdout.decode().find("iproute-2") != -1):
>               m_keys.append("0x")
>           else:
>               m_keys.append("")
>  diff --git a/lnst/Tests/PacketAssert.py b/lnst/Tests/PacketAssert.py
>  index 9452a4f..25a92ba 100644
>  --- a/lnst/Tests/PacketAssert.py
>  +++ b/lnst/Tests/PacketAssert.py
>  @@ -76,8 +76,8 @@ class PacketAssert(BaseTestModule):
>               raise LnstError("Could not handle interrupt properly.")
>   
>           with packet_assert_process.stdout, packet_assert_process.stderr:
>  -            stderr=packet_assert_process.stderr.read()
>  -            stdout=packet_assert_process.stdout.read()
>  +            stderr=packet_assert_process.stderr.read().decode()
>  +            stdout=packet_assert_process.stdout.read().decode()
>   
>           self._res_data["stderr"] = stderr
>   
>  -- 
>  2.17.1
>  _______________________________________________
>  LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
>  To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
>  Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
>  List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
>  List Archives:
> https://lists.fedorahosted.org/archives/list/[e-mail]...
This patch fails to apply due to BaseEnrtRecipe being modified in one of
the previously pushed patchsets.

Additionaly the "decode()" calls on stdout and stderr attributes of a
finished Job are no longer necessary, also part of a previously applied
patchset.

-Ondrej

[PATCH-next 2/3] lnst.{Recipes.ENRT,RecipeCommon}: remove unnecessary code, fix typos, names, logical errors, mtu setters

[Ondrej Lichtner]

On Thu, Jun 06, 2019 at 06:03:35PM +0200, csfakian(a)redhat.com wrote:
>  From: Christos Sfakianakis <csfakian(a)redhat.com&gt;
>  
>  Make the following changes:
>      - lnst.Recipes.ENRT.DoubleBondRecipe: replace 3 of the 6 references to
>        'adaptive_tx_coalescing' to 'adaptive_rx_coalescing'.
>      - lnst.RecipeCommon.Perf.Measurements.IperfFlowMeasurement: when cpupin is zero, we
>        get the message that it is negative. Correct this by checking its value against
>        'None' explicitly at the first 'if' clause.
>      - lnst.Recipes.ENRT.IpsecEspAhCompRecipe: the second packet assert config should
> have
>        a pass threshold equal to the count of the corresponding ping config.
>      - lnst.Recipes.ENRT: remove 'vlan' from the comment sections in all recipes,
> as the
>        2-endpoint limitation applies to all.
>      - lnst.Recipes.ENRT.PingFloodRecipe: define 'mtu' as IntParam (currently
> undefined).
>        Redefine size as optional param. Remove 'TODO' comment.
>      - lnst.Recipes.ENRT.SimplePerfRecipe: remove line where configuration.params are
> set,
>        as these are not used in the code subsequently.
>      - lnst.Recipes.ENRT.VirtualBridgeVlansOverBondRecipe: remove '1.2.3.4' ip
> from the bond
>        devices (previous NM requirement, not applicable to this branch). Correct host
> name
>        reference used for MTU settings.
>      - lnst.Recipes.ENRT.VirtualOvsBridgeVlanInGuestMirroredRecipe: rename 'eth1'
> to 'eth0'
>        to match adopted naming scheme. Remove checks on host2.eth0 and host2.tap0 prior
> to
>        enslaving them in the bridge (not necessary).
>      - lnst.Recipes.ENRT.VlansOverBondRecipe: change bond name to follow the conventional
>        naming scheme.
>      - lnst.Recipes.ENRT.VlansOverTeamRecipe: remove ip address from the team device as
> it
>        is not used (previous issue with NM, now not applicable).
>      - lnst.Recipes.ENRT.VxlanMulticastRecipe: if mtu is defined, have it set during
> vxlan
>        initialization, rather than post-setting it. This is to avoid netlink errors,
> similar
>        in nature with vlan-related recipes.
>      - lnst.Recipes.ENRT.VxlanRemoteRecipe: if defined, have mtu being set during
> initialization
>        of the vxlan devices to avoid netlink errors (similar to vlan related recipes).
>  
>  Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com&gt;
>  ---
>   .../Perf/Measurements/IperfFlowMeasurement.py |  4 +-
>   lnst/Recipes/ENRT/DoubleBondRecipe.py         |  4 +-
>   lnst/Recipes/ENRT/IpsecEspAeadRecipe.py       |  2 +-
>   lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py     |  8 ++--
>   lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py     |  2 +-
>   lnst/Recipes/ENRT/PingFloodRecipe.py          | 11 ++++--
>   .../ENRT/ShortLivedConnectionsRecipe.py       |  2 +-
>   lnst/Recipes/ENRT/SimplePerfRecipe.py         |  1 -
>   lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py       |  2 +-
>   .../VirtualBridgeVlanInGuestMirroredRecipe.py |  2 +-
>   .../ENRT/VirtualBridgeVlanInGuestRecipe.py    |  2 +-
>   .../ENRT/VirtualBridgeVlansOverBondRecipe.py  | 13 +++----
>   ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 37 +++++++------------
>   .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py |  2 +-
>   .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py  |  2 +-
>   lnst/Recipes/ENRT/VlansOverBondRecipe.py      | 16 ++++----
>   lnst/Recipes/ENRT/VlansOverTeamRecipe.py      |  3 +-
>   lnst/Recipes/ENRT/VlansRecipe.py              |  2 +-
>   lnst/Recipes/ENRT/VxlanMulticastRecipe.py     | 12 +++---
>   lnst/Recipes/ENRT/VxlanRemoteRecipe.py        | 11 +++---
>   20 files changed, 65 insertions(+), 73 deletions(-)
>  
>  diff --git a/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
> b/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
>  index c16eb94..b1795be 100644
>  --- a/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
>  +++ b/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
>  @@ -113,7 +113,7 @@ class IperfFlowMeasurement(BaseFlowMeasurement):
>           server_params = dict(bind = ipaddress(flow.receiver_bind),
>                                oneoff = True)
>   
>  -        if flow.cpupin and flow.cpupin >= 0:
>  +        if flow.cpupin is not None and flow.cpupin >= 0:
>               if flow.parallel_streams == 1:
>                   server_params["cpu_bind"] = flow.cpupin
>               else:
>  @@ -140,7 +140,7 @@ class IperfFlowMeasurement(BaseFlowMeasurement):
>           else:
>               raise RecipeError("Unsupported flow type
> '{}'".format(flow.type))
>   
>  -        if flow.cpupin and flow.cpupin >= 0:
>  +        if flow.cpupin is not None and flow.cpupin >= 0:
>               if flow.parallel_streams == 1:
>                   client_params["cpu_bind"] = flow.cpupin
>               else:
>  diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py
> b/lnst/Recipes/ENRT/DoubleBondRecipe.py
>  index 3b437af..c9fdc50 100644
>  --- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
>  +++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
>  @@ -53,10 +53,10 @@ class DoubleBondRecipe(BaseEnrtRecipe):
>               host.eth1.up()
>               host.bond0.up()
>   
>  -        if "adaptive_tx_coalescing" in self.params:
>  +        if "adaptive_rx_coalescing" in self.params:
>               for host in [host1, host2]:
>                   for dev in [host.eth0, host.eth1]:
>  -                    dev.adaptive_tx_coalescing = self.params.adaptive_tx_coalescing
>  +                    dev.adaptive_rx_coalescing = self.params.adaptive_rx_coalescing
>           if "adaptive_tx_coalescing" in self.params:
>               for host in [host1, host2]:
>                   for dev in [host.eth0, host.eth1]:
>  diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
> b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
>  index c78b130..ded15a6 100644
>  --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
>  +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
>  @@ -176,7 +176,7 @@ class IpsecEspAeadRecipe(BaseEnrtRecipe,
> PacketAssertTestAndEvaluate):
>               host.eth0.ip_add(ipaddress(net_addr6 + str(i+1) + "::1/64"))
>   
>           #Due to limitations in the current EnrtConfiguration
>  -        #class, a single vlan test pair is chosen
>  +        #class, a single test pair is chosen
>           configuration = EnrtConfiguration()
>           configuration.endpoint1 = host1.eth0
>           configuration.endpoint2 = host2.eth0
>  diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
> b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
>  index 70a52cd..b4ab4a7 100644
>  --- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
>  +++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
>  @@ -158,15 +158,17 @@ class IpsecEspAhCompRecipe(BaseEnrtRecipe,
> PacketAssertTestAndEvaluate):
>   
>           dump2 = m1.run("tcpdump -i %s -nn -vv" % if1_name, bg=True)
>           no_trans = self.params.ipsec_mode != 'transport'
>  +        ping_config2 = copy(ping_config)
>  +        ping_config2[0].size = 1500
>           if no_trans:
>               pa_kwargs2 = copy(pa_kwargs)
>               pa_kwargs2["p_filter"] = ''
>               pa_kwargs2["grep_for"] = ["IPComp"]
>  +            if ping_config2[0].count:
>  +                pa_kwargs2["p_min"] = ping_config2[0].count
>               pa_config2 = PacketAssertConf(m2, if2, **pa_kwargs2)
>               self.packet_assert_test_start(pa_config2)
>           self.ctl.wait(2)
>  -        ping_config2 = copy(ping_config)
>  -        ping_config2[0].size = 1500
>           ping_result2 = super(IpsecEspAhCompRecipe, self).ping_test(ping_config2)
>           self.ctl.wait(2)
>           if no_trans:
>  @@ -204,7 +206,7 @@ class IpsecEspAhCompRecipe(BaseEnrtRecipe,
> PacketAssertTestAndEvaluate):
>               host.eth0.ip_add(ipaddress(net_addr6 + str(i+1) + "::1/64"))
>   
>           #Due to limitations in the current EnrtConfiguration
>  -        #class, a single vlan test pair is chosen
>  +        #class, a single test pair is chosen
>           configuration = EnrtConfiguration()
>           configuration.endpoint1 = host1.eth0
>           configuration.endpoint2 = host2.eth0
>  diff --git a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
> b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
>  index 31e2635..4c365a2 100644
>  --- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
>  +++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
>  @@ -41,7 +41,7 @@ class NoVirtOvsVxlanRecipe(BaseEnrtRecipe):
>               host.br0.flows_add(flow_entries)
>   
>           #Due to limitations in the current EnrtConfiguration
>  -        #class, a single vlan test pair is chosen
>  +        #class, a single test pair is chosen
>           configuration = EnrtConfiguration()
>           configuration.endpoint1 = host1.int0
>           configuration.endpoint2 = host2.int0
>  diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py
>  index 0b0c574..b7dabc8 100644
>  --- a/lnst/Recipes/ENRT/PingFloodRecipe.py
>  +++ b/lnst/Recipes/ENRT/PingFloodRecipe.py
>  @@ -17,12 +17,12 @@ class PingFloodRecipe(PingTestAndEvaluate):
>       host2 = HostReq()
>       host2.eth0 = DeviceReq(label="net1",
> driver=RecipeParam("driver"))
>   
>  -    #TODO: use a parameter for the network
>       src_addr = StrParam(default = "192.168.1.1/24")
>       dst_addr = StrParam(default = "192.168.1.2/24")
>       count = IntParam(default = 100)
>       interval = StrParam(default = 0.2)
>  -    size = IntParam(default = None)
>  +    size = IntParam(mandatory = False)
>  +    mtu = IntParam(mandatory = False)
>   
>       def test(self):
>           host1, host2 = self.matched.host1, self.matched.host2
>  @@ -41,9 +41,12 @@ class PingFloodRecipe(PingTestAndEvaluate):
>           ip2 = host2.eth0.ips[0]
>           cn = self.params.count
>           iv = self.params.interval
>  -        sz = self.params.size
>  +        if "size" in self.params:
>  +            sz = self.params.size
>  +        else:
>  +            sz = None
>   
>  -        pcfg=PingConf(host1, if1, host2, ip2, count = cn, interval = iv, size = sz or
> None)
>  +        pcfg=PingConf(host1, if1, host2, ip2, count = cn, interval = iv, size = sz)
>   
>           result = self.ping_test([pcfg])
>           self.ping_evaluate_and_report(pcfg, result)
>  diff --git a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
> b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
>  index 422e68b..42a2d86 100644
>  --- a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
>  +++ b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
>  @@ -31,7 +31,7 @@ class ShortLivedConnectionsRecipe(BaseEnrtRecipe):
>               host.eth0.ip_add(ipaddress(net_addr + "." + str(i) +
> "/24"))
>   
>           #Due to limitations in the current EnrtConfiguration
>  -        #class, a single vlan test pair is chosen
>  +        #class, a single test pair is chosen
>           configuration = EnrtConfiguration()
>           configuration.endpoint1 = host1.eth0
>           configuration.endpoint2 = host2.eth0
>  diff --git a/lnst/Recipes/ENRT/SimplePerfRecipe.py
> b/lnst/Recipes/ENRT/SimplePerfRecipe.py
>  index 263bc83..bc23a97 100644
>  --- a/lnst/Recipes/ENRT/SimplePerfRecipe.py
>  +++ b/lnst/Recipes/ENRT/SimplePerfRecipe.py
>  @@ -26,7 +26,6 @@ class SimplePerfRecipe(BaseEnrtRecipe):
>           configuration = EnrtConfiguration()
>           configuration.endpoint1 = host1.eth0
>           configuration.endpoint2 = host2.eth0
>  -        configuration.params = self.params 
This was actually done intentionally in commit
197f06680d6f9b226075d39bc2403a71125f34cc

as a way to pass the parameters to performance related code that could
use these to save a result in a database. Right now I think I'll be
reworking that anyway, however in the future, it's important to check if
removing lines like these is ok by looking at why the line was added.
You can do that by using git blame <file path>.

[Ondrej Lichtner]

On Thu, Jun 06, 2019 at 06:03:33PM +0200, csfakian(a)redhat.com wrote:
>  From: Christos Sfakianakis <csfakian(a)redhat.com&gt;
>  
>  Hi,
>  
>  this patchset is the first in a potential series relating to the complete recipe set.
>  It handles issues popped up after python2->3 move, reduces code repetition in recipes
>  and addresses generic recipe bugs.
>  
>  Christos 
>  
>  Christos Sfakianakis (3):
>    lnst.{Recipes.ENRT,Tests}: fixes with respect to python 3 switch
>    lnst.{Recipes.ENRT,RecipeCommon}: remove unnecessary code, fix typos,
>      names, logical errors, mtu setters
>    lnst.Recipes.ENRT: reduce code repetition
>  
>   .../Perf/Measurements/IperfFlowMeasurement.py |  4 +-
>   lnst/Recipes/ENRT/BaseEnrtRecipe.py           |  6 +-
>   lnst/Recipes/ENRT/BondRecipe.py               | 28 ++++----
>   lnst/Recipes/ENRT/DoubleBondRecipe.py         | 28 ++++----
>   lnst/Recipes/ENRT/DoubleTeamRecipe.py         | 47 +++++--------
>   lnst/Recipes/ENRT/IpsecEspAeadRecipe.py       | 11 +--
>   lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py     | 17 ++---
>   lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py     | 14 ++--
>   lnst/Recipes/ENRT/PingFloodRecipe.py          | 11 +--
>   .../ENRT/ShortLivedConnectionsRecipe.py       | 11 +--
>   lnst/Recipes/ENRT/SimpleMacsecRecipe.py       |  7 +-
>   lnst/Recipes/ENRT/SimplePerfRecipe.py         | 12 ++--
>   lnst/Recipes/ENRT/TeamRecipe.py               | 21 +++---
>   lnst/Recipes/ENRT/TeamVsBondRecipe.py         | 36 ++++------
>   lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py       | 13 ++--
>   .../VirtualBridgeVlanInGuestMirroredRecipe.py | 52 ++++++--------
>   .../ENRT/VirtualBridgeVlanInGuestRecipe.py    | 35 ++++------
>   .../VirtualBridgeVlanInHostMirroredRecipe.py  | 43 +++++-------
>   .../ENRT/VirtualBridgeVlanInHostRecipe.py     | 26 +++----
>   .../ENRT/VirtualBridgeVlansOverBondRecipe.py  | 34 +++-------
>   ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 62 ++++++-----------
>   .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 34 ++++------
>   ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 43 +++++-------
>   .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py  | 26 +++----
>   .../VirtualOvsBridgeVlansOverBondRecipe.py    | 67 +++++--------------
>   lnst/Recipes/ENRT/VlansOverBondRecipe.py      | 30 ++++-----
>   lnst/Recipes/ENRT/VlansOverTeamRecipe.py      | 21 ++----
>   lnst/Recipes/ENRT/VlansRecipe.py              | 12 ++--
>   lnst/Recipes/ENRT/VxlanMulticastRecipe.py     | 26 +++----
>   lnst/Recipes/ENRT/VxlanRemoteRecipe.py        | 11 ++-
>   lnst/Recipes/ENRT/XfrmTools.py                |  4 +-
>   lnst/Tests/PacketAssert.py                    |  4 +-
>   32 files changed, 286 insertions(+), 510 deletions(-)
>  
>  -- 
>  2.17.1
>  _______________________________________________
>  LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
>  To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
>  Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
>  List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
>  List Archives:
> https://lists.fedorahosted.org/archives/list/[e-mail]...
The 2 and 3 patches apply cleanly and most of the changes make sense,
but since there's a couple of issues to resolve before applying, and the
author just left for 2 weeks of PTO.

I'll be skipping this patchset. I'll be submitting my own patchset that
does additional refactoring and redesigning of the ENRT recipes so this
patchset might have to be reworked to fit the new design later.

-Ondrej