From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: net: import config from vdsm.common.config
......................................................................
net: import config from vdsm.common.config
Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/configurators/ifcfg.py
M lib/vdsm/network/ipwrapper.py
M lib/vdsm/network/legacy_switch.py
M lib/vdsm/network/netrestore.py
M lib/vdsm/network/netupgrade.py
M lib/vdsm/network/restore_net_config.py
7 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/79981/1
diff --git a/lib/vdsm/network/configurators/__init__.py
b/lib/vdsm/network/configurators/__init__.py
index c2cfb35..5fd4daa 100644
--- a/lib/vdsm/network/configurators/__init__.py
+++ b/lib/vdsm/network/configurators/__init__.py
@@ -23,7 +23,7 @@
import six
from six.moves import configparser
-from vdsm.config import config
+from vdsm.common.config import config
from vdsm.network.netconfpersistence import RunningConfig
from vdsm.network.link import iface as link_iface
diff --git a/lib/vdsm/network/configurators/ifcfg.py
b/lib/vdsm/network/configurators/ifcfg.py
index dd3824b..f7fdf8b 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -32,11 +32,11 @@
import six
-from vdsm.config import config
from vdsm import dsaversion
from vdsm.common import concurrent
from vdsm.common import constants
from vdsm.common import fileutils
+from vdsm.common.config import config
from vdsm.common.conv import tobool
from vdsm.common import hooks
diff --git a/lib/vdsm/network/ipwrapper.py b/lib/vdsm/network/ipwrapper.py
index 7a1c9ca..684be11 100644
--- a/lib/vdsm/network/ipwrapper.py
+++ b/lib/vdsm/network/ipwrapper.py
@@ -36,13 +36,13 @@
from netaddr import IPAddress
from netaddr import IPNetwork
-from vdsm.config import config
+from vdsm.common.cmdutils import CommandPath
+from vdsm.common.config import config
from vdsm.network import cmd
from vdsm.network import py2to3
from vdsm.network.link import dpdk
from vdsm.network.netlink import libnl
from vdsm.network.netlink import link
-from vdsm.common.cmdutils import CommandPath
_IP_BINARY = CommandPath('ip', '/sbin/ip')
diff --git a/lib/vdsm/network/legacy_switch.py b/lib/vdsm/network/legacy_switch.py
index e9b6e7f..607c06a 100644
--- a/lib/vdsm/network/legacy_switch.py
+++ b/lib/vdsm/network/legacy_switch.py
@@ -25,8 +25,7 @@
import six
-from vdsm.config import config
-
+from vdsm.common.config import config
from vdsm.common.conv import tobool
from vdsm.network import ipwrapper
from vdsm.network import kernelconfig
diff --git a/lib/vdsm/network/netrestore.py b/lib/vdsm/network/netrestore.py
index b696558..91b927f 100644
--- a/lib/vdsm/network/netrestore.py
+++ b/lib/vdsm/network/netrestore.py
@@ -25,11 +25,11 @@
import six
from vdsm.common.constants import P_VDSM_RUN
-from vdsm.config import config
+from vdsm.common.config import config
+from vdsm.common.conv import tobool
from vdsm.network import netswitch
from vdsm.network.link import setup
from vdsm.network.link.bond import Bond
-from vdsm.common.conv import tobool
from .netconfpersistence import PersistentConfig
diff --git a/lib/vdsm/network/netupgrade.py b/lib/vdsm/network/netupgrade.py
index d2a1477..3aa58ae 100644
--- a/lib/vdsm/network/netupgrade.py
+++ b/lib/vdsm/network/netupgrade.py
@@ -22,7 +22,7 @@
import six
-from vdsm.config import config
+from vdsm.common.config import config
from vdsm.virt import libvirtnetwork
diff --git a/lib/vdsm/network/restore_net_config.py
b/lib/vdsm/network/restore_net_config.py
index 4725e52..bb241c4 100644
--- a/lib/vdsm/network/restore_net_config.py
+++ b/lib/vdsm/network/restore_net_config.py
@@ -27,7 +27,8 @@
import six
-from vdsm.config import config
+from vdsm.common.config import config
+from vdsm.common.time import monotonic_time
from vdsm import hostdev
from vdsm.network import ipwrapper
from vdsm.network import kernelconfig
@@ -40,7 +41,6 @@
from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig, \
CONF_PERSIST_DIR, BaseConfig
from vdsm.network.nm import networkmanager
-from vdsm.common.time import monotonic_time
# Ifcfg persistence restoration
from vdsm.network.configurators import ifcfg
--
To view, visit
https://gerrit.ovirt.org/79981
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>