Edward Haas has uploaded a new change for review.
Change subject: net: Move netinfo under vdsm.network
......................................................................
net: Move netinfo under vdsm.network
Change-Id: Ia02e5f79e093067789659e414b595aa4e3d5a62e
Signed-off-by: Edward Haas <edwa...@redhat.com>
---
M configure.ac
M init/wait_for_ipv4s
M lib/vdsm/Makefile.am
M lib/vdsm/kernelconfig.py
M lib/vdsm/network/Makefile.am
M lib/vdsm/network/canonicalize.py
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/configurators/dhclient.py
M lib/vdsm/network/configurators/ifcfg.py
M lib/vdsm/network/configurators/iproute2.py
M lib/vdsm/network/configurators/libvirt.py
M lib/vdsm/network/configurators/pyroute_two.py
M lib/vdsm/network/configurators/qos.py
M lib/vdsm/network/legacy_switch.py
M lib/vdsm/network/models.py
R lib/vdsm/network/netinfo/Makefile.am
R lib/vdsm/network/netinfo/__init__.py
R lib/vdsm/network/netinfo/addresses.py
R lib/vdsm/network/netinfo/bonding.py
R lib/vdsm/network/netinfo/bridges.py
R lib/vdsm/network/netinfo/cache.py
R lib/vdsm/network/netinfo/dhcp.py
R lib/vdsm/network/netinfo/dns.py
R lib/vdsm/network/netinfo/misc.py
R lib/vdsm/network/netinfo/mtus.py
R lib/vdsm/network/netinfo/nics.py
R lib/vdsm/network/netinfo/qos.py
R lib/vdsm/network/netinfo/routes.py
R lib/vdsm/network/netinfo/vlans.py
M lib/vdsm/network/netswitch.py
M lib/vdsm/network/ovs/switch.py
M lib/vdsm/network/sourceroute.py
M lib/vdsm/rpc/Bridge.py
M lib/vdsm/rpc/bindingxmlrpc.py
M lib/vdsm/tool/dummybr.py
M lib/vdsm/tool/dump_bonding_opts.py
M lib/vdsm/tool/unified_persistence.py
M lib/vdsm/virt/sampling.py
M tests/functional/networkTests.py
M tests/functional/utils.py
M tests/network/config_network_test.py
M tests/network/models_test.py
M tests/network/netinfo_test.py
M tests/network/qos_test.py
M tests/network/tc_test.py
M tests/network/unified_persistence_test.py
M vdsm.spec.in
M vdsm/caps.py
M vdsm/gluster/cli.py
M vdsm/storage/iscsi.py
M vdsm/vdsm-restore-net-config
M vdsm/virt/vm.py
M vdsm/virt/vmdevices/graphics.py
M vdsm/virt/vmdevices/network.py
M vdsm_hooks/ethtool_options/ethtool_options.py
M vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
M vdsm_hooks/openstacknet/openstacknet_utils.py
M vdsm_hooks/ovs/ovs_after_get_caps.py
M vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
M vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
M vdsm_hooks/ovs/ovs_utils.py
61 files changed, 108 insertions(+), 116 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/56713/1
diff --git a/configure.ac b/configure.ac
index d4fc5f1..804164d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,7 @@
AC_SUBST([vdsmrepo], ['/rhev/data-center'])
AC_SUBST([vdsmpylibdir], ['${pythondir}/vdsm'])
AC_SUBST([vdsminfradir], ['${vdsmpylibdir}/infra'])
-AC_SUBST([vdsmnetinfodir], ['${vdsmpylibdir}/netinfo'])
+AC_SUBST([vdsmnetinfodir], ['${vdsmpylibdir}/network/netinfo'])
AC_SUBST([vdsmtooldir], ['${vdsmpylibdir}/tool'])
AC_SUBST([configuratorsdir], ['${vdsmtooldir}/configurators'])
AC_SUBST([vdsmtestsdir], ['${datarootdir}/vdsm/tests'])
@@ -382,7 +382,6 @@
lib/vdsm/Makefile
lib/vdsm/common/Makefile
lib/vdsm/common/network/Makefile
- lib/vdsm/netinfo/Makefile
lib/vdsm/netlink/Makefile
lib/vdsm/profiling/Makefile
lib/vdsm/tool/Makefile
@@ -397,6 +396,7 @@
lib/vdsm/network/Makefile
lib/vdsm/network/configurators/Makefile
lib/vdsm/network/ip/Makefile
+ lib/vdsm/network/netinfo/Makefile
lib/vdsm/network/ovs/Makefile
lib/vdsm/rpc/Makefile
lib/vdsm/storage/Makefile
diff --git a/init/wait_for_ipv4s b/init/wait_for_ipv4s
index 0cfffb4..bf75acb 100755
--- a/init/wait_for_ipv4s
+++ b/init/wait_for_ipv4s
@@ -10,7 +10,7 @@
from os.path import isfile, join
import sys
-from vdsm.netinfo.addresses import getIpInfo
+from vdsm.network.netinfo.addresses import getIpInfo
from vdsm.netlink import monitor
from vdsm.network.configurators.ifcfg import NET_CONF_DIR
from vdsm.network.configurators.ifcfg import ConfigWriter
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 30183c0..6f38995 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -19,7 +19,7 @@
#
include $(top_srcdir)/build-aux/Makefile.subs
-SUBDIRS=common netinfo netlink tool infra profiling rpc tc network virt storage
+SUBDIRS=common netlink tool infra profiling rpc tc network virt storage
dist_vdsmpylib_PYTHON = \
__init__.py \
diff --git a/lib/vdsm/kernelconfig.py b/lib/vdsm/kernelconfig.py
index f335e7e..f0bf451 100644
--- a/lib/vdsm/kernelconfig.py
+++ b/lib/vdsm/kernelconfig.py
@@ -23,9 +23,9 @@
import string
from . import constants
-from .netinfo import addresses
-from .netinfo import bonding
-from .netinfo import bridges
+from vdsm.network.netinfo import addresses
+from vdsm.network.netinfo import bonding
+from vdsm.network.netinfo import bridges
from vdsm.network.netconfpersistence import BaseConfig
diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am
index b770e7c..ca5deab 100644
--- a/lib/vdsm/network/Makefile.am
+++ b/lib/vdsm/network/Makefile.am
@@ -17,7 +17,7 @@
# Refer to the README and COPYING files for full details of the license
#
-SUBDIRS = configurators ip ovs
+SUBDIRS = configurators ip netinfo ovs
include $(top_srcdir)/build-aux/Makefile.subs
diff --git a/lib/vdsm/network/canonicalize.py b/lib/vdsm/network/canonicalize.py
index 68755fa..009a2bb 100644
--- a/lib/vdsm/network/canonicalize.py
+++ b/lib/vdsm/network/canonicalize.py
@@ -21,7 +21,7 @@
import six
-from vdsm.netinfo import (bridges, mtus, bonding)
+from .netinfo import (bridges, mtus, bonding)
from vdsm import utils
from .errors import ConfigNetworkError
diff --git a/lib/vdsm/network/configurators/__init__.py
b/lib/vdsm/network/configurators/__init__.py
index 7098872..20cc7b1 100644
--- a/lib/vdsm/network/configurators/__init__.py
+++ b/lib/vdsm/network/configurators/__init__.py
@@ -24,7 +24,7 @@
from vdsm.config import config
from vdsm.network.netconfpersistence import RunningConfig
from vdsm import ipwrapper
-from vdsm.netinfo import mtus
+from vdsm.network.netinfo import mtus
from vdsm.netlink import monitor
from .dhclient import DhcpClient
diff --git a/lib/vdsm/network/configurators/dhclient.py
b/lib/vdsm/network/configurators/dhclient.py
index 8267db3..eb4c99b 100644
--- a/lib/vdsm/network/configurators/dhclient.py
+++ b/lib/vdsm/network/configurators/dhclient.py
@@ -27,7 +27,7 @@
from vdsm import cmdutils
from vdsm import ipwrapper
-from vdsm import netinfo
+from vdsm.network import netinfo
from vdsm.commands import execCmd
from vdsm.utils import CommandPath, memoized, pgrep, kill_and_rm_pid
diff --git a/lib/vdsm/network/configurators/ifcfg.py
b/lib/vdsm/network/configurators/ifcfg.py
index d9545f5..0b4b503 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -41,9 +41,9 @@
from vdsm import dsaversion
from vdsm import hooks
from vdsm import ipwrapper
-from vdsm.netinfo import (bonding as netinfo_bonding, mtus, nics, vlans, misc,
- NET_PATH)
-from vdsm.netinfo.cache import ifaceUsed
+from vdsm.network.netinfo import (bonding as netinfo_bonding, mtus, nics,
+ vlans, misc, NET_PATH)
+from vdsm.network.netinfo.cache import ifaceUsed
from vdsm import sysctl
from vdsm import utils
from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig
diff --git a/lib/vdsm/network/configurators/iproute2.py
b/lib/vdsm/network/configurators/iproute2.py
index 52bf57b..2005844 100644
--- a/lib/vdsm/network/configurators/iproute2.py
+++ b/lib/vdsm/network/configurators/iproute2.py
@@ -20,8 +20,8 @@
from __future__ import absolute_import
import logging
-from vdsm.netinfo import bonding, vlans, bridges, mtus, misc
-from vdsm.netinfo.cache import ifaceUsed
+from vdsm.network.netinfo import bonding, vlans, bridges, mtus, misc
+from vdsm.network.netinfo.cache import ifaceUsed
from vdsm import ipwrapper
from vdsm.constants import EXT_BRCTL
from vdsm.ipwrapper import routeAdd, routeDel, ruleAdd, ruleDel, IPRoute2Error
diff --git a/lib/vdsm/network/configurators/libvirt.py
b/lib/vdsm/network/configurators/libvirt.py
index a88ded7..5a1864b 100644
--- a/lib/vdsm/network/configurators/libvirt.py
+++ b/lib/vdsm/network/configurators/libvirt.py
@@ -24,7 +24,7 @@
from libvirt import libvirtError, VIR_ERR_NO_NETWORK
from vdsm import libvirtconnection
-from vdsm import netinfo
+from vdsm.network import netinfo
def getNetworkDef(network):
diff --git a/lib/vdsm/network/configurators/pyroute_two.py
b/lib/vdsm/network/configurators/pyroute_two.py
index 65b2826..e28a63d 100644
--- a/lib/vdsm/network/configurators/pyroute_two.py
+++ b/lib/vdsm/network/configurators/pyroute_two.py
@@ -20,7 +20,7 @@
from __future__ import absolute_import
import logging
-from vdsm import netinfo
+from vdsm.network import netinfo
from vdsm import ipwrapper
from vdsm.network.netconfpersistence import RunningConfig
diff --git a/lib/vdsm/network/configurators/qos.py
b/lib/vdsm/network/configurators/qos.py
index 73f0e3b..6a520eb 100644
--- a/lib/vdsm/network/configurators/qos.py
+++ b/lib/vdsm/network/configurators/qos.py
@@ -21,8 +21,8 @@
import os
from distutils.version import StrictVersion
-from vdsm.netinfo.cache import ifaceUsed
-from vdsm.netinfo import qos as netinfo_qos
+from vdsm.network.netinfo.cache import ifaceUsed
+from vdsm.network.netinfo import qos as netinfo_qos
from vdsm import tc
_ROOT_QDISC_HANDLE = '%x:' % 5001 # Leave 0 free for leaf qdisc of vlan tag 0
diff --git a/lib/vdsm/network/legacy_switch.py
b/lib/vdsm/network/legacy_switch.py
index abf0a1c..eaaeb80 100644
--- a/lib/vdsm/network/legacy_switch.py
+++ b/lib/vdsm/network/legacy_switch.py
@@ -29,12 +29,12 @@
from vdsm import ipwrapper
from vdsm import kernelconfig
from . import netconfpersistence
-from vdsm.netinfo import NET_PATH
-from vdsm.netinfo import addresses
-from vdsm.netinfo import bridges
-from vdsm.netinfo import mtus
-from vdsm.netinfo import nics as netinfo_nics
-from vdsm.netinfo.cache import CachingNetInfo
+from vdsm.network.netinfo import NET_PATH
+from vdsm.network.netinfo import addresses
+from vdsm.network.netinfo import bridges
+from vdsm.network.netinfo import mtus
+from vdsm.network.netinfo import nics as netinfo_nics
+from vdsm.network.netinfo.cache import CachingNetInfo
from vdsm.network.ip.address import IPv4, IPv6
from vdsm import utils
diff --git a/lib/vdsm/network/models.py b/lib/vdsm/network/models.py
index 8473b3f..f91f010 100644
--- a/lib/vdsm/network/models.py
+++ b/lib/vdsm/network/models.py
@@ -21,8 +21,8 @@
import six
import re
-from vdsm.netinfo import bonding, mtus, nics
-from vdsm.netinfo.cache import ifaceUsed, CachingNetInfo
+from vdsm.network.netinfo import bonding, mtus, nics
+from vdsm.network.netinfo.cache import ifaceUsed, CachingNetInfo
from vdsm.network.ip.address import IPv4, IPv6
from .errors import ConfigNetworkError
diff --git a/lib/vdsm/netinfo/Makefile.am b/lib/vdsm/network/netinfo/Makefile.am
similarity index 95%
rename from lib/vdsm/netinfo/Makefile.am
rename to lib/vdsm/network/netinfo/Makefile.am
index f757e14..87ee25b 100644
--- a/lib/vdsm/netinfo/Makefile.am
+++ b/lib/vdsm/network/netinfo/Makefile.am
@@ -19,7 +19,7 @@
#
include $(top_srcdir)/build-aux/Makefile.subs
-vdsmnetinfo = $(vdsmpylibdir)/netinfo
+vdsmnetinfo = $(vdsmpylibdir)/network/netinfo
dist_vdsmnetinfo_PYTHON = \
__init__.py \
addresses.py \
diff --git a/lib/vdsm/netinfo/__init__.py b/lib/vdsm/network/netinfo/__init__.py
similarity index 96%
rename from lib/vdsm/netinfo/__init__.py
rename to lib/vdsm/network/netinfo/__init__.py
index 941113a..1cdef2b 100644
--- a/lib/vdsm/netinfo/__init__.py
+++ b/lib/vdsm/network/netinfo/__init__.py
@@ -23,8 +23,8 @@
import xml.etree.cElementTree as etree
-from ..ipwrapper import DUMMY_BRIDGE
-from .. import libvirtconnection
+from vdsm.ipwrapper import DUMMY_BRIDGE
+from vdsm import libvirtconnection
DUMMY_BRIDGE # Appease flake8 since dummy bridge should be exported from here
diff --git a/lib/vdsm/netinfo/addresses.py
b/lib/vdsm/network/netinfo/addresses.py
similarity index 97%
rename from lib/vdsm/netinfo/addresses.py
rename to lib/vdsm/network/netinfo/addresses.py
index 065b814..84880ae 100644
--- a/lib/vdsm/netinfo/addresses.py
+++ b/lib/vdsm/network/netinfo/addresses.py
@@ -24,8 +24,8 @@
import socket
import struct
-from ..netlink import addr as nl_addr
-from ..sysctl import is_ipv6_local_auto as sysctl_is_ipv6_local_auto
+from vdsm.netlink import addr as nl_addr
+from vdsm.sysctl import is_ipv6_local_auto as sysctl_is_ipv6_local_auto
def getIpInfo(dev, ipaddrs=None, ipv4_gateway=None):
diff --git a/lib/vdsm/netinfo/bonding.py b/lib/vdsm/network/netinfo/bonding.py
similarity index 98%
rename from lib/vdsm/netinfo/bonding.py
rename to lib/vdsm/network/netinfo/bonding.py
index 75ef846..50c13b3 100644
--- a/lib/vdsm/netinfo/bonding.py
+++ b/lib/vdsm/network/netinfo/bonding.py
@@ -25,10 +25,10 @@
import six
import os
-from .. import constants
-from ..utils import memoized
+from vdsm import constants
+from vdsm.utils import memoized
-from ..ipwrapper import Link
+from vdsm.ipwrapper import Link
from .misc import visible_devs
from . import nics
diff --git a/lib/vdsm/netinfo/bridges.py b/lib/vdsm/network/netinfo/bridges.py
similarity index 98%
rename from lib/vdsm/netinfo/bridges.py
rename to lib/vdsm/network/netinfo/bridges.py
index f76d989..3cf8b77 100644
--- a/lib/vdsm/netinfo/bridges.py
+++ b/lib/vdsm/network/netinfo/bridges.py
@@ -23,7 +23,7 @@
import os
from .misc import visible_devs
-from ..ipwrapper import Link
+from vdsm.ipwrapper import Link
BRIDGING_OPT = '/sys/class/net/%s/bridge/%s'
diff --git a/lib/vdsm/netinfo/cache.py b/lib/vdsm/network/netinfo/cache.py
similarity index 98%
rename from lib/vdsm/netinfo/cache.py
rename to lib/vdsm/network/netinfo/cache.py
index 09c5015..2a39ca4 100644
--- a/lib/vdsm/netinfo/cache.py
+++ b/lib/vdsm/network/netinfo/cache.py
@@ -25,11 +25,11 @@
import errno
import six
-from ..ipwrapper import getLinks
+from vdsm.ipwrapper import getLinks
from vdsm.network.netconfpersistence import RunningConfig
-from ..netlink import link as nl_link
+from vdsm.netlink import link as nl_link
-from vdsm import netinfo
+from vdsm.network import netinfo
from .addresses import getIpAddrs, getIpInfo, is_ipv6_local_auto
from . import bonding
from . import bridges
diff --git a/lib/vdsm/netinfo/dhcp.py b/lib/vdsm/network/netinfo/dhcp.py
similarity index 100%
rename from lib/vdsm/netinfo/dhcp.py
rename to lib/vdsm/network/netinfo/dhcp.py
diff --git a/lib/vdsm/netinfo/dns.py b/lib/vdsm/network/netinfo/dns.py
similarity index 100%
rename from lib/vdsm/netinfo/dns.py
rename to lib/vdsm/network/netinfo/dns.py
diff --git a/lib/vdsm/netinfo/misc.py b/lib/vdsm/network/netinfo/misc.py
similarity index 96%
rename from lib/vdsm/netinfo/misc.py
rename to lib/vdsm/network/netinfo/misc.py
index 0ef5010..af27264 100644
--- a/lib/vdsm/netinfo/misc.py
+++ b/lib/vdsm/network/netinfo/misc.py
@@ -22,8 +22,8 @@
import shlex
import socket
-from ..ipwrapper import getLinks
-from .. import utils
+from vdsm.ipwrapper import getLinks
+from vdsm import utils
_IFCFG_ZERO_SUFFIXED = frozenset(
diff --git a/lib/vdsm/netinfo/mtus.py b/lib/vdsm/network/netinfo/mtus.py
similarity index 100%
rename from lib/vdsm/netinfo/mtus.py
rename to lib/vdsm/network/netinfo/mtus.py
diff --git a/lib/vdsm/netinfo/nics.py b/lib/vdsm/network/netinfo/nics.py
similarity index 97%
rename from lib/vdsm/netinfo/nics.py
rename to lib/vdsm/network/netinfo/nics.py
index 7e6ba0a..1fd6aaa 100644
--- a/lib/vdsm/netinfo/nics.py
+++ b/lib/vdsm/network/netinfo/nics.py
@@ -22,9 +22,9 @@
from functools import partial
import logging
-from ..ipwrapper import drv_name
+from vdsm.ipwrapper import drv_name
from .misc import visible_devs
-from ..ipwrapper import Link
+from vdsm.ipwrapper import Link
OPERSTATE_UP = 'up'
OPERSTATE_UNKNOWN = 'unknown'
diff --git a/lib/vdsm/netinfo/qos.py b/lib/vdsm/network/netinfo/qos.py
similarity index 100%
rename from lib/vdsm/netinfo/qos.py
rename to lib/vdsm/network/netinfo/qos.py
diff --git a/lib/vdsm/netinfo/routes.py b/lib/vdsm/network/netinfo/routes.py
similarity index 95%
rename from lib/vdsm/netinfo/routes.py
rename to lib/vdsm/network/netinfo/routes.py
index 4b1b001..85833cd 100644
--- a/lib/vdsm/netinfo/routes.py
+++ b/lib/vdsm/network/netinfo/routes.py
@@ -20,9 +20,9 @@
from collections import defaultdict
import logging
-from ..ipwrapper import IPRoute2Error
-from ..ipwrapper import routeGet, Route, routeShowGateways
-from ..netlink import route as nl_route
+from vdsm.ipwrapper import IPRoute2Error
+from vdsm.ipwrapper import routeGet, Route, routeShowGateways
+from vdsm.netlink import route as nl_route
def getRouteDeviceTo(destinationIP):
diff --git a/lib/vdsm/netinfo/vlans.py b/lib/vdsm/network/netinfo/vlans.py
similarity index 95%
rename from lib/vdsm/netinfo/vlans.py
rename to lib/vdsm/network/netinfo/vlans.py
index 95089a5..67f52a4 100644
--- a/lib/vdsm/netinfo/vlans.py
+++ b/lib/vdsm/network/netinfo/vlans.py
@@ -22,8 +22,8 @@
from . import bonding
from .misc import visible_devs
from . import nics
-from ..ipwrapper import getLink, Link
-from ..netlink import link as nl_link
+from vdsm.ipwrapper import getLink, Link
+from vdsm.netlink import link as nl_link
vlans = partial(visible_devs, Link.isVLAN)
diff --git a/lib/vdsm/network/netswitch.py b/lib/vdsm/network/netswitch.py
index c187b2a..74d2e5f 100644
--- a/lib/vdsm/network/netswitch.py
+++ b/lib/vdsm/network/netswitch.py
@@ -20,9 +20,9 @@
import six
-from vdsm.netinfo.cache import (libvirtNets2vdsm, get as netinfo_get,
- CachingNetInfo)
-from vdsm.netinfo import networks as libvirt_nets
+from vdsm.network.netinfo.cache import (libvirtNets2vdsm, get as netinfo_get,
+ CachingNetInfo)
+from vdsm.network.netinfo import networks as libvirt_nets
from .netconfpersistence import RunningConfig
from . import connectivity
diff --git a/lib/vdsm/network/ovs/switch.py b/lib/vdsm/network/ovs/switch.py
index 812c59a..9e9478f 100644
--- a/lib/vdsm/network/ovs/switch.py
+++ b/lib/vdsm/network/ovs/switch.py
@@ -23,7 +23,7 @@
import six
from vdsm.network.netconfpersistence import RunningConfig
-from vdsm.netinfo.cache import CachingNetInfo
+from vdsm.network.netinfo.cache import CachingNetInfo
from . import validator
diff --git a/lib/vdsm/network/sourceroute.py b/lib/vdsm/network/sourceroute.py
index 66adeba..78726f3 100644
--- a/lib/vdsm/network/sourceroute.py
+++ b/lib/vdsm/network/sourceroute.py
@@ -24,7 +24,7 @@
import logging
import netaddr
-from vdsm import netinfo
+from vdsm.network import netinfo
from vdsm.constants import P_VDSM_RUN
from vdsm.ipwrapper import IPRoute2Error
from vdsm.ipwrapper import Route
diff --git a/lib/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py
index 948787e..6b106dd 100644
--- a/lib/vdsm/rpc/Bridge.py
+++ b/lib/vdsm/rpc/Bridge.py
@@ -26,7 +26,7 @@
import yajsonrpc
from api import vdsmapi
-from vdsm.netinfo.addresses import getDeviceByIP
+from vdsm.network.netinfo.addresses import getDeviceByIP
from vdsm.exception import VdsmException
diff --git a/lib/vdsm/rpc/bindingxmlrpc.py b/lib/vdsm/rpc/bindingxmlrpc.py
index 9dc6d35..9945dc7 100644
--- a/lib/vdsm/rpc/bindingxmlrpc.py
+++ b/lib/vdsm/rpc/bindingxmlrpc.py
@@ -34,7 +34,7 @@
from vdsm import utils
from vdsm import xmlrpc
from vdsm.define import doneCode, errCode
-from vdsm.netinfo.addresses import getDeviceByIP
+from vdsm.network.netinfo.addresses import getDeviceByIP
import API
from vdsm.exception import VdsmException
diff --git a/lib/vdsm/tool/dummybr.py b/lib/vdsm/tool/dummybr.py
index c0e75c4..a0f76ed 100644
--- a/lib/vdsm/tool/dummybr.py
+++ b/lib/vdsm/tool/dummybr.py
@@ -22,7 +22,7 @@
from __future__ import absolute_import
import os
-from ..netinfo import DUMMY_BRIDGE
+from vdsm.network.netinfo import DUMMY_BRIDGE
from .. import libvirtconnection, commands, constants
from . import expose, ExtraArgsError
diff --git a/lib/vdsm/tool/dump_bonding_opts.py
b/lib/vdsm/tool/dump_bonding_opts.py
index 1993425..e80d721 100644
--- a/lib/vdsm/tool/dump_bonding_opts.py
+++ b/lib/vdsm/tool/dump_bonding_opts.py
@@ -23,9 +23,9 @@
from contextlib import contextmanager
from functools import partial
-from ..netinfo.bonding import (BONDING_MASTERS, BONDING_OPT,
- BONDING_DEFAULTS, BONDING_NAME2NUMERIC_PATH,
- bond_opts_name2numeric_filtered, bondOpts)
+from vdsm.network.netinfo.bonding import (
+ BONDING_MASTERS, BONDING_OPT, BONDING_DEFAULTS, BONDING_NAME2NUMERIC_PATH,
+ bond_opts_name2numeric_filtered, bondOpts)
from ..utils import random_iface_name
from . import expose, ExtraArgsError
diff --git a/lib/vdsm/tool/unified_persistence.py
b/lib/vdsm/tool/unified_persistence.py
index 16d979b..00f643f 100644
--- a/lib/vdsm/tool/unified_persistence.py
+++ b/lib/vdsm/tool/unified_persistence.py
@@ -23,8 +23,8 @@
from .. import utils
from ..config import config
from vdsm.network.netconfpersistence import RunningConfig
-from ..netinfo.cache import CachingNetInfo
-from ..netinfo import misc, routes
+from vdsm.network.netinfo.cache import CachingNetInfo
+from vdsm.network.netinfo import misc, routes
from . import expose
from .upgrade import apply_upgrade
diff --git a/lib/vdsm/virt/sampling.py b/lib/vdsm/virt/sampling.py
index 5801099..d28b0ea 100644
--- a/lib/vdsm/virt/sampling.py
+++ b/lib/vdsm/virt/sampling.py
@@ -34,7 +34,7 @@
from vdsm.constants import P_VDSM_RUN, P_VDSM_CLIENT_LOG
from vdsm import ipwrapper
from vdsm import numa
-from vdsm.netinfo import nics, bonding, vlans
+from vdsm.network.netinfo import nics, bonding, vlans
from vdsm.virt.utils import ExpiringCache
from vdsm import utils
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 7db1ecb..abe0c72 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -35,12 +35,13 @@
getLinks, routeShowTable, linkDel, linkSet,
addrAdd)
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
-from vdsm.netinfo.mtus import DEFAULT_MTU
-from vdsm.netinfo.nics import operstate, OPERSTATE_UNKNOWN, OPERSTATE_UP
-from vdsm.netinfo.routes import getRouteDeviceTo
+from vdsm.network.netinfo.bonding import BONDING_SLAVES, BONDING_MASTERS
+from vdsm.network.netinfo.bridges import bridges
+from vdsm.network.netinfo.misc import NET_CONF_PREF
+from vdsm.network.netinfo.mtus import DEFAULT_MTU
+from vdsm.network.netinfo.nics import (operstate, OPERSTATE_UNKNOWN,
+ OPERSTATE_UP)
+from vdsm.network.netinfo.routes import getRouteDeviceTo
from vdsm.netlink import monitor
from vdsm.network.configurators.ifcfg import (Ifcfg, stop_devices,
NET_CONF_BACK_DIR)
@@ -207,7 +208,7 @@
""":param config: vdsm configuration, could be retrieved from getProxy()
"""
bare_kernel_config = kernelconfig.KernelConfig(
- vdsm.netinfo.cache.CachingNetInfo())
+ vdsm.network.netinfo.cache.CachingNetInfo())
normalized_running_config = kernelconfig.normalize(bare_running_config)
# Unify strings to unicode instances so differences are easier to
# understand. This won't be needed once we move to Python 3.
@@ -2184,9 +2185,10 @@
client, family, dir, dateFormat)
try:
with running(dhclient_runner):
- ipaddrs = vdsm.netinfo.addresses.getIpAddrs()
+ _netinfo = vdsm.network.netinfo
+ ipaddrs = _netinfo.addresses.getIpAddrs()
is_dhcpv4, is_dhcpv6 = (
- vdsm.netinfo.dhcp.dhcp_status(client, ipaddrs))
+ _netinfo.dhcp.dhcp_status(client, ipaddrs))
except dhcp.ProcessCannotBeKilled:
raise SkipTest('dhclient could not be killed')
diff --git a/tests/functional/utils.py b/tests/functional/utils.py
index 99c353e..9db8ae3 100644
--- a/tests/functional/utils.py
+++ b/tests/functional/utils.py
@@ -28,7 +28,7 @@
from vdsm import ipwrapper
from vdsm import vdscli
from vdsm import jsonrpcvdscli
-from vdsm.netinfo.cache import CachingNetInfo
+from vdsm.network.netinfo.cache import CachingNetInfo
from vdsm import supervdsm
from vdsm.network.netconfpersistence import RunningConfig
diff --git a/tests/network/config_network_test.py
b/tests/network/config_network_test.py
index f1e62d3..55a3818 100644
--- a/tests/network/config_network_test.py
+++ b/tests/network/config_network_test.py
@@ -24,9 +24,9 @@
from nose.plugins.attrib import attr
-from vdsm import netinfo
-from vdsm.netinfo import mtus
-from vdsm.netinfo.mtus import DEFAULT_MTU
+from vdsm.network import netinfo
+from vdsm.network.netinfo import mtus
+from vdsm.network.netinfo.mtus import DEFAULT_MTU
from testlib import VdsmTestCase as TestCaseBase
from monkeypatch import MonkeyPatch
diff --git a/tests/network/models_test.py b/tests/network/models_test.py
index 61e182d..e6991bc 100644
--- a/tests/network/models_test.py
+++ b/tests/network/models_test.py
@@ -24,8 +24,8 @@
from nose.plugins.attrib import attr
-from vdsm.netinfo import bonding, mtus
-from vdsm.netinfo.cache import CachingNetInfo
+from vdsm.network.netinfo import bonding, mtus
+from vdsm.network.netinfo.cache import CachingNetInfo
from vdsm.network import errors
from vdsm.network.models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
from vdsm.network.models import hierarchy_backing_device, hierarchy_vlan_tag
diff --git a/tests/network/netinfo_test.py b/tests/network/netinfo_test.py
index 131d77c..f4986f1 100644
--- a/tests/network/netinfo_test.py
+++ b/tests/network/netinfo_test.py
@@ -26,9 +26,9 @@
from nose.plugins.attrib import attr
from vdsm import ipwrapper
-from vdsm import netinfo
-from vdsm.netinfo import addresses, bonding, dns, misc, nics, routes
-from vdsm.netinfo.cache import get
+from vdsm.network import netinfo
+from vdsm.network.netinfo import addresses, bonding, dns, misc, nics, routes
+from vdsm.network.netinfo.cache import get
from vdsm.netlink import addr as nl_addr
from vdsm.utils import random_iface_name
from vdsm import sysctl
diff --git a/tests/network/qos_test.py b/tests/network/qos_test.py
index 4ecd13c..a4ecc95 100644
--- a/tests/network/qos_test.py
+++ b/tests/network/qos_test.py
@@ -22,7 +22,7 @@
from testlib import VdsmTestCase as TestCaseBase
-from vdsm.netinfo import qos
+from vdsm.network.netinfo import qos
from vdsm.tc import cls
diff --git a/tests/network/tc_test.py b/tests/network/tc_test.py
index dee2484..dd300e5 100644
--- a/tests/network/tc_test.py
+++ b/tests/network/tc_test.py
@@ -42,7 +42,7 @@
requires_tc, requires_tun, veth_pair, vlan_device)
from vdsm.constants import EXT_TC
from vdsm.network.configurators import qos
-from vdsm.netinfo.qos import DEFAULT_CLASSID
+from vdsm.network.netinfo.qos import DEFAULT_CLASSID
from vdsm.ipwrapper import addrAdd, linkSet, netns_exec, link_set_netns
from vdsm import libvirtconnection
from vdsm.utils import running
diff --git a/tests/network/unified_persistence_test.py
b/tests/network/unified_persistence_test.py
index 878e16d..eebff02 100644
--- a/tests/network/unified_persistence_test.py
+++ b/tests/network/unified_persistence_test.py
@@ -26,7 +26,7 @@
from nose.plugins.attrib import attr
-from vdsm.netinfo import misc
+from vdsm.network.netinfo import misc
from vdsm.tool import unified_persistence
from monkeypatch import MonkeyPatchScope
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7d7e11f..e36d9a6 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1081,11 +1081,11 @@
%dir %{python_sitelib}/%{vdsm_name}
%dir %{python_sitelib}/%{vdsm_name}/common
%dir %{python_sitelib}/%{vdsm_name}/common/network
-%dir %{python_sitelib}/%{vdsm_name}/netinfo
%dir %{python_sitelib}/%{vdsm_name}/netlink
%dir %{python_sitelib}/%{vdsm_name}/network
%dir %{python_sitelib}/%{vdsm_name}/network/configurators
%dir %{python_sitelib}/%{vdsm_name}/network/ip
+%dir %{python_sitelib}/%{vdsm_name}/network/netinfo
%dir %{python_sitelib}/%{vdsm_name}/network/ovs
%dir %{python_sitelib}/%{vdsm_name}/tool
%dir %{python_sitelib}/%{vdsm_name}/tool/configurators
@@ -1123,19 +1123,6 @@
%{python_sitelib}/%{vdsm_name}/m2cutils.py*
%{python_sitelib}/%{vdsm_name}/machinetype.py*
%{python_sitelib}/%{vdsm_name}/momIF.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/__init__.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/addresses.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/bonding.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/bridges.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/cache.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/dhcp.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/dns.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/misc.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/mtus.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/nics.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/qos.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/routes.py*
-%{python_sitelib}/%{vdsm_name}/netinfo/vlans.py*
%{python_sitelib}/%{vdsm_name}/netlink/__init__.py*
%{python_sitelib}/%{vdsm_name}/netlink/addr.py*
%{python_sitelib}/%{vdsm_name}/netlink/link.py*
@@ -1155,6 +1142,7 @@
%{python_sitelib}/%{vdsm_name}/network/connectivity.py*
%{python_sitelib}/%{vdsm_name}/network/ip/*.py*
%{python_sitelib}/%{vdsm_name}/network/legacy_switch.py*
+%{python_sitelib}/%{vdsm_name}/network/netinfo/*.py*
%{python_sitelib}/%{vdsm_name}/network/ovs/__init__.py*
%{python_sitelib}/%{vdsm_name}/network/ovs/switch.py*
%{python_sitelib}/%{vdsm_name}/network/ovs/validator.py*
diff --git a/vdsm/caps.py b/vdsm/caps.py
index 66eb245..9162659 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -27,7 +27,7 @@
import libvirt
from vdsm.config import config
-from vdsm.netinfo import cache as netinfo_cache
+from vdsm.network.netinfo import cache as netinfo_cache
from vdsm import cpuarch
from vdsm import cpuinfo
from vdsm import dsaversion
diff --git a/vdsm/gluster/cli.py b/vdsm/gluster/cli.py
index c300fea..ce3320f 100644
--- a/vdsm/gluster/cli.py
+++ b/vdsm/gluster/cli.py
@@ -27,7 +27,7 @@
from vdsm import commands
from vdsm import utils
-from vdsm.netinfo import addresses
+from vdsm.network.netinfo import addresses
import exception as ge
from . import gluster_mgmt_api, gluster_api
diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py
index 0c4276a..a64065a 100644
--- a/vdsm/storage/iscsi.py
+++ b/vdsm/storage/iscsi.py
@@ -33,7 +33,7 @@
from vdsm import supervdsm
from vdsm.password import ProtectedPassword
from vdsm.config import config
-from vdsm.netinfo.routes import getRouteDeviceTo
+from vdsm.network.netinfo.routes import getRouteDeviceTo
import devicemapper
from threading import RLock
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 9ad4bec..ba8a039 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -32,9 +32,9 @@
from vdsm.config import config
from vdsm import ipwrapper
from vdsm import hostdev
-from vdsm.netinfo import nics, misc
-from vdsm.netinfo.misc import ipv6_supported
-from vdsm.netinfo.cache import CachingNetInfo
+from vdsm.network.netinfo import nics, misc
+from vdsm.network.netinfo.misc import ipv6_supported
+from vdsm.network.netinfo.cache import CachingNetInfo
from vdsm import kernelconfig
from vdsm.constants import P_VDSM_RUN
from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig, \
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 6140baa..01b1390 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -52,7 +52,7 @@
from vdsm.config import config
from vdsm.define import ERROR, NORMAL, doneCode, errCode
from vdsm.logUtils import SimpleLogAdapter
-from vdsm.netinfo import DUMMY_BRIDGE
+from vdsm.network.netinfo import DUMMY_BRIDGE
from vdsm.storage import fileUtils
from vdsm.virt import guestagent
from vdsm.virt import sampling
diff --git a/vdsm/virt/vmdevices/graphics.py b/vdsm/virt/vmdevices/graphics.py
index 935ceca..dde29ea 100644
--- a/vdsm/virt/vmdevices/graphics.py
+++ b/vdsm/virt/vmdevices/graphics.py
@@ -22,7 +22,7 @@
import libvirt
-from vdsm import netinfo
+from vdsm.network import netinfo
from vdsm import utils
from vdsm.config import config
diff --git a/vdsm/virt/vmdevices/network.py b/vdsm/virt/vmdevices/network.py
index 78e4c32..7d27efa 100644
--- a/vdsm/virt/vmdevices/network.py
+++ b/vdsm/virt/vmdevices/network.py
@@ -23,7 +23,7 @@
from vdsm import utils
from vdsm.hostdev import get_device_params, detach_detachable
-from vdsm.netinfo import DUMMY_BRIDGE, LIBVIRT_NET_PREFIX
+from vdsm.network.netinfo import DUMMY_BRIDGE, LIBVIRT_NET_PREFIX
from .core import Base
from . import hwclass
diff --git a/vdsm_hooks/ethtool_options/ethtool_options.py
b/vdsm_hooks/ethtool_options/ethtool_options.py
index d3c2fe3..66bc5b3 100644
--- a/vdsm_hooks/ethtool_options/ethtool_options.py
+++ b/vdsm_hooks/ethtool_options/ethtool_options.py
@@ -23,7 +23,7 @@
import hooking
import traceback
-from vdsm import netinfo
+from vdsm.network import netinfo
from vdsm.utils import CommandPath
ETHTOOL_BINARY = CommandPath(
diff --git a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
index 07f562b..ce6eb84 100644
--- a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
+++ b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
@@ -23,7 +23,7 @@
import traceback
from vdsm import ipwrapper
-from vdsm import netinfo
+from vdsm.network import netinfo
from vdsm import utils
diff --git a/vdsm_hooks/openstacknet/openstacknet_utils.py
b/vdsm_hooks/openstacknet/openstacknet_utils.py
index 11623e7..a77437d 100644
--- a/vdsm_hooks/openstacknet/openstacknet_utils.py
+++ b/vdsm_hooks/openstacknet/openstacknet_utils.py
@@ -3,7 +3,7 @@
from __future__ import print_function
import hooking
import subprocess
-from vdsm.netinfo import DUMMY_BRIDGE
+from vdsm.network.netinfo import DUMMY_BRIDGE
from vdsm.utils import CommandPath
# Constants for hook's API
diff --git a/vdsm_hooks/ovs/ovs_after_get_caps.py
b/vdsm_hooks/ovs/ovs_after_get_caps.py
index f40cbe1..9d89431 100755
--- a/vdsm_hooks/ovs/ovs_after_get_caps.py
+++ b/vdsm_hooks/ovs/ovs_after_get_caps.py
@@ -22,8 +22,9 @@
import traceback
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
+from vdsm.network.netinfo import (dhcp, routes as netinfo_routes, addresses,
+ mtus)
+from vdsm.network.netinfo.bonding import parse_bond_options
from hooking import execCmd
import hooking
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
b/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
index c5f951c..0c5e1b8 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
@@ -19,7 +19,8 @@
#
import six
-from vdsm import ipwrapper, netinfo
+from vdsm import ipwrapper
+from vdsm.network import netinfo
from ovs_utils import iter_ovs_nets, iter_ovs_bonds
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
index 4e023ba..f5e6f18 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
@@ -22,8 +22,8 @@
import six
from vdsm.compat import suppress
-from vdsm.netinfo.cache import CachingNetInfo
-from vdsm.netinfo.bonding import parse_bond_options
+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
diff --git a/vdsm_hooks/ovs/ovs_utils.py b/vdsm_hooks/ovs/ovs_utils.py
index ecde569..808d793 100644
--- a/vdsm_hooks/ovs/ovs_utils.py
+++ b/vdsm_hooks/ovs/ovs_utils.py
@@ -22,7 +22,7 @@
from hooking import execCmd
import hooking
-from vdsm.netinfo.bonding import parse_bond_options
+from vdsm.network.netinfo.bonding import parse_bond_options
from vdsm.utils import CommandPath, rget
EXT_IP = CommandPath('ip', '/sbin/ip').cmd
--
To view, visit https://gerrit.ovirt.org/56713
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia02e5f79e093067789659e414b595aa4e3d5a62e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwa...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
