Change in vdsm[master]: net: Move libvirt module under network
edwardh at redhat.com
edwardh at redhat.com
Tue May 10 14:55:24 UTC 2016
Edward Haas has uploaded a new change for review.
Change subject: net: Move libvirt module under network
......................................................................
net: Move libvirt module under network
Move libvirt module from network.configurators to network.
Change-Id: I858c57e026573d000388ea42c2319b6bd400497c
Signed-off-by: Edward Haas <edwardh at redhat.com>
---
M lib/vdsm/network/Makefile.am
M lib/vdsm/network/configurators/Makefile.am
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/libvirt.py
M tests/network/conf_test.py
M vdsm.spec.in
M vdsm_hooks/ovs/ovs_before_network_setup.py
M vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
M vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
12 files changed, 14 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/57310/1
diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am
index 9696083..3889776 100644
--- a/lib/vdsm/network/Makefile.am
+++ b/lib/vdsm/network/Makefile.am
@@ -31,6 +31,7 @@
ipwrapper.py \
kernelconfig.py \
legacy_switch.py \
+ libvirt.py \
models.py \
netconfpersistence.py \
netswitch.py \
diff --git a/lib/vdsm/network/configurators/Makefile.am b/lib/vdsm/network/configurators/Makefile.am
index f78d5f7..03ee834 100644
--- a/lib/vdsm/network/configurators/Makefile.am
+++ b/lib/vdsm/network/configurators/Makefile.am
@@ -26,7 +26,6 @@
dhclient.py \
ifcfg.py \
iproute2.py \
- libvirt.py \
pyroute_two.py \
qos.py \
$(NULL)
diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py
index 384ee25..59df571 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -44,6 +44,7 @@
from vdsm import utils
from vdsm.network import ipwrapper
+from vdsm.network import libvirt
from vdsm.network.ip.address import IPv4, IPv6
from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig
from vdsm.network.netinfo import (bonding as netinfo_bonding, mtus, nics,
@@ -54,7 +55,7 @@
if utils.isOvirtNode():
from ovirt.node.utils import fs as node_fs
-from . import Configurator, dhclient, getEthtoolOpts, libvirt
+from . import Configurator, dhclient, getEthtoolOpts
from ..errors import ConfigNetworkError, ERR_FAILED_IFUP
from ..models import Nic, Bridge
from ..sourceroute import StaticSourceRoute, DynamicSourceRoute
diff --git a/lib/vdsm/network/configurators/iproute2.py b/lib/vdsm/network/configurators/iproute2.py
index 139012c..82eaeaa 100644
--- a/lib/vdsm/network/configurators/iproute2.py
+++ b/lib/vdsm/network/configurators/iproute2.py
@@ -21,6 +21,7 @@
import logging
from vdsm.network import ipwrapper
+from vdsm.network import libvirt
from vdsm.network.ipwrapper import (routeAdd, routeDel, ruleAdd, ruleDel,
IPRoute2Error)
from vdsm.network.netinfo import bonding, vlans, bridges, mtus, misc
@@ -31,8 +32,7 @@
from vdsm.utils import CommandPath
from vdsm.commands import execCmd
-from . import (Configurator, runDhclient, getEthtoolOpts, libvirt,
- wait_for_device)
+from . import Configurator, runDhclient, getEthtoolOpts, wait_for_device
from .dhclient import DhcpClient
from ..errors import ConfigNetworkError, ERR_FAILED_IFUP, ERR_FAILED_IFDOWN
from ..models import Nic
diff --git a/lib/vdsm/network/configurators/pyroute_two.py b/lib/vdsm/network/configurators/pyroute_two.py
index be6d00e..b598820 100644
--- a/lib/vdsm/network/configurators/pyroute_two.py
+++ b/lib/vdsm/network/configurators/pyroute_two.py
@@ -21,10 +21,11 @@
import logging
from vdsm.network import ipwrapper
+from vdsm.network import libvirt
from vdsm.network import netinfo
from vdsm.network.netconfpersistence import RunningConfig
-from . import libvirt, runDhclient
+from . import runDhclient
from .dhclient import DhcpClient
from .iproute2 import Iproute2
from ..utils import remove_custom_bond_option
diff --git a/lib/vdsm/network/legacy_switch.py b/lib/vdsm/network/legacy_switch.py
index 74edc25..891e09e 100644
--- a/lib/vdsm/network/legacy_switch.py
+++ b/lib/vdsm/network/legacy_switch.py
@@ -27,6 +27,7 @@
from vdsm.config import config
from vdsm.network import ipwrapper
+from vdsm.network import libvirt
from vdsm.network import kernelconfig
from vdsm.network.netinfo import NET_PATH
from vdsm.network.netinfo import addresses
@@ -37,7 +38,6 @@
from vdsm.network.ip.address import IPv4, IPv6
from vdsm import utils
-from .configurators import libvirt
from .models import Bond, Bridge, Nic, Vlan
from .models import hierarchy_backing_device
from . import errors as ne
diff --git a/lib/vdsm/network/configurators/libvirt.py b/lib/vdsm/network/libvirt.py
similarity index 100%
rename from lib/vdsm/network/configurators/libvirt.py
rename to lib/vdsm/network/libvirt.py
diff --git a/tests/network/conf_test.py b/tests/network/conf_test.py
index 9b3e69b..d94b5e6 100644
--- a/tests/network/conf_test.py
+++ b/tests/network/conf_test.py
@@ -29,7 +29,8 @@
import tempfile
import xml.etree.ElementTree as ET
-from vdsm.network.configurators import ifcfg, libvirt
+from vdsm.network import libvirt
+from vdsm.network.configurators import ifcfg
from monkeypatch import MonkeyPatch
from monkeypatch import MonkeyPatchScope
diff --git a/vdsm.spec.in b/vdsm.spec.in
index cc95292..f5cbba0 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1181,7 +1181,6 @@
%{python_sitelib}/%{vdsm_name}/network/configurators/dhclient.py*
%{python_sitelib}/%{vdsm_name}/network/configurators/ifcfg.py*
%{python_sitelib}/%{vdsm_name}/network/configurators/iproute2.py*
-%{python_sitelib}/%{vdsm_name}/network/configurators/libvirt.py*
%{python_sitelib}/%{vdsm_name}/network/configurators/pyroute_two.py*
%{python_sitelib}/%{vdsm_name}/network/configurators/qos.py*
%{python_sitelib}/%{vdsm_name}/network/errors.py*
@@ -1191,6 +1190,7 @@
%{python_sitelib}/%{vdsm_name}/network/ipwrapper.py*
%{python_sitelib}/%{vdsm_name}/network/kernelconfig.py*
%{python_sitelib}/%{vdsm_name}/network/legacy_switch.py*
+%{python_sitelib}/%{vdsm_name}/network/libvirt.py*
%{python_sitelib}/%{vdsm_name}/network/netinfo/*.py*
%{python_sitelib}/%{vdsm_name}/network/netlink/__init__.py*
%{python_sitelib}/%{vdsm_name}/network/netlink/addr.py*
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py
index a8662c7..6740ff8 100755
--- a/vdsm_hooks/ovs/ovs_before_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup.py
@@ -34,9 +34,9 @@
from vdsm import hooks
from vdsm.compat import suppress
+from vdsm.network import libvirt
from vdsm.network.ipwrapper import linkSet
from vdsm.network.netconfpersistence import RunningConfig
-from vdsm.network.configurators import libvirt
from hooking import execCmd
import hooking
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py b/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
index 12db499..9eb7495 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
@@ -21,7 +21,7 @@
import six
from vdsm.compat import suppress
-from vdsm.network.configurators import libvirt
+from vdsm.network import libvirt
def prepare_libvirt(nets, running_config):
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
index f5e6f18..8a79568 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
@@ -22,9 +22,9 @@
import six
from vdsm.compat import suppress
+from vdsm.network import libvirt
from vdsm.network.netinfo.cache import CachingNetInfo
from vdsm.network.netinfo.bonding import parse_bond_options
-from vdsm.network.configurators import libvirt
from vdsm.utils import rget
import hooking
--
To view, visit https://gerrit.ovirt.org/57310
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I858c57e026573d000388ea42c2319b6bd400497c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh at redhat.com>
More information about the vdsm-patches
mailing list