Change in vdsm[master]: introduce network.constants

From Dan Kenigsberg <danken(a)redhat.com&gt;: Dan Kenigsberg has uploaded a new change for review. Change subject: introduce network.constants ...................................................................... introduce network.constants This patch places a copy of autoconf-generated P_VDSM_RUN and P_VDSM_LIB inside the network subpackage. This removes the dependency of the network package on the global vdsm.constants module. Change-Id: I8571a806f09195007622d15eff59e72b55042559 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt; --- M .gitignore M lib/vdsm/network/Makefile.am M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/connectivity.py M lib/vdsm/network/dhclient_monitor.py M lib/vdsm/network/ifacetracking.py M lib/vdsm/network/link/bond/sysfs_options.py M lib/vdsm/network/link/bond/sysfs_options_mapper.py M lib/vdsm/network/netconfpersistence.py M lib/vdsm/network/netrestore.py M lib/vdsm/network/sourceroute.py M vdsm.spec.in 12 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/79437/1 diff --git a/.gitignore b/.gitignore index 9937872..9300c20 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ lib/vdsm/config.py lib/vdsm/constants.py lib/vdsm/dsaversion.py +lib/vdsm/network/constants.py lib/sos/vdsm.py lib/vdsm/storage/lvm.env lib/vdsm/storage/protect/spmprotect.sh diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am index abf1db6..290af4e 100644 --- a/lib/vdsm/network/Makefile.am +++ b/lib/vdsm/network/Makefile.am @@ -46,3 +46,11 @@ sourceroute.py \ sysctl.py \ $(NULL) + +nodist_vdsmnetwork_PYTHON = \ + constants.py \ + $(NULL) + +EXTRA_DIST = \ + constants.py.in \ + $(NULL) diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index 78fcb26..5b0ef02 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -33,7 +33,6 @@ import six from vdsm.config import config -from vdsm import constants from vdsm import dsaversion from vdsm import hooks from vdsm.common import concurrent @@ -41,6 +40,7 @@ from vdsm.common.conv import tobool from vdsm.network import cmd +from vdsm.network import constants from vdsm.network import ifacetracking from vdsm.network import ipwrapper from vdsm.network import sysctl diff --git a/lib/vdsm/network/connectivity.py b/lib/vdsm/network/connectivity.py index 11e5601..ccd8234 100644 --- a/lib/vdsm/network/connectivity.py +++ b/lib/vdsm/network/connectivity.py @@ -23,9 +23,9 @@ import time import logging -from vdsm import constants from vdsm.common.conv import tobool +from . import constants from . import errors as ne from .errors import ConfigNetworkError diff --git a/lib/vdsm/network/dhclient_monitor.py b/lib/vdsm/network/dhclient_monitor.py index fb6471d..aca0d8f 100644 --- a/lib/vdsm/network/dhclient_monitor.py +++ b/lib/vdsm/network/dhclient_monitor.py @@ -26,8 +26,8 @@ import pyinotify -from vdsm.constants import P_VDSM_RUN from vdsm.common import logutils +from vdsm.network.constants import P_VDSM_RUN from vdsm.network import ifacetracking from vdsm.network.kernelconfig import networks_northbound_ifaces diff --git a/lib/vdsm/network/ifacetracking.py b/lib/vdsm/network/ifacetracking.py index 5b328f4..baf1f2a 100644 --- a/lib/vdsm/network/ifacetracking.py +++ b/lib/vdsm/network/ifacetracking.py @@ -23,7 +23,7 @@ from vdsm.common.fileutils import rm_file from vdsm.common.fileutils import touch_file -from vdsm.constants import P_VDSM_RUN +from vdsm.network.constants import P_VDSM_RUN TRACKED_INTERFACES_FOLDER = os.path.join(P_VDSM_RUN, 'trackedInterfaces') diff --git a/lib/vdsm/network/link/bond/sysfs_options.py b/lib/vdsm/network/link/bond/sysfs_options.py index bf5e93c..eadfbc2 100644 --- a/lib/vdsm/network/link/bond/sysfs_options.py +++ b/lib/vdsm/network/link/bond/sysfs_options.py @@ -24,7 +24,7 @@ import six -from vdsm import constants +from vdsm.network import constants from vdsm.common.cache import memoized BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' diff --git a/lib/vdsm/network/link/bond/sysfs_options_mapper.py b/lib/vdsm/network/link/bond/sysfs_options_mapper.py index 2219ab3..cc2b469 100644 --- a/lib/vdsm/network/link/bond/sysfs_options_mapper.py +++ b/lib/vdsm/network/link/bond/sysfs_options_mapper.py @@ -28,9 +28,9 @@ import six -from vdsm import constants from vdsm.common.cache import memoized +from vdsm.network import constants from vdsm.network.link.bond import sysfs_options from vdsm.network.link.bond.sysfs_driver import BONDING_MASTERS from vdsm.network.link.iface import random_iface_name diff --git a/lib/vdsm/network/netconfpersistence.py b/lib/vdsm/network/netconfpersistence.py index 79095d8..864126d 100644 --- a/lib/vdsm/network/netconfpersistence.py +++ b/lib/vdsm/network/netconfpersistence.py @@ -28,9 +28,9 @@ import six -from vdsm import constants from vdsm.common import fileutils +from vdsm.network import constants from vdsm.network.link.iface import random_iface_name from . import errors as ne diff --git a/lib/vdsm/network/netrestore.py b/lib/vdsm/network/netrestore.py index d2739cf..715401f 100644 --- a/lib/vdsm/network/netrestore.py +++ b/lib/vdsm/network/netrestore.py @@ -25,7 +25,7 @@ import six from vdsm.config import config -from vdsm.constants import P_VDSM_RUN +from vdsm.network.constants import P_VDSM_RUN from vdsm.network import netswitch from vdsm.network.link import setup from vdsm.network.link.bond import Bond diff --git a/lib/vdsm/network/sourceroute.py b/lib/vdsm/network/sourceroute.py index 0d5e47a..a3e4e2d 100644 --- a/lib/vdsm/network/sourceroute.py +++ b/lib/vdsm/network/sourceroute.py @@ -22,7 +22,7 @@ import netaddr from vdsm.common.contextlib import suppress -from vdsm.constants import P_VDSM_RUN +from vdsm.network.constants import P_VDSM_RUN from vdsm.network.ip import route as ip_route from vdsm.network.ip import rule as ip_rule from vdsm.network.ip.route import IPRouteData diff --git a/vdsm.spec.in b/vdsm.spec.in index 8ba16d8..f4fa0e9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1084,6 +1084,7 @@ %{python_sitelib}/%{vdsm_name}/network/canonicalize.py* %{python_sitelib}/%{vdsm_name}/network/cmd.py* %{python_sitelib}/%{vdsm_name}/network/connectivity.py* +%{python_sitelib}/%{vdsm_name}/network/constants.py* %{python_sitelib}/%{vdsm_name}/network/dhclient_monitor.py* %{python_sitelib}/%{vdsm_name}/network/driverloader.py* %{python_sitelib}/%{vdsm_name}/network/ip/*.py* -- To view, visit https://gerrit.ovirt.org/79437 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8571a806f09195007622d15eff59e72b55042559 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;