Edward Haas has uploaded a new change for review. Change subject: net: Move netlink under vdsm.network ......................................................................
net: Move netlink under vdsm.network Change-Id: I97559234dc5595fe90d5258c31450858560246ce Signed-off-by: Edward Haas <[email protected]> --- M configure.ac M init/wait_for_ipv4s M lib/vdsm/Makefile.am M lib/vdsm/ipwrapper.py M lib/vdsm/network/Makefile.am M lib/vdsm/network/configurators/__init__.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/netinfo/addresses.py M lib/vdsm/network/netinfo/cache.py M lib/vdsm/network/netinfo/routes.py M lib/vdsm/network/netinfo/vlans.py R lib/vdsm/network/netlink/Makefile.am R lib/vdsm/network/netlink/__init__.py R lib/vdsm/network/netlink/addr.py R lib/vdsm/network/netlink/link.py R lib/vdsm/network/netlink/monitor.py R lib/vdsm/network/netlink/route.py M tests/functional/networkTests.py M tests/network/ipwrapper_test.py M tests/network/link_test.py M tests/network/netinfo_test.py M tests/network/nettestlib.py M vdsm.spec.in 23 files changed, 33 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/57170/1 diff --git a/configure.ac b/configure.ac index 5a076c9..c43ab5d 100644 --- a/configure.ac +++ b/configure.ac @@ -382,7 +382,6 @@ lib/vdsm/Makefile lib/vdsm/common/Makefile lib/vdsm/common/network/Makefile - lib/vdsm/netlink/Makefile lib/vdsm/profiling/Makefile lib/vdsm/tool/Makefile lib/vdsm/tool/configurators/Makefile @@ -397,6 +396,7 @@ lib/vdsm/network/configurators/Makefile lib/vdsm/network/ip/Makefile lib/vdsm/network/netinfo/Makefile + lib/vdsm/network/netlink/Makefile lib/vdsm/network/ovs/Makefile lib/vdsm/network/ovs/driver/Makefile lib/vdsm/rpc/Makefile diff --git a/init/wait_for_ipv4s b/init/wait_for_ipv4s index bf75acb..3d04ee8 100755 --- a/init/wait_for_ipv4s +++ b/init/wait_for_ipv4s @@ -10,10 +10,10 @@ from os.path import isfile, join import sys -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 +from vdsm.network.netinfo.addresses import getIpInfo +from vdsm.network.netlink import monitor def _get_vdsm_ip_onboot_devs(): diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 6f38995..7696bd1 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -19,7 +19,7 @@ # include $(top_srcdir)/build-aux/Makefile.subs -SUBDIRS=common netlink tool infra profiling rpc tc network virt storage +SUBDIRS=common tool infra profiling rpc tc network virt storage dist_vdsmpylib_PYTHON = \ __init__.py \ diff --git a/lib/vdsm/ipwrapper.py b/lib/vdsm/ipwrapper.py index 499fa42..d9f52b9 100644 --- a/lib/vdsm/ipwrapper.py +++ b/lib/vdsm/ipwrapper.py @@ -31,11 +31,12 @@ from netaddr import IPAddress from netaddr import IPNetwork +from vdsm.network.netlink import link + from .config import config from .utils import anyFnmatch from .utils import CommandPath from .commands import execCmd -from .netlink import link _IP_BINARY = CommandPath('ip', '/sbin/ip') diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am index ca5deab..e0fc55f 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 netinfo ovs +SUBDIRS = configurators ip netinfo netlink ovs include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/configurators/__init__.py b/lib/vdsm/network/configurators/__init__.py index 8472f2d..6246c1a 100644 --- a/lib/vdsm/network/configurators/__init__.py +++ b/lib/vdsm/network/configurators/__init__.py @@ -23,9 +23,9 @@ from vdsm.config import config from vdsm import ipwrapper -from vdsm.network.netinfo import mtus -from vdsm.netlink import monitor from vdsm.network.netconfpersistence import RunningConfig +from vdsm.network.netinfo import mtus +from vdsm.network.netlink import monitor from .dhclient import DhcpClient from ..errors import ConfigNetworkError, RollbackIncomplete, ERR_FAILED_IFUP diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index baf3d8d..1b7f7d1 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -41,18 +41,19 @@ from vdsm import dsaversion from vdsm import hooks from vdsm import ipwrapper +from vdsm import sysctl +from vdsm import utils + +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, vlans, misc, NET_PATH) from vdsm.network.netinfo.cache import ifaceUsed -from vdsm import sysctl -from vdsm import utils -from vdsm.netlink import monitor -from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig +from vdsm.network.netlink import monitor if utils.isOvirtNode(): from ovirt.node.utils import fs as node_fs -from vdsm.network.ip.address import IPv4, IPv6 from . import Configurator, dhclient, getEthtoolOpts, libvirt from ..errors import ConfigNetworkError, ERR_FAILED_IFUP from ..models import Nic, Bridge diff --git a/lib/vdsm/network/netinfo/addresses.py b/lib/vdsm/network/netinfo/addresses.py index 84880ae..778b730 100644 --- a/lib/vdsm/network/netinfo/addresses.py +++ b/lib/vdsm/network/netinfo/addresses.py @@ -24,7 +24,7 @@ import socket import struct -from vdsm.netlink import addr as nl_addr +from vdsm.network.netlink import addr as nl_addr from vdsm.sysctl import is_ipv6_local_auto as sysctl_is_ipv6_local_auto diff --git a/lib/vdsm/network/netinfo/cache.py b/lib/vdsm/network/netinfo/cache.py index c2799cb..d38482f 100644 --- a/lib/vdsm/network/netinfo/cache.py +++ b/lib/vdsm/network/netinfo/cache.py @@ -26,10 +26,10 @@ import six from vdsm.ipwrapper import getLinks -from vdsm.netlink import link as nl_link -from vdsm.network.netconfpersistence import RunningConfig - from vdsm.network import netinfo +from vdsm.network.netconfpersistence import RunningConfig +from vdsm.network.netlink import link as nl_link + from .addresses import getIpAddrs, getIpInfo, is_ipv6_local_auto from . import bonding from . import bridges diff --git a/lib/vdsm/network/netinfo/routes.py b/lib/vdsm/network/netinfo/routes.py index 85833cd..50091e0 100644 --- a/lib/vdsm/network/netinfo/routes.py +++ b/lib/vdsm/network/netinfo/routes.py @@ -22,7 +22,7 @@ from vdsm.ipwrapper import IPRoute2Error from vdsm.ipwrapper import routeGet, Route, routeShowGateways -from vdsm.netlink import route as nl_route +from vdsm.network.netlink import route as nl_route def getRouteDeviceTo(destinationIP): diff --git a/lib/vdsm/network/netinfo/vlans.py b/lib/vdsm/network/netinfo/vlans.py index 67f52a4..78a5e50 100644 --- a/lib/vdsm/network/netinfo/vlans.py +++ b/lib/vdsm/network/netinfo/vlans.py @@ -23,7 +23,7 @@ from .misc import visible_devs from . import nics from vdsm.ipwrapper import getLink, Link -from vdsm.netlink import link as nl_link +from vdsm.network.netlink import link as nl_link vlans = partial(visible_devs, Link.isVLAN) diff --git a/lib/vdsm/netlink/Makefile.am b/lib/vdsm/network/netlink/Makefile.am similarity index 94% rename from lib/vdsm/netlink/Makefile.am rename to lib/vdsm/network/netlink/Makefile.am index 6d2433e..5cf018a 100644 --- a/lib/vdsm/netlink/Makefile.am +++ b/lib/vdsm/network/netlink/Makefile.am @@ -18,7 +18,7 @@ # include $(top_srcdir)/build-aux/Makefile.subs -vdsmnetlinkdir = $(vdsmpylibdir)/netlink +vdsmnetlinkdir = $(vdsmpylibdir)/network/netlink dist_vdsmnetlink_PYTHON = \ __init__.py \ addr.py \ diff --git a/lib/vdsm/netlink/__init__.py b/lib/vdsm/network/netlink/__init__.py similarity index 100% rename from lib/vdsm/netlink/__init__.py rename to lib/vdsm/network/netlink/__init__.py diff --git a/lib/vdsm/netlink/addr.py b/lib/vdsm/network/netlink/addr.py similarity index 100% rename from lib/vdsm/netlink/addr.py rename to lib/vdsm/network/netlink/addr.py diff --git a/lib/vdsm/netlink/link.py b/lib/vdsm/network/netlink/link.py similarity index 100% rename from lib/vdsm/netlink/link.py rename to lib/vdsm/network/netlink/link.py diff --git a/lib/vdsm/netlink/monitor.py b/lib/vdsm/network/netlink/monitor.py similarity index 100% rename from lib/vdsm/netlink/monitor.py rename to lib/vdsm/network/netlink/monitor.py diff --git a/lib/vdsm/netlink/route.py b/lib/vdsm/network/netlink/route.py similarity index 100% rename from lib/vdsm/netlink/route.py rename to lib/vdsm/network/netlink/route.py diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index abe0c72..3fb9797 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -42,7 +42,7 @@ 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.netlink import monitor from vdsm.network.configurators.ifcfg import (Ifcfg, stop_devices, NET_CONF_BACK_DIR) from vdsm.network import errors diff --git a/tests/network/ipwrapper_test.py b/tests/network/ipwrapper_test.py index 32d1a93..c44fc20 100644 --- a/tests/network/ipwrapper_test.py +++ b/tests/network/ipwrapper_test.py @@ -27,7 +27,7 @@ from vdsm import ipwrapper from vdsm.ipwrapper import Route from vdsm.ipwrapper import Rule -from vdsm.netlink import monitor +from vdsm.network.netlink import monitor from .nettestlib import Bridge, requires_brctl from testlib import VdsmTestCase as TestCaseBase diff --git a/tests/network/link_test.py b/tests/network/link_test.py index 6336c35..d2b61e8 100644 --- a/tests/network/link_test.py +++ b/tests/network/link_test.py @@ -25,7 +25,7 @@ from functional.networkTests import IP_ADDRESS, IP_CIDR from .nettestlib import Dummy -from vdsm.netlink import monitor +from vdsm.network.netlink import monitor from vdsm.sysctl import is_disabled_ipv6 from vdsm.utils import monotonic_time diff --git a/tests/network/netinfo_test.py b/tests/network/netinfo_test.py index cffb056..455f8bf 100644 --- a/tests/network/netinfo_test.py +++ b/tests/network/netinfo_test.py @@ -29,7 +29,7 @@ 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.network.netlink import addr as nl_addr from vdsm.utils import random_iface_name from vdsm import sysctl diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index 2839dfe..1c49ff4 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -35,7 +35,7 @@ from vdsm import cpuarch from vdsm.ipwrapper import (addrAdd, linkSet, linkAdd, linkDel, IPRoute2Error, netns_add, netns_delete, netns_exec) -from vdsm.netlink import monitor +from vdsm.network.netlink import monitor from vdsm.commands import execCmd from vdsm.utils import CommandPath, random_iface_name diff --git a/vdsm.spec.in b/vdsm.spec.in index 21a82b8..41a4365 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1130,11 +1130,11 @@ %dir %{python_sitelib}/%{vdsm_name} %dir %{python_sitelib}/%{vdsm_name}/common %dir %{python_sitelib}/%{vdsm_name}/common/network -%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/netlink %dir %{python_sitelib}/%{vdsm_name}/network/ovs %dir %{python_sitelib}/%{vdsm_name}/network/ovs/driver %dir %{python_sitelib}/%{vdsm_name}/tool @@ -1173,11 +1173,6 @@ %{python_sitelib}/%{vdsm_name}/m2cutils.py* %{python_sitelib}/%{vdsm_name}/machinetype.py* %{python_sitelib}/%{vdsm_name}/momIF.py* -%{python_sitelib}/%{vdsm_name}/netlink/__init__.py* -%{python_sitelib}/%{vdsm_name}/netlink/addr.py* -%{python_sitelib}/%{vdsm_name}/netlink/link.py* -%{python_sitelib}/%{vdsm_name}/netlink/monitor.py* -%{python_sitelib}/%{vdsm_name}/netlink/route.py* %{python_sitelib}/%{vdsm_name}/network/__init__.py* %{python_sitelib}/%{vdsm_name}/network/api.py* %{python_sitelib}/%{vdsm_name}/network/configurators/__init__.py* @@ -1193,6 +1188,11 @@ %{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/netlink/__init__.py* +%{python_sitelib}/%{vdsm_name}/network/netlink/addr.py* +%{python_sitelib}/%{vdsm_name}/network/netlink/link.py* +%{python_sitelib}/%{vdsm_name}/network/netlink/monitor.py* +%{python_sitelib}/%{vdsm_name}/network/netlink/route.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* -- To view, visit https://gerrit.ovirt.org/57170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97559234dc5595fe90d5258c31450858560246ce 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
