Change in vdsm[master]: net: import config from vdsm.common.config

Discussion:

Code Review

2017-07-31 05:51:00 UTC

From Dan Kenigsberg <***@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 <***@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 <***@redhat.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-***@li

Code Review

2017-08-17 22:41:54 UTC

Permalink

From Dan Kenigsberg <***@redhat.com>:

Dan Kenigsberg has posted comments on this change.

Change subject: net: import config from vdsm.common.config
......................................................................

Patch Set 7:

ci please build

--
To view, visit https://gerrit.ovirt.org/79981
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <***@ovirt.org>
Gerrit-HasComments: No
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-***@list

Code Review

2017-08-17 22:43:40 UTC

Permalink

From Dan Kenigsberg <***@redhat.com>:

Dan Kenigsberg has posted comments on this change.

Change subject: net: import config from vdsm.common.config
......................................................................

Patch Set 7:

http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_manual/959/

--
To view, visit https://gerrit.ovirt.org/79981
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <***@ovirt.org>
Gerrit-HasComments: No
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe send an email to vdsm-pat

Code Review

2017-08-22 15:00:51 UTC

Permalink

From Dan Kenigsberg <***@redhat.com>:

Dan Kenigsberg has posted comments on this change.

Change subject: net: import config from vdsm.common.config
......................................................................

Patch Set 8:

ci please build

--
To view, visit https://gerrit.ovirt.org/79981
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Edward Haas <***@redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <***@ovirt.org>
Gerrit-HasComments: No
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-***@lists.fedo

Code Review

2017-08-22 15:05:45 UTC

Permalink

From Dan Kenigsberg <***@redhat.com>:

Dan Kenigsberg has posted comments on this change.

Change subject: net: import config from vdsm.common.config
......................................................................

Patch Set 8:

http://jenkins.ovirt.org/job/ovirt-system-tests_manual/996/

--
To view, visit https://gerrit.ovirt.org/79981
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Edward Haas <***@redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <***@ovirt.org>
Gerrit-HasComments: No
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe se

Code Review

2017-08-22 18:53:41 UTC

Permalink

From Dan Kenigsberg <***@redhat.com>:

Dan Kenigsberg has posted comments on this change.

Change subject: net: import config from vdsm.common.config
......................................................................

Patch Set 8: Verified+1

passes ost http://jenkins.ovirt.org/job/ovirt-system-tests_manual/996/

--
To view, visit https://gerrit.ovirt.org/79981
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Edward Haas <***@redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <***@ovirt.org>
Gerrit-HasComments: No
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-***@l

Code Review

2017-08-27 13:31:35 UTC

Permalink

From Dan Kenigsberg <***@redhat.com>:

Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79981 )

Change subject: net: import config from vdsm.common.config
......................................................................

net: import config from vdsm.common.config

Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Signed-off-by: Dan Kenigsberg <***@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(-)

Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Verified
Edward Haas: Looks good to me, approved

--
To view, visit https://gerrit.ovirt.org/79981
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1fc5799d93e4328da288875b9b48d920eaa30c6
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <***@redhat.com>
Gerrit-Reviewer: Edward Haas <***@redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <***@redhat.com>
Gerrit-Reviewer: gerrit-hooks <***@ovirt.org>
_______________________________________________
vdsm-patches mailing list -- vdsm-***@lists.fedorahosted.org
To unsubscribe send an email to vdsm-pa