Change in vdsm[master]: Added network directory
amuller at redhat.com
amuller at redhat.com
Tue Dec 24 10:27:56 UTC 2013
Assaf Muller has uploaded a new change for review.
Change subject: Added network directory
......................................................................
Added network directory
To-Do in a follow up patch:
Added a network directory under lib/vdsm, put ipwrapper,
netinfo and netconfpersistence there.
Change-Id: If9c7e8cfc96cc1671ed7549c2f45ca820211c7c1
Signed-off-by: Assaf Muller <amuller at redhat.com>
---
M AUTHORS
M Makefile.am
M configure.ac
M debian/vdsm.install
M lib/vdsm/tool/upgrade_300_networks.py
M tests/configNetworkTests.py
M tests/functional/networkTests.py
M tests/netconfTests.py
M tests/netmodelsTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
C vdsm/network/Makefile.am
C vdsm/network/__init__.py
R vdsm/network/addNetwork
R vdsm/network/configNetwork.py
R vdsm/network/delNetwork
R vdsm/network/netconf/Makefile.am
R vdsm/network/netconf/__init__.py
R vdsm/network/netconf/ifcfg.py
R vdsm/network/netconf/iproute2.py
R vdsm/network/netconf/libvirtCfg.py
R vdsm/network/neterrors.py
R vdsm/network/netmodels.py
R vdsm/network/sourceRoute.py
R vdsm/network/sourceRoute.sh
R vdsm/network/sourceRouteThread.py
R vdsm/network/vdsm-restore-net-config
R vdsm/network/vdsm-store-net-config.in
M vdsm/supervdsmServer
30 files changed, 94 insertions(+), 114 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/22694/1
diff --git a/AUTHORS b/AUTHORS
index 1faf4eb..e99f023 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@
Adam Litke <agl at us.ibm.com>
Igor Lvovsky <ilvovsky at redhat.com>
Sanjay Mehrotra <smehrotr at redhat.com>
+ Assaf Muller <amuller at redhat.com>
Robert Munilla <rmunilla at redhat.com>
David Naori <dnaori at redhat.com>
Yotam Oron <yoron at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 9b1a3c9..12f939c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,8 @@
vdsm-tool \
vdsm/*.py \
vdsm/*.py.in \
- vdsm/netconf \
+ vdsm/network \
+ vdsm/network/netconf \
vdsm/sos/vdsm.py.in \
vdsm/storage \
vdsm/vdsm \
diff --git a/configure.ac b/configure.ac
index bd44d83..f552b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,7 +269,8 @@
vdsm-tool/Makefile
vdsm/Makefile
vdsm/gluster/Makefile
- vdsm/netconf/Makefile
+ vdsm/network/Makefile
+ vdsm/network/netconf/Makefile
vdsm/sos/Makefile
vdsm/storage/Makefile
vdsm/storage/imageRepository/Makefile
diff --git a/debian/vdsm.install b/debian/vdsm.install
index c81bdf2..efd4a88 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -42,7 +42,6 @@
./usr/share/vdsm/blkid.py
./usr/share/vdsm/caps.py
./usr/share/vdsm/clientIF.py
-./usr/share/vdsm/configNetwork.py
./usr/share/vdsm/daemonAdapter
./usr/share/vdsm/debugPluginClient.py
./usr/share/vdsm/delNetwork
@@ -65,19 +64,21 @@
./usr/share/vdsm/mk_sysprep_floppy
./usr/share/vdsm/mkimage.py
./usr/share/vdsm/momIF.py
-./usr/share/vdsm/netconf/__init__.py
-./usr/share/vdsm/netconf/ifcfg.py
-./usr/share/vdsm/netconf/iproute2.py
-./usr/share/vdsm/netconf/libvirtCfg.py
-./usr/share/vdsm/neterrors.py
-./usr/share/vdsm/netmodels.py
+./usr/share/vdsm/network/netconf/__init__.py
+./usr/share/vdsm/network/netconf/ifcfg.py
+./usr/share/vdsm/network/netconf/iproute2.py
+./usr/share/vdsm/network/netconf/libvirtCfg.py
+./usr/share/vdsm/network/__init__.py
+./usr/share/vdsm/network/configNetwork.py
+./usr/share/vdsm/network/neterrors.py
+./usr/share/vdsm/network/netmodels.py
+./usr/share/vdsm/network/sourceRoute.py
+./usr/share/vdsm/network/sourceRouteThread.py
./usr/share/vdsm/parted_utils.py
./usr/share/vdsm/ppc64HardwareInfo.py
./usr/share/vdsm/respawn
./usr/share/vdsm/sampling.py
./usr/share/vdsm/set-conf-item
-./usr/share/vdsm/sourceRoute.py
-./usr/share/vdsm/sourceRouteThread.py
./usr/share/vdsm/storage/__init__.py
./usr/share/vdsm/storage/blockSD.py
./usr/share/vdsm/storage/blockVolume.py
diff --git a/lib/vdsm/tool/upgrade_300_networks.py b/lib/vdsm/tool/upgrade_300_networks.py
index 0f754fd..7f1eb66 100644
--- a/lib/vdsm/tool/upgrade_300_networks.py
+++ b/lib/vdsm/tool/upgrade_300_networks.py
@@ -27,7 +27,7 @@
from vdsm.tool.upgrade import upgrade
sys.path.append("/usr/share/vdsm")
-from netconf import ifcfg
+from network.netconf import ifcfg
def isNeeded(networks, bridges):
diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py
index a72fe96..1b717a9 100644
--- a/tests/configNetworkTests.py
+++ b/tests/configNetworkTests.py
@@ -20,14 +20,9 @@
# Refer to the README and COPYING files for full details of the license
#
-from netmodels import Bond
-from netmodels import Bridge
-from netmodels import Nic
-from netmodels import Vlan
+from network.netmodels import Bond, Bridge, Nic, Vlan
+from network import configNetwork, netconf, neterrors
from vdsm import netinfo
-import configNetwork
-import netconf
-import neterrors
from testrunner import VdsmTestCase as TestCaseBase
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 6ecced8..dbada07 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -20,7 +20,6 @@
from functools import wraps
import os.path
-import neterrors
from storage.misc import RollbackContext
from hookValidation import ValidatesHook
@@ -32,6 +31,7 @@
import dnsmasq
import dummy
import firewall
+from network import neterrors
import veth
from nose.plugins.skip import SkipTest
from utils import SUCCESS, VdsProxy, cleanupRules
diff --git a/tests/netconfTests.py b/tests/netconfTests.py
index 919a5eb..00d012e 100644
--- a/tests/netconfTests.py
+++ b/tests/netconfTests.py
@@ -20,6 +20,7 @@
# Refer to the README and COPYING files for full details of the license
#
+from nose.plugins.skip import SkipTest
import os
import pwd
import re
@@ -29,12 +30,10 @@
from xml.dom.minidom import parseString
from vdsm import netinfo
-from netconf import ifcfg
-from netconf import libvirtCfg
+from network.netconf import ifcfg, libvirtCfg
from monkeypatch import MonkeyPatch
from monkeypatch import MonkeyPatchScope
-from nose.plugins.skip import SkipTest
from testrunner import VdsmTestCase as TestCaseBase
diff --git a/tests/netmodelsTests.py b/tests/netmodelsTests.py
index 6181a9e..be07a02 100644
--- a/tests/netmodelsTests.py
+++ b/tests/netmodelsTests.py
@@ -21,19 +21,13 @@
#
import os
-from netmodels import Bond
-from netmodels import Bridge
-from netmodels import IPv4
-from netmodels import Nic
-from netmodels import Vlan
-from netmodels import _nicSort
-from vdsm import netinfo
-import neterrors
-
-from testrunner import VdsmTestCase as TestCaseBase
-from testValidation import ValidateRunningAsRoot
from nose.plugins.skip import SkipTest
+from network.netmodels import Bond, Bridge, IPv4, Vlan, Nic, _nicSort
+from vdsm import netinfo
+from network import neterrors
+from testrunner import VdsmTestCase as TestCaseBase
+from testValidation import ValidateRunningAsRoot
from monkeypatch import MonkeyPatch
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 0f7f4d4..425cb3d 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -861,7 +861,8 @@
%dir %{_sysconfdir}/%{vdsm_name}
%dir %{_sysconfdir}/%{vdsm_name}/mom.d
%dir %{_datadir}/%{vdsm_name}
-%dir %{_datadir}/%{vdsm_name}/netconf
+%dir %{_datadir}/%{vdsm_name}/network
+%dir %{_datadir}/%{vdsm_name}/network/netconf
%dir %{_datadir}/%{vdsm_name}/storage
%dir %{_datadir}/%{vdsm_name}/storage/imageRepository
%{_datadir}/%{vdsm_name}/alignmentScan.py*
@@ -879,8 +880,8 @@
%{_datadir}/%{vdsm_name}/parted_utils.py*
%{_datadir}/%{vdsm_name}/mkimage.py*
%{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py*
-%{_datadir}/%{vdsm_name}/sourceRoute.py*
-%{_datadir}/%{vdsm_name}/sourceRouteThread.py*
+%{_datadir}/%{vdsm_name}/network/sourceRoute.py*
+%{_datadir}/%{vdsm_name}/network/sourceRouteThread.py*
%{_datadir}/%{vdsm_name}/supervdsm.py*
%{_datadir}/%{vdsm_name}/supervdsmServer
%{_datadir}/%{vdsm_name}/vmChannels.py*
@@ -1013,19 +1014,20 @@
%dir %{_libexecdir}/%{vdsm_name}/hooks/before_network_setup
%dir %{_libexecdir}/%{vdsm_name}/hooks/after_network_setup
%{_datadir}/%{vdsm_name}/addNetwork
-%{_datadir}/%{vdsm_name}/configNetwork.py*
%{_datadir}/%{vdsm_name}/delNetwork
+%{_datadir}/%{vdsm_name}/network/__init__.py*
+%{_datadir}/%{vdsm_name}/network/configNetwork.py*
+%{_datadir}/%{vdsm_name}/network/netconf/__init__.py*
+%{_datadir}/%{vdsm_name}/network/netconf/ifcfg.py*
+%{_datadir}/%{vdsm_name}/network/netconf/libvirtCfg.py*
+%{_datadir}/%{vdsm_name}/network/netconf/iproute2.py*
+%{_datadir}/%{vdsm_name}/network/neterrors.py*
+%{_datadir}/%{vdsm_name}/network/netmodels.py*
%{_datadir}/%{vdsm_name}/dumpStorageTable.py*
%{_datadir}/%{vdsm_name}/get-conf-item
%{_datadir}/%{vdsm_name}/kaxmlrpclib.py*
%{_datadir}/%{vdsm_name}/ksm.py*
%{_datadir}/%{vdsm_name}/momIF.py*
-%{_datadir}/%{vdsm_name}/netconf/__init__.py*
-%{_datadir}/%{vdsm_name}/netconf/ifcfg.py*
-%{_datadir}/%{vdsm_name}/netconf/libvirtCfg.py*
-%{_datadir}/%{vdsm_name}/netconf/iproute2.py*
-%{_datadir}/%{vdsm_name}/neterrors.py*
-%{_datadir}/%{vdsm_name}/netmodels.py*
%{_datadir}/%{vdsm_name}/respawn
%{_datadir}/%{vdsm_name}/sampling.py*
%{_datadir}/%{vdsm_name}/set-conf-item
diff --git a/vdsm/API.py b/vdsm/API.py
index e7a550c..80194c0 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -30,12 +30,11 @@
import threading
import logging
+from network import configNetwork
+from network.netconf import RollbackIncomplete
from vdsm import utils
from clientIF import clientIF
-import configNetwork
-from netmodels import Bond
-from netmodels import Vlan
-from netconf import RollbackIncomplete
+from network.netmodels import Bond, Vlan
from vdsm import netinfo
from vdsm import constants
import storage.misc
@@ -48,7 +47,6 @@
import caps
from vdsm.config import config
import ksm
-
import supervdsm
haClient = None # Define here to work around pyflakes issue #13
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4bcc6ed..6a13bd9 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -18,7 +18,7 @@
# Refer to the README and COPYING files for full details of the license
#
-SUBDIRS = netconf sos storage gluster
+SUBDIRS = gluster network sos storage
include $(top_srcdir)/build-aux/Makefile.subs
@@ -29,7 +29,6 @@
blkid.py \
caps.py \
clientIF.py \
- configNetwork.py \
debugPluginClient.py \
dmidecodeUtil.py \
guestIF.py \
@@ -42,13 +41,9 @@
md_utils.py \
mkimage.py \
momIF.py \
- neterrors.py \
- netmodels.py \
parted_utils.py \
ppc64HardwareInfo.py \
sampling.py \
- sourceRoute.py \
- sourceRouteThread.py \
supervdsm.py \
tc.py \
vdsmDebugPlugin.py \
@@ -68,8 +63,7 @@
dumpStorageTable.py
nodist_vdsm_SCRIPTS = \
- mk_sysprep_floppy \
- vdsm-store-net-config
+ mk_sysprep_floppy
nodist_noinst_DATA = \
logger.conf \
@@ -82,13 +76,10 @@
$(NULL)
dist_vdsm_SCRIPTS = \
- addNetwork \
- delNetwork \
get-conf-item \
set-conf-item \
supervdsmServer \
vdsm \
- vdsm-restore-net-config \
$(NULL)
nodist_man8_MANS = \
@@ -115,7 +106,6 @@
mom.d/01-parameters.policy \
mom.d/02-balloon.policy \
mom.d/03-ksm.policy \
- sourceRoute.sh \
sudoers.vdsm.in \
svdsm.logger.conf.in \
upgrade.logger.conf.in \
@@ -126,7 +116,6 @@
vdsm-logrotate \
vdsm-logrotate.conf.in \
vdsm-modules-load.d.conf \
- vdsm-store-net-config.in \
vdsm-sysctl.conf \
vdsm.rwtab.in \
vdsmd.8.in \
@@ -253,7 +242,7 @@
install-data-dhclient-hooks:
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/dhcp/dhclient.d
- $(INSTALL_DATA) sourceRoute.sh \
+ $(INSTALL_DATA) network/sourceRoute.sh \
$(DESTDIR)$(sysconfdir)/dhcp/dhclient.d/sourceRoute.sh
chmod 755 $(DESTDIR)$(sysconfdir)/dhcp/dhclient.d/sourceRoute.sh
diff --git a/vdsm/netconf/Makefile.am b/vdsm/network/Makefile.am
similarity index 68%
copy from vdsm/netconf/Makefile.am
copy to vdsm/network/Makefile.am
index 71ee11c..02d4fb0 100644
--- a/vdsm/netconf/Makefile.am
+++ b/vdsm/network/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright 20013 Red Hat, Inc.
+#
+# Copyright 2013 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,13 +18,27 @@
# Refer to the README and COPYING files for full details of the license
#
+SUBDIRS = netconf
+
include $(top_srcdir)/build-aux/Makefile.subs
-vdsmnetconfdir = $(vdsmdir)/netconf
-
-dist_vdsmnetconf_PYTHON = \
+vdsmnetworkdir = $(vdsmdir)/network
+dist_vdsmnetwork_PYTHON = \
__init__.py \
- ifcfg.py \
- iproute2.py \
- libvirtCfg.py \
- $(NULL)
+ configNetwork.py \
+ neterrors.py \
+ netmodels.py \
+ sourceRoute.py \
+ sourceRouteThread.py
+
+nodist_vdsm_SCRIPTS = \
+ vdsm-store-net-config
+
+dist_vdsm_SCRIPTS = \
+ addNetwork \
+ delNetwork \
+ vdsm-restore-net-config
+
+EXTRA_DIST = \
+ vdsm-store-net-config.in \
+ sourceRoute.sh
diff --git a/vdsm/netconf/Makefile.am b/vdsm/network/__init__.py
similarity index 77%
copy from vdsm/netconf/Makefile.am
copy to vdsm/network/__init__.py
index 71ee11c..8e88115 100644
--- a/vdsm/netconf/Makefile.am
+++ b/vdsm/network/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 20013 Red Hat, Inc.
+# Copyright 2013 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,14 +16,3 @@
#
# Refer to the README and COPYING files for full details of the license
#
-
-include $(top_srcdir)/build-aux/Makefile.subs
-
-vdsmnetconfdir = $(vdsmdir)/netconf
-
-dist_vdsmnetconf_PYTHON = \
- __init__.py \
- ifcfg.py \
- iproute2.py \
- libvirtCfg.py \
- $(NULL)
diff --git a/vdsm/addNetwork b/vdsm/network/addNetwork
similarity index 91%
rename from vdsm/addNetwork
rename to vdsm/network/addNetwork
index 2678b94..1c00f09 100755
--- a/vdsm/addNetwork
+++ b/vdsm/network/addNetwork
@@ -45,5 +45,5 @@
shift 4
PYTHONPATH=`dirname $(readlink -f "$0")` \
-/usr/bin/python -m configNetwork add "$bridge" "$vlan" "$bonding" $nics "$@"
+/usr/bin/python -m network.configNetwork add "$bridge" "$vlan" "$bonding" $nics "$@"
diff --git a/vdsm/configNetwork.py b/vdsm/network/configNetwork.py
similarity index 98%
rename from vdsm/configNetwork.py
rename to vdsm/network/configNetwork.py
index 5db2a41..59e1b81 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/network/configNetwork.py
@@ -29,19 +29,13 @@
from vdsm import constants
from vdsm import utils
from storage.misc import execCmd
-import neterrors as ne
from netconf import libvirtCfg
-from neterrors import ConfigNetworkError
+from .neterrors import ConfigNetworkError
from vdsm import netinfo
from netconf.ifcfg import ConfigWriter
from netconf.ifcfg import Ifcfg
-from netmodels import Bond
-from netmodels import Bridge
-from netmodels import IPv4
-from netmodels import IPv6
-from netmodels import IpConfig
-from netmodels import Nic
-from netmodels import Vlan
+import neterrors as ne
+from .netmodels import Bond, Bridge, IPv4, IPv6, IpConfig, Nic, Vlan
import hooks
CONNECTIVITY_TIMEOUT_DEFAULT = 4
diff --git a/vdsm/delNetwork b/vdsm/network/delNetwork
similarity index 86%
rename from vdsm/delNetwork
rename to vdsm/network/delNetwork
index 1b7083f..86e1e42 100755
--- a/vdsm/delNetwork
+++ b/vdsm/network/delNetwork
@@ -26,5 +26,5 @@
shift 4
PYTHONPATH=`dirname $(readlink -f "$0")` \
-/usr/bin/python -m configNetwork del "$bridge" "$vlan" "$bonding" $nics "$@"
+/usr/bin/python -m network.configNetwork del "$bridge" "$vlan" "$bonding" $nics "$@"
diff --git a/vdsm/netconf/Makefile.am b/vdsm/network/netconf/Makefile.am
similarity index 95%
rename from vdsm/netconf/Makefile.am
rename to vdsm/network/netconf/Makefile.am
index 71ee11c..fb83b66 100644
--- a/vdsm/netconf/Makefile.am
+++ b/vdsm/network/netconf/Makefile.am
@@ -19,7 +19,7 @@
include $(top_srcdir)/build-aux/Makefile.subs
-vdsmnetconfdir = $(vdsmdir)/netconf
+vdsmnetconfdir = $(vdsmdir)/network/netconf
dist_vdsmnetconf_PYTHON = \
__init__.py \
diff --git a/vdsm/netconf/__init__.py b/vdsm/network/netconf/__init__.py
similarity index 97%
rename from vdsm/netconf/__init__.py
rename to vdsm/network/netconf/__init__.py
index 7ab63da..9292c3c 100644
--- a/vdsm/netconf/__init__.py
+++ b/vdsm/network/netconf/__init__.py
@@ -20,9 +20,9 @@
import logging
import libvirtCfg
-from netmodels import Bond, Bridge
-from sourceRoute import DynamicSourceRoute
-from sourceRoute import StaticSourceRoute
+from ..netmodels import Bond, Bridge
+from ..sourceRoute import DynamicSourceRoute
+from ..sourceRoute import StaticSourceRoute
from vdsm import netinfo
from vdsm.netconfpersistence import RunningConfig
diff --git a/vdsm/netconf/ifcfg.py b/vdsm/network/netconf/ifcfg.py
similarity index 99%
rename from vdsm/netconf/ifcfg.py
rename to vdsm/network/netconf/ifcfg.py
index 46df9f9..bfae900 100644
--- a/vdsm/netconf/ifcfg.py
+++ b/vdsm/network/netconf/ifcfg.py
@@ -18,20 +18,21 @@
#
import glob
-import libvirt
import logging
import os
import pipes
import pwd
import re
-import selinux
import shutil
import threading
-from netconf import Configurator
-from neterrors import ConfigNetworkError
-from netmodels import Nic, Bridge, IpConfig
-from sourceRoute import DynamicSourceRoute
+import libvirt
+import selinux
+
+from . import Configurator
+from ..neterrors import ConfigNetworkError
+from ..netmodels import Nic, Bridge, IpConfig
+from ..sourceRoute import DynamicSourceRoute
from vdsm.config import config
from vdsm import constants
from vdsm import netinfo
@@ -39,7 +40,7 @@
from vdsm.netconfpersistence import RunningConfig
import dsaversion
import libvirtCfg
-import neterrors as ne
+from .. import neterrors as ne
class Ifcfg(Configurator):
diff --git a/vdsm/netconf/iproute2.py b/vdsm/network/netconf/iproute2.py
similarity index 98%
rename from vdsm/netconf/iproute2.py
rename to vdsm/network/netconf/iproute2.py
index 8915f48..6e08e3a 100644
--- a/vdsm/netconf/iproute2.py
+++ b/vdsm/network/netconf/iproute2.py
@@ -20,9 +20,9 @@
import logging
import libvirtCfg
-from netconf import Configurator
-from neterrors import ConfigNetworkError, ERR_FAILED_IFUP, ERR_FAILED_IFDOWN
-from netmodels import Nic
+from . import Configurator
+from ..neterrors import ConfigNetworkError, ERR_FAILED_IFUP, ERR_FAILED_IFDOWN
+from ..netmodels import Nic
from vdsm import netinfo
from vdsm import ipwrapper
from vdsm.constants import EXT_BRCTL
diff --git a/vdsm/netconf/libvirtCfg.py b/vdsm/network/netconf/libvirtCfg.py
similarity index 100%
rename from vdsm/netconf/libvirtCfg.py
rename to vdsm/network/netconf/libvirtCfg.py
diff --git a/vdsm/neterrors.py b/vdsm/network/neterrors.py
similarity index 100%
rename from vdsm/neterrors.py
rename to vdsm/network/neterrors.py
diff --git a/vdsm/netmodels.py b/vdsm/network/netmodels.py
similarity index 99%
rename from vdsm/netmodels.py
rename to vdsm/network/netmodels.py
index 5fde4e0..f2b5bdc 100644
--- a/vdsm/netmodels.py
+++ b/vdsm/network/netmodels.py
@@ -24,7 +24,7 @@
import socket
import struct
-from neterrors import ConfigNetworkError
+from .neterrors import ConfigNetworkError
from vdsm import netinfo
import neterrors as ne
diff --git a/vdsm/sourceRoute.py b/vdsm/network/sourceRoute.py
similarity index 100%
rename from vdsm/sourceRoute.py
rename to vdsm/network/sourceRoute.py
diff --git a/vdsm/sourceRoute.sh b/vdsm/network/sourceRoute.sh
similarity index 100%
rename from vdsm/sourceRoute.sh
rename to vdsm/network/sourceRoute.sh
diff --git a/vdsm/sourceRouteThread.py b/vdsm/network/sourceRouteThread.py
similarity index 97%
rename from vdsm/sourceRouteThread.py
rename to vdsm/network/sourceRouteThread.py
index c913220..4550e4b 100644
--- a/vdsm/sourceRouteThread.py
+++ b/vdsm/network/sourceRouteThread.py
@@ -4,7 +4,7 @@
import pyinotify
from netconf.iproute2 import Iproute2
-from sourceRoute import DynamicSourceRoute
+from .sourceRoute import DynamicSourceRoute
from vdsm.constants import P_VDSM_RUN
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/network/vdsm-restore-net-config
similarity index 96%
rename from vdsm/vdsm-restore-net-config
rename to vdsm/network/vdsm-restore-net-config
index 4227e4e..b27ecde 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/network/vdsm-restore-net-config
@@ -22,10 +22,10 @@
import logging
import logging.config
-from netconf import ifcfg
+from network.netconf import ifcfg
from vdsm.config import config
from vdsm.netconfpersistence import RunningConfig, PersistentConfig
-from configNetwork import setupNetworks
+from network.configNetwork import setupNetworks
def ifcfg_restoration():
diff --git a/vdsm/vdsm-store-net-config.in b/vdsm/network/vdsm-store-net-config.in
similarity index 100%
rename from vdsm/vdsm-store-net-config.in
rename to vdsm/network/vdsm-store-net-config.in
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 59df478..ad27e4a 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -17,6 +17,7 @@
#
# Refer to the README and COPYING files for full details of the license
#
+
from pwd import getpwnam
import platform
import sys
@@ -64,13 +65,12 @@
from vdsm.constants import METADATA_GROUP, EXT_UDEVADM, \
DISKIMAGE_USER, DISKIMAGE_GROUP, P_LIBVIRT_VMCHANNELS, VDSM_USER
from storage.devicemapper import _removeMapping, _getPathsStatus
-import configNetwork
+from network import configNetwork, sourceRouteThread
from vdsm.config import config
import tc
import ksm
import mkimage
from storage.multipath import MPATH_CONF
-import sourceRouteThread
_UDEV_RULE_FILE_DIR = "/etc/udev/rules.d/"
_UDEV_RULE_FILE_PREFIX = "99-vdsm-"
--
To view, visit http://gerrit.ovirt.org/22694
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9c7e8cfc96cc1671ed7549c2f45ca820211c7c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Assaf Muller <amuller at redhat.com>
More information about the vdsm-patches
mailing list