Edward Haas has uploaded a new change for review. Change subject: net: Move netconfpersistence under vdsm.network ......................................................................
net: Move netconfpersistence under vdsm.network Change-Id: I5325153a6462014d4b5e8300633d25757258d3c0 Signed-off-by: Edward Haas <[email protected]> --- M lib/vdsm/Makefile.am M lib/vdsm/kernelconfig.py M lib/vdsm/netinfo/cache.py M lib/vdsm/network/Makefile.am M lib/vdsm/network/api.py M lib/vdsm/network/configurators/__init__.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/configurators/iproute2.py M lib/vdsm/network/configurators/pyroute_two.py M lib/vdsm/network/legacy_switch.py R lib/vdsm/network/netconfpersistence.py M lib/vdsm/network/netswitch.py M lib/vdsm/network/ovs/switch.py M lib/vdsm/tool/unified_persistence.py M tests/functional/networkTests.py M tests/functional/utils.py M tests/network/conf_persistence_test.py M tests/network/hook_ovs_test.py M vdsm.spec.in M vdsm/vdsm-restore-net-config M vdsm_hooks/checkips/after_get_stats.py M vdsm_hooks/checkips/checkipsd M vdsm_hooks/ovs/ovs_after_get_caps.py M vdsm_hooks/ovs/ovs_after_get_stats.py M vdsm_hooks/ovs/ovs_before_device_create.py M vdsm_hooks/ovs/ovs_before_network_setup.py M vdsm_hooks/ovs/ovs_migrate.py 27 files changed, 31 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/56677/1 diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 44ade99..30183c0 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -47,7 +47,6 @@ m2cutils.py \ machinetype.py \ momIF.py \ - netconfpersistence.py \ numa.py \ osinfo.py \ panic.py \ diff --git a/lib/vdsm/kernelconfig.py b/lib/vdsm/kernelconfig.py index 295e8a2..f335e7e 100644 --- a/lib/vdsm/kernelconfig.py +++ b/lib/vdsm/kernelconfig.py @@ -26,7 +26,7 @@ from .netinfo import addresses from .netinfo import bonding from .netinfo import bridges -from .netconfpersistence import BaseConfig +from vdsm.network.netconfpersistence import BaseConfig class KernelConfig(BaseConfig): diff --git a/lib/vdsm/netinfo/cache.py b/lib/vdsm/netinfo/cache.py index cd69ce3..09c5015 100644 --- a/lib/vdsm/netinfo/cache.py +++ b/lib/vdsm/netinfo/cache.py @@ -26,7 +26,7 @@ import six from ..ipwrapper import getLinks -from ..netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from ..netlink import link as nl_link from vdsm import netinfo diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am index cc8ba64..b770e7c 100644 --- a/lib/vdsm/network/Makefile.am +++ b/lib/vdsm/network/Makefile.am @@ -30,6 +30,7 @@ connectivity.py \ legacy_switch.py \ models.py \ + netconfpersistence.py \ netswitch.py \ sourceroute.py \ sourceroutethread.py \ diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py index 6f3ff9b..976d586 100644 --- a/lib/vdsm/network/api.py +++ b/lib/vdsm/network/api.py @@ -32,7 +32,7 @@ from vdsm import commands from vdsm import constants from vdsm import hooks -from vdsm import netconfpersistence +from . import netconfpersistence from vdsm import udevadm from vdsm import ipwrapper diff --git a/lib/vdsm/network/configurators/__init__.py b/lib/vdsm/network/configurators/__init__.py index ea692a0..7098872 100644 --- a/lib/vdsm/network/configurators/__init__.py +++ b/lib/vdsm/network/configurators/__init__.py @@ -22,7 +22,7 @@ from six.moves import configparser from vdsm.config import config -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from vdsm import ipwrapper from vdsm.netinfo import mtus from vdsm.netlink import monitor diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index 6c74472..d9545f5 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -46,7 +46,7 @@ from vdsm.netinfo.cache import ifaceUsed from vdsm import sysctl from vdsm import utils -from vdsm.netconfpersistence import RunningConfig, PersistentConfig +from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig from vdsm.netlink import monitor if utils.isOvirtNode(): diff --git a/lib/vdsm/network/configurators/iproute2.py b/lib/vdsm/network/configurators/iproute2.py index 1d84083..52bf57b 100644 --- a/lib/vdsm/network/configurators/iproute2.py +++ b/lib/vdsm/network/configurators/iproute2.py @@ -25,7 +25,7 @@ from vdsm import ipwrapper from vdsm.constants import EXT_BRCTL from vdsm.ipwrapper import routeAdd, routeDel, ruleAdd, ruleDel, IPRoute2Error -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from vdsm import sysctl from vdsm.utils import CommandPath from vdsm.commands import execCmd diff --git a/lib/vdsm/network/configurators/pyroute_two.py b/lib/vdsm/network/configurators/pyroute_two.py index 2c7c0b2..65b2826 100644 --- a/lib/vdsm/network/configurators/pyroute_two.py +++ b/lib/vdsm/network/configurators/pyroute_two.py @@ -22,7 +22,7 @@ from vdsm import netinfo from vdsm import ipwrapper -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from . import libvirt, runDhclient from .dhclient import DhcpClient diff --git a/lib/vdsm/network/legacy_switch.py b/lib/vdsm/network/legacy_switch.py index 13382bc..abf0a1c 100644 --- a/lib/vdsm/network/legacy_switch.py +++ b/lib/vdsm/network/legacy_switch.py @@ -28,7 +28,7 @@ from vdsm.config import config from vdsm import ipwrapper from vdsm import kernelconfig -from vdsm import netconfpersistence +from . import netconfpersistence from vdsm.netinfo import NET_PATH from vdsm.netinfo import addresses from vdsm.netinfo import bridges diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/network/netconfpersistence.py similarity index 96% rename from lib/vdsm/netconfpersistence.py rename to lib/vdsm/network/netconfpersistence.py index 092c2ac..b2b7ccf 100644 --- a/lib/vdsm/netconfpersistence.py +++ b/lib/vdsm/network/netconfpersistence.py @@ -25,13 +25,12 @@ import os import pwd -from .config import config -from .tool.restore_nets import restore -from . import commands -from . import constants -from . import utils -from vdsm.network.canonicalize import (canonicalize_networks, - canonicalize_bondings) +from vdsm.config import config +from vdsm.tool.restore_nets import restore +from vdsm import commands +from vdsm import constants +from vdsm import utils +from .canonicalize import canonicalize_networks, canonicalize_bondings CONF_RUN_DIR = constants.P_VDSM_RUN + 'netconf/' # The persistent path is inside of an extra "persistence" dir in order to get diff --git a/lib/vdsm/network/netswitch.py b/lib/vdsm/network/netswitch.py index c58e52a..c187b2a 100644 --- a/lib/vdsm/network/netswitch.py +++ b/lib/vdsm/network/netswitch.py @@ -23,7 +23,7 @@ from vdsm.netinfo.cache import (libvirtNets2vdsm, get as netinfo_get, CachingNetInfo) from vdsm.netinfo import networks as libvirt_nets -from vdsm.netconfpersistence import RunningConfig +from .netconfpersistence import RunningConfig from . import connectivity from . import legacy_switch diff --git a/lib/vdsm/network/ovs/switch.py b/lib/vdsm/network/ovs/switch.py index 242e41e..812c59a 100644 --- a/lib/vdsm/network/ovs/switch.py +++ b/lib/vdsm/network/ovs/switch.py @@ -22,7 +22,7 @@ import six -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from vdsm.netinfo.cache import CachingNetInfo from . import validator diff --git a/lib/vdsm/tool/unified_persistence.py b/lib/vdsm/tool/unified_persistence.py index 01358ba..16d979b 100644 --- a/lib/vdsm/tool/unified_persistence.py +++ b/lib/vdsm/tool/unified_persistence.py @@ -22,7 +22,7 @@ from .. import utils from ..config import config -from ..netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from ..netinfo.cache import CachingNetInfo from ..netinfo import misc, routes from . import expose diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index fd8be29..7db1ecb 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -34,7 +34,7 @@ from vdsm.ipwrapper import (routeExists, ruleExists, addrFlush, LinkType, getLinks, routeShowTable, linkDel, linkSet, addrAdd) -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from vdsm.netinfo.bonding import BONDING_SLAVES, BONDING_MASTERS from vdsm.netinfo.bridges import bridges from vdsm.netinfo.misc import NET_CONF_PREF diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 5499498..99c353e 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -30,7 +30,7 @@ from vdsm import jsonrpcvdscli from vdsm.netinfo.cache import CachingNetInfo from vdsm import supervdsm -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig SUCCESS = 0 diff --git a/tests/network/conf_persistence_test.py b/tests/network/conf_persistence_test.py index 4f52557..00f974f 100644 --- a/tests/network/conf_persistence_test.py +++ b/tests/network/conf_persistence_test.py @@ -28,7 +28,7 @@ from nose.plugins.attrib import attr -from vdsm.netconfpersistence import Config +from vdsm.network.netconfpersistence import Config from vdsm.utils import rmFile from testlib import VdsmTestCase as TestCaseBase diff --git a/tests/network/hook_ovs_test.py b/tests/network/hook_ovs_test.py index 40de973..b11a35a 100644 --- a/tests/network/hook_ovs_test.py +++ b/tests/network/hook_ovs_test.py @@ -26,7 +26,7 @@ from testlib import XMLTestCase from monkeypatch import MonkeyPatchScope -from vdsm import netconfpersistence +from vdsm.network import netconfpersistence sys.path.append('../vdsm_hooks/ovs') # Devel Location sys.path.append('../../vdsm_hooks/ovs') # Devel Location diff --git a/vdsm.spec.in b/vdsm.spec.in index 4456725..7d7e11f 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1159,6 +1159,7 @@ %{python_sitelib}/%{vdsm_name}/network/ovs/switch.py* %{python_sitelib}/%{vdsm_name}/network/ovs/validator.py* %{python_sitelib}/%{vdsm_name}/network/models.py* +%{python_sitelib}/%{vdsm_name}/network/netconfpersistence.py* %{python_sitelib}/%{vdsm_name}/network/netswitch.py* %{python_sitelib}/%{vdsm_name}/network/sourceroute.py* %{python_sitelib}/%{vdsm_name}/network/sourceroutethread.py* @@ -1192,7 +1193,6 @@ %{python_sitelib}/%{vdsm_name}/pthread.py* %{python_sitelib}/%{vdsm_name}/qemuimg.py* %{python_sitelib}/%{vdsm_name}/response.py* -%{python_sitelib}/%{vdsm_name}/netconfpersistence.py* %{python_sitelib}/%{vdsm_name}/schedule.py* %{python_sitelib}/%{vdsm_name}/sslcompat.py* %{python_sitelib}/%{vdsm_name}/sslutils.py* diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config index 85c9a34..9ad4bec 100755 --- a/vdsm/vdsm-restore-net-config +++ b/vdsm/vdsm-restore-net-config @@ -37,7 +37,7 @@ from vdsm.netinfo.cache import CachingNetInfo from vdsm import kernelconfig from vdsm.constants import P_VDSM_RUN -from vdsm.netconfpersistence import RunningConfig, PersistentConfig, \ +from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig, \ CONF_PERSIST_DIR, BaseConfig from vdsm import sysctl from vdsm.utils import monotonic_time diff --git a/vdsm_hooks/checkips/after_get_stats.py b/vdsm_hooks/checkips/after_get_stats.py index 9be6339..f9c77cf 100644 --- a/vdsm_hooks/checkips/after_get_stats.py +++ b/vdsm_hooks/checkips/after_get_stats.py @@ -28,7 +28,7 @@ import checkips_utils import hooking from vdsm import constants -import vdsm.netconfpersistence as persist_net +import vdsm.network.netconfpersistence as persist_net HELP_ARG = '-h' TEST_ARG = '-t' diff --git a/vdsm_hooks/checkips/checkipsd b/vdsm_hooks/checkips/checkipsd index 8e081b1..05511e0 100644 --- a/vdsm_hooks/checkips/checkipsd +++ b/vdsm_hooks/checkips/checkipsd @@ -27,7 +27,7 @@ import threading from vdsm import constants -import vdsm.netconfpersistence as persist_net +import vdsm.network.netconfpersistence as persist_net sys.path.append(os.path.join(constants.P_VDSM_HOOKS, 'after_get_stats')) import checkips_utils diff --git a/vdsm_hooks/ovs/ovs_after_get_caps.py b/vdsm_hooks/ovs/ovs_after_get_caps.py index e364262..f40cbe1 100755 --- a/vdsm_hooks/ovs/ovs_after_get_caps.py +++ b/vdsm_hooks/ovs/ovs_after_get_caps.py @@ -21,7 +21,7 @@ import sys import traceback -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from vdsm.netinfo import dhcp, routes as netinfo_routes, addresses, mtus from vdsm.netinfo.bonding import parse_bond_options diff --git a/vdsm_hooks/ovs/ovs_after_get_stats.py b/vdsm_hooks/ovs/ovs_after_get_stats.py index fc27b5f..3f89591 100755 --- a/vdsm_hooks/ovs/ovs_after_get_stats.py +++ b/vdsm_hooks/ovs/ovs_after_get_stats.py @@ -21,7 +21,7 @@ import six -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig import hooking diff --git a/vdsm_hooks/ovs/ovs_before_device_create.py b/vdsm_hooks/ovs/ovs_before_device_create.py index 329a6ef..13d5143 100755 --- a/vdsm_hooks/ovs/ovs_before_device_create.py +++ b/vdsm_hooks/ovs/ovs_before_device_create.py @@ -20,7 +20,7 @@ import sys import traceback -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig import hooking diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py index d8e4899..7dcc62d 100755 --- a/vdsm_hooks/ovs/ovs_before_network_setup.py +++ b/vdsm_hooks/ovs/ovs_before_network_setup.py @@ -35,7 +35,7 @@ from vdsm import hooks from vdsm.compat import suppress from vdsm.ipwrapper import linkSet -from vdsm.netconfpersistence import RunningConfig +from vdsm.network.netconfpersistence import RunningConfig from vdsm.network.configurators import libvirt from hooking import execCmd diff --git a/vdsm_hooks/ovs/ovs_migrate.py b/vdsm_hooks/ovs/ovs_migrate.py index 12342d8..6de0be9 100755 --- a/vdsm_hooks/ovs/ovs_migrate.py +++ b/vdsm_hooks/ovs/ovs_migrate.py @@ -25,7 +25,7 @@ import six # TODO: Remove the direct access to VDSM internal and interact with hooking api -from vdsm import netconfpersistence +from vdsm.network import netconfpersistence # The caller of this hook is libvirt, therefore there is a need to specify # the path to VDSMDIR before importing ovs_utils (or more precisely hooking) -- To view, visit https://gerrit.ovirt.org/56677 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5325153a6462014d4b5e8300633d25757258d3c0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
