Ondřej Svoboda has uploaded a new change for review.
Change subject: sourceroute: use a more explicit name (_add_static_source_route)
......................................................................
sourceroute: use a more explicit name (_add_static_source_route)
Change-Id: I3656d16f750c0098ffaff276bca62eae845bf4cf
Signed-off-by: Ondřej Svoboda <osvob...@redhat.com>
---
M vdsm/network/configurators/__init__.py
M vdsm/network/configurators/ifcfg.py
M vdsm/network/configurators/iproute2.py
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/41609/1
diff --git a/vdsm/network/configurators/__init__.py
b/vdsm/network/configurators/__init__.py
index 01476e7..6adcf00 100644
--- a/vdsm/network/configurators/__init__.py
+++ b/vdsm/network/configurators/__init__.py
@@ -122,7 +122,7 @@
def removeQoS(self, top_device):
qos.remove_outbound(top_device)
- def _addSourceRoute(self, device):
+ def _add_static_source_route(self, device):
# bootproto is None for both static and no bootproto
if device.ipv4.bootproto != 'dhcp' and device.master is None:
try:
diff --git a/vdsm/network/configurators/ifcfg.py
b/vdsm/network/configurators/ifcfg.py
index a7dce44..ab46b4d 100644
--- a/vdsm/network/configurators/ifcfg.py
+++ b/vdsm/network/configurators/ifcfg.py
@@ -188,10 +188,10 @@
self._removeSourceRoute(iface, StaticSourceRoute)
return to_be_removed
- def _addSourceRoute(self, netEnt):
- """For ifcfg tracking can be done together with route/rule addition"""
- super(Ifcfg, self)._addSourceRoute(netEnt)
- DynamicSourceRoute.addInterfaceTracking(netEnt)
+ def _addSourceRoute(self, device):
+ # For ifcfg tracking can be done together with route/rule addition
+ self._add_static_source_route(device)
+ DynamicSourceRoute.addInterfaceTracking(device)
def removeBond(self, bonding):
to_be_removed = self._ifaceDownAndCleanup(bonding)
diff --git a/vdsm/network/configurators/iproute2.py
b/vdsm/network/configurators/iproute2.py
index a5dd2a9..8520d47 100644
--- a/vdsm/network/configurators/iproute2.py
+++ b/vdsm/network/configurators/iproute2.py
@@ -70,7 +70,7 @@
self.configApplier.addBridgePort(bridge)
DynamicSourceRoute.addInterfaceTracking(bridge)
self.configApplier.setIfaceConfigAndUp(bridge)
- self._addSourceRoute(bridge)
+ self._add_static_source_route(bridge)
if 'custom' in opts and 'bridge_opts' in opts['custom']:
self.configApplier._setBridgeOpts(bridge,
opts['custom']['bridge_opts'])
@@ -80,7 +80,7 @@
self.configApplier.addVlan(vlan)
DynamicSourceRoute.addInterfaceTracking(vlan)
self.configApplier.setIfaceConfigAndUp(vlan)
- self._addSourceRoute(vlan)
+ self._add_static_source_route(vlan)
def configureBond(self, bond, **opts):
self.configApplier.addBond(bond)
@@ -93,7 +93,7 @@
slave.configure(**opts)
DynamicSourceRoute.addInterfaceTracking(bond)
self.configApplier.setIfaceConfigAndUp(bond)
- self._addSourceRoute(bond)
+ self._add_static_source_route(bond)
self.runningConfig.setBonding(
bond.name, {'options': bond.options,
'nics': [slave.name for slave in bond.slaves]})
@@ -134,7 +134,7 @@
def configureNic(self, nic, **opts):
DynamicSourceRoute.addInterfaceTracking(nic)
self.configApplier.setIfaceConfigAndUp(nic)
- self._addSourceRoute(nic)
+ self._add_static_source_route(nic)
ethtool_opts = getEthtoolOpts(nic.name)
if ethtool_opts:
--
To view, visit https://gerrit.ovirt.org/41609
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3656d16f750c0098ffaff276bca62eae845bf4cf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvob...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
