Petr Horáček has uploaded a new change for review.
Change subject: network: change objectivizeNetwork to private
......................................................................
network: change objectivizeNetwork to private
Change-Id: I0b83081f453cef8de2b698152869c35850a036b3
Signed-off-by: Petr Horáček <phora...@redhat.com>
---
M vdsm/network/api.py
1 file changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/37567/1
diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index 0f74f47..6841a62 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -79,13 +79,13 @@
persistence = _getPersistenceModule()
-def objectivizeNetwork(bridge=None, vlan=None, bonding=None,
- bondingOptions=None, nics=None, mtu=None, ipaddr=None,
- netmask=None, gateway=None, bootproto=None,
- ipv6addr=None, ipv6gateway=None, ipv6autoconf=None,
- dhcpv6=None, defaultRoute=None, _netinfo=None,
- configurator=None, blockingdhcp=None,
- implicitBonding=None, opts=None):
+def _objectivizeNetwork(bridge=None, vlan=None, bonding=None,
+ bondingOptions=None, nics=None, mtu=None, ipaddr=None,
+ netmask=None, gateway=None, bootproto=None,
+ ipv6addr=None, ipv6gateway=None, ipv6autoconf=None,
+ dhcpv6=None, defaultRoute=None, _netinfo=None,
+ configurator=None, blockingdhcp=None,
+ implicitBonding=None, opts=None):
"""
Constructs an object hierarchy that describes the network configuration
that is passed in the parameters.
@@ -308,7 +308,7 @@
bootproto = options.pop('bootproto', None)
- net_ent = objectivizeNetwork(
+ net_ent = _objectivizeNetwork(
bridge=network if bridged else None, vlan=vlan, bonding=bonding,
bondingOptions=bondingOptions, nics=nics, mtu=mtu, ipaddr=ipaddr,
netmask=netmask, gateway=gateway, bootproto=bootproto, dhcpv6=dhcpv6,
@@ -420,11 +420,11 @@
def _delNonVdsmNetwork(network, vlan, bonding, nics, _netinfo, configurator):
if network in netinfo.bridges():
- net_ent = objectivizeNetwork(bridge=network, vlan=vlan,
- bonding=bonding, nics=nics,
- _netinfo=_netinfo,
- configurator=configurator,
- implicitBonding=False)
+ net_ent = _objectivizeNetwork(bridge=network, vlan=vlan,
+ bonding=bonding, nics=nics,
+ _netinfo=_netinfo,
+ configurator=configurator,
+ implicitBonding=False)
net_ent.remove()
else:
raise ConfigNetworkError(ne.ERR_BAD_BRIDGE, "Cannot delete network"
@@ -475,10 +475,10 @@
if not utils.tobool(force):
_validateDelNetwork(network, vlan, bonding, nics, bridged, _netinfo)
- net_ent = objectivizeNetwork(bridge=network if bridged else None,
- vlan=vlan, bonding=bonding, nics=nics,
- _netinfo=_netinfo, configurator=configurator,
- implicitBonding=implicitBonding)
+ net_ent = _objectivizeNetwork(bridge=network if bridged else None,
+ vlan=vlan, bonding=bonding, nics=nics,
+ _netinfo=_netinfo, configurator=configurator,
+ implicitBonding=implicitBonding)
net_ent.ip.bootproto = ('dhcp' if _netinfo.networks[network]['dhcpv4']
else 'none')
--
To view, visit http://gerrit.ovirt.org/37567
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b83081f453cef8de2b698152869c35850a036b3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phora...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
