Skip to content

Commit

Permalink
Recipes/ENRT: remove deprecated coalescing_hw_config_dev_list property
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Tluka <[email protected]>
  • Loading branch information
jtluka committed Mar 21, 2024
1 parent c660dfe commit cc5f75b
Show file tree
Hide file tree
Showing 20 changed files with 1 addition and 132 deletions.
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/BaseSRIOVNetnsTcRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
raise NotImplementedError()

@property
def coalescing_hw_config_dev_list(self):
raise NotImplementedError()

@property
def dev_interrupt_hw_config_dev_list(self):
raise NotImplementedError()
Expand Down
18 changes: 1 addition & 17 deletions lnst/Recipes/ENRT/BondRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,22 +194,6 @@ class and :any:`MTUHWConfigMixin.mtu_hw_config_dev_list`.
"""
return [self.matched.host1.bond0, self.matched.host2.eth0]

@property
def coalescing_hw_config_dev_list(self):
"""
The `coalescing_hw_config_dev_list` property value for this scenario is a
list containing the matched physical devices used to create the bonding
device on host1 and the matched ethernet device on host2.
| host1.eth0, host.eth1
| host2.eth0
For detailed explanation of this property see :any:`CoalescingHWConfigMixin`
class and :any:`CoalescingHWConfigMixin.coalescing_hw_config_dev_list`.
"""
return [self.matched.host1.eth0, self.matched.host1.eth1,
self.matched.host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
"""
Expand All @@ -222,7 +206,7 @@ def dev_interrupt_hw_config_dev_list(self):
For detailed explanation of this property see
:any:`DevInterruptHWConfigMixin` class and
:any:`CoalescingHWConfigMixin.coalescing_hw_config_dev_list`.
:any:`DevInterruptHWConfigMixin.dev_interrupt_hw_config_dev_list`.
"""
return [self.matched.host1.eth0, self.matched.host1.eth1,
self.matched.host2.eth0]
Expand Down
5 changes: 0 additions & 5 deletions lnst/Recipes/ENRT/DoubleBondRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.bond0, self.matched.host2.bond0]

@property
def coalescing_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0, host2.eth1]

@property
def dev_interrupt_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
Expand Down
5 changes: 0 additions & 5 deletions lnst/Recipes/ENRT/DoubleTeamRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.team0, self.matched.host2.team0]

@property
def coalescing_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0, host2.eth1]

@property
def dev_interrupt_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/GeneveTunnelRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,6 @@ def pause_frames_dev_list(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.gnv_tunnel, self.matched.host2.gnv_tunnel]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/GreTunnelRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,6 @@ def pause_frames_dev_list(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.gre_tunnel, self.matched.host2.gre_tunnel]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]
Expand Down
5 changes: 0 additions & 5 deletions lnst/Recipes/ENRT/LinuxBridgeOverBondRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.bond0, self.matched.host2.bond0]

@property
def coalescing_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0, host2.eth1]

@property
def dev_interrupt_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/LinuxBridgeRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]
Expand Down
5 changes: 0 additions & 5 deletions lnst/Recipes/ENRT/MPTCPRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,6 @@ def mtu_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host1.eth1,
self.matched.host2.eth0, self.matched.host2.eth1]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host1.eth1,
self.matched.host2.eth0, self.matched.host2.eth1]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host1.eth1,
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/SRIOVNetnsGeneveTcRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/SRIOVNetnsOvSRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.newns.vf_eth0, self.matched.host2.newns.vf_eth0]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.newns.vf_eth0, self.matched.host2.newns.vf_eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.newns.vf_eth0, self.matched.host2.newns.vf_eth0]
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/SRIOVNetnsTcRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/SRIOVNetnsVxlanTcRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.sriov_devices.vfs[0], self.matched.host2.sriov_devices.vfs[0]]
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/SimpleNetworkRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]
Expand Down
4 changes: 0 additions & 4 deletions lnst/Recipes/ENRT/SimpleNetworkTunableRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,3 @@ def pause_frames_dev_list(self):
@property
def offload_nics(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def coalescing_hw_config_dev_list(self):
return [self.matched.host1.eth0, self.matched.host2.eth0]
16 changes: 0 additions & 16 deletions lnst/Recipes/ENRT/TeamRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,22 +190,6 @@ class and :any:`MTUHWConfigMixin.mtu_hw_config_dev_list`.
"""
return [self.matched.host1.team0, self.matched.host2.eth0]

@property
def coalescing_hw_config_dev_list(self):
"""
The `coalescing_hw_config_dev_list` property value for this scenario is a
list containing the matched physical devices used to create the teaming
device on host1 and the matched ethernet device on host2.
| host1.eth0, host.eth1
| host2.eth0
For detailed explanation of this property see :any:`CoalescingHWConfigMixin`
class and :any:`CoalescingHWConfigMixin.coalescing_hw_config_dev_list`.
"""
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
"""
Expand Down
5 changes: 0 additions & 5 deletions lnst/Recipes/ENRT/TeamVsBondRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ def offload_nics(self):
def mtu_hw_config_dev_list(self):
return [self.matched.host1.team0, self.matched.host2.bond0]

@property
def coalescing_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0, host2.eth1]

@property
def dev_interrupt_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
Expand Down
15 changes: 0 additions & 15 deletions lnst/Recipes/ENRT/VlansOverBondRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,21 +264,6 @@ class and :any:`MTUHWConfigMixin.mtu_hw_config_dev_list`.
result.extend([host1.bond0, host2.eth0])
return result

@property
def coalescing_hw_config_dev_list(self):
"""
The `coalescing_hw_config_dev_list` property value for this scenario
is a list of the physical devices carrying data of the configured
VLAN tunnels:
host1.eth0, host1.eth1 and host2.eth0
For detailed explanation of this property see :any:`CoalescingHWConfigMixin`
class and :any:`CoalescingHWConfigMixin.coalescing_hw_config_dev_list`.
"""
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
"""
Expand Down
5 changes: 0 additions & 5 deletions lnst/Recipes/ENRT/VlansOverTeamRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,6 @@ def mtu_hw_config_dev_list(self):
result.extend([host1.team0, host2.eth0])
return result

@property
def coalescing_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
return [host1.eth0, host1.eth1, host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
host1, host2 = self.matched.host1, self.matched.host2
Expand Down
14 changes: 0 additions & 14 deletions lnst/Recipes/ENRT/VlansRecipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,6 @@ class and :any:`MTUHWConfigMixin.mtu_hw_config_dev_list`.
result.append(dev)
return result

@property
def coalescing_hw_config_dev_list(self):
"""
The `coalescing_hw_config_dev_list` property value for this scenario
is a list of the physical devices carrying data of the configured
VLAN tunnels:
host1.eth0 and host2.eth0
For detailed explanation of this property see :any:`CoalescingHWConfigMixin`
class and :any:`CoalescingHWConfigMixin.coalescing_hw_config_dev_list`.
"""
return [self.matched.host1.eth0, self.matched.host2.eth0]

@property
def dev_interrupt_hw_config_dev_list(self):
"""
Expand Down

0 comments on commit cc5f75b

Please sign in to comment.