Change in vdsm[master]: net/api: drop support for legacy mgmt networks

danken at redhat.com danken at redhat.com
Tue Jul 14 16:52:16 UTC 2015


Dan Kenigsberg has uploaded a new change for review.

Change subject: net/api: drop support for legacy mgmt networks
......................................................................

net/api: drop support for legacy mgmt networks

Change-Id: I45d956b117f7a6cbfa97ce7e060a08307e62a883
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M lib/vdsm/constants.py.in
M vdsm/network/api.py
2 files changed, 2 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/43615/1

diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 5aff44e..0c85b9f 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -23,9 +23,6 @@
 from __future__ import absolute_import
 import os
 
-# VDSM management networks
-LEGACY_MANAGEMENT_NETWORKS = ('ovirtmgmt', 'rhevm')
-
 # SMBIOS manufacturer
 SMBIOS_MANUFACTURER = '@SMBIOS_MANUFACTURER@'
 SMBIOS_OSNAME = '@SMBIOS_OSNAME@'
diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index 5ad222d..0d91da5 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -87,7 +87,7 @@
                         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,
+                        dhcpv6=None, defaultRoute=False, _netinfo=None,
                         configurator=None, blockingdhcp=None,
                         implicitBonding=None, opts=None):
     """
@@ -242,7 +242,7 @@
                 ipv6addr=None, ipv6gateway=None, ipv6autoconf=None,
                 force=False, configurator=None, bondingOptions=None,
                 bridged=True, _netinfo=None, hostQos=None,
-                defaultRoute=None, blockingdhcp=False, **options):
+                defaultRoute=False, blockingdhcp=False, **options):
     nics = nics or ()
     if _netinfo is None:
         _netinfo = netinfo.NetInfo()
@@ -280,13 +280,6 @@
         else:
             for nic in nics:
                 _validateInterNetworkCompatibility(_netinfo, vlan, nic)
-
-    # defaultRoute is set either explicitly by the client, OR if we're adding
-    # the management network.
-    # TODO: When oVirt 3.3 is deprecated, change the default to False and
-    #       remove reference to constants.LEGACY_MANAGEMENT_NETWORKS
-    if defaultRoute is None:
-        defaultRoute = network in constants.LEGACY_MANAGEMENT_NETWORKS
 
     logging.info("Adding network %s with vlan=%s, bonding=%s, nics=%s,"
                  " bondingOptions=%s, mtu=%s, bridged=%s, defaultRoute=%s,"


-- 
To view, visit https://gerrit.ovirt.org/43615
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45d956b117f7a6cbfa97ce7e060a08307e62a883
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list