Tue, Jul 23, 2019 at 06:19:26PM CEST, csfakian(a)redhat.com wrote:
From: Christos Sfakianakis <csfakian(a)redhat.com>
Rewrite recipes to be compatible with the above patches.
Rename SimplePerfRecipe to SimpleNetworkRecipe.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Recipes/ENRT/BondRecipe.py | 137 +++++---
lnst/Recipes/ENRT/DoubleBondRecipe.py | 140 +++++---
lnst/Recipes/ENRT/DoubleTeamRecipe.py | 159 ++++++----
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 280 ++++++++--------
lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 297 ++++++++---------
lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 130 +++++---
lnst/Recipes/ENRT/PingFloodRecipe.py | 21 +-
.../ENRT/ShortLivedConnectionsRecipe.py | 87 ++---
lnst/Recipes/ENRT/SimpleMacsecRecipe.py | 252 +++++++--------
...lePerfRecipe.py => SimpleNetworkRecipe.py} | 41 +--
lnst/Recipes/ENRT/TeamRecipe.py | 134 +++++---
lnst/Recipes/ENRT/TeamVsBondRecipe.py | 162 ++++++----
lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 230 +++++++++++---
.../VirtualBridgeVlanInGuestMirroredRecipe.py | 191 ++++++-----
.../ENRT/VirtualBridgeVlanInGuestRecipe.py | 167 ++++++----
.../VirtualBridgeVlanInHostMirroredRecipe.py | 178 +++++++----
.../ENRT/VirtualBridgeVlanInHostRecipe.py | 155 ++++++---
.../ENRT/VirtualBridgeVlansOverBondRecipe.py | 298 +++++++++++++-----
...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 193 +++++++-----
.../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 164 ++++++----
...irtualOvsBridgeVlanInHostMirroredRecipe.py | 155 +++++----
.../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 144 ++++++---
.../VirtualOvsBridgeVlansOverBondRecipe.py | 277 ++++++++++------
lnst/Recipes/ENRT/VlansOverBondRecipe.py | 267 +++++++++++-----
lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 269 +++++++++++-----
lnst/Recipes/ENRT/VlansRecipe.py | 230 ++++++++++----
lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 155 ++++++---
lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 115 +++++--
lnst/Recipes/ENRT/__init__.py | 2 +-
29 files changed, 3195 insertions(+), 1835 deletions(-)
rename lnst/Recipes/ENRT/{SimplePerfRecipe.py => SimpleNetworkRecipe.py} (73%)
A note on the commit description ($subj). When we push the changes
the commit ids will be different or am I wrong? I'd remove them or
replace with 'to adopt previous changes'.
I have one more comment. I asked Ondrej why following pattern is in
SimpleNetworkRecipe:
+ @property
+ def offload_nics(self):
+ return [self.matched.host1.bond0, self.matched.host2.bond0]
+
+ @property
+ def mtu_hw_config_dev_list(self):
+ return self.offload_nics
+
I meant why we use offload_nics for mtu_hwconfig_dev_list. Ondrej said
that the idea is to avoid copy-paste errors. I'm fine with that.
But when I checked the rest of the code, there's a mixture of approach
there.
E.g. following recipes does not follow this pattern:
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
lnst/Recipes/ENRT/SimpleMacsecRecipe.py
I'd like to have this consistent.
Additionally:
lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
this recipe does not contain baremetal NICs in offload_nics list
note that old master does not even contain offloading, but maybe
that's ok
lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
offload_nics contain guest's vlan devices but the original recipe
contain guest ethernet devices, also both host NICs are missing in the
list
lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
offload_nics list should contain both baremetal NICs (not vlan
devices) and guest's ethernet NIC instead of vlan device
in mtu_hw_config_dev_list host2.vlan0 should be removed as it does
not exist
dev_interrupt_hw_config_dev_list()
there's a logic I don't really understand, you do following:
self.params.dev_intr_cpu = 0
why?
.../ENRT/VirtualBridgeVlanInHostRecipe.py
offload_nics list should contain both baremetal NICs (not vlan
devices) and guest's ethernet NIC instead of vlan device
same question on self.params.dev_intr_cpu = 0 as in previous recipe
.../ENRT/VirtualBridgeVlansOverBondRecipe.py
this recipe does not contain baremetal NICs in offload_nics list
.../VirtualOvsBridgeVlanInGuestMirroredRecipe.py
offload_nics contain guest's vlan devices but the original recipe
contain guest ethernet devices, also both host NICs are missing in the
list
.../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
offload_nics list should contain both baremetal NICs (not vlan
devices) and guest's ethernet NIC instead of vlan device
in mtu_hw_config_dev_list host2.vlan0 should be removed as it does
not exist
same question on self.params.dev_intr_cpu = 0 as in previous recipe
.../VirtualOvsBridgeVlanInHostMirroredRecipe.py
this recipe does not contain baremetal NICs in offload_nics list
.../ENRT/VirtualOvsBridgeVlanInHostRecipe.py
offload_nics list should contain both baremetal NICs (not vlan
devices) and guest's ethernet NIC instead of vlan device
same question on self.params.dev_intr_cpu = 0 as in previous recipe
.../VirtualOvsBridgeVlansOverBondRecipe.py
this recipe does not contain baremetal NICs in offload_nics list
lnst/Recipes/ENRT/VlansOverBondRecipe.py
offload_nics should return only physical NICs not vlan devices
double check mtu*dev_list after you change the above, in this patch
it contains correct list but after you change offload_nics you need
to fix mtu*list
lnst/Recipes/ENRT/VlansOverTeamRecipe.py
offload_nics should return only physical NICs not vlan devices
double check mtu*dev_list after you change the above, in this patch
it contains correct list but after you change offload_nics you need
to fix mtu*list
lnst/Recipes/ENRT/VlansRecipe.py
offload_nics should return only physical NICs not vlan devices
double check mtu*dev_list after you change the above, in this patch
it contains correct list but after you change offload_nics you need
to fix mtu*list
lnst/Recipes/ENRT/VxlanMulticastRecipe.py
and
lnst/Recipes/ENRT/VxlanRemoteRecipe.py
I'm a bit unsure about the devices in offload_nics list, usually you
configure it directly on physical NIC (an exception is team/bonding)
note that old master does not even contain offloading, but maybe
that's ok
-Jan