Change in vdsm[master]: move vdsm.config to common

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

Dan Kenigsberg has uploaded a new change for review.

Change subject: move vdsm.config to common
..

move vdsm.config to common

vdsm.config is used by all subsystems. It should thus sit in common.
This patch keeps a proxy in place, so that existing users of vdsm.config
can be updated in separate patches.

Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Signed-off-by: Dan Kenigsberg 
---
M .gitignore
M lib/vdsm/Makefile.am
M lib/vdsm/common/Makefile.am
R lib/vdsm/common/config.py.in
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/80/79980/1

diff --git a/.gitignore b/.gitignore
index b96b310..7e8c362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,7 @@
 init/vdsmd_init_common.sh
 lib/vdsm/api/vdsm-api.html
 lib/vdsm/common/constants.py
-lib/vdsm/config.py
+lib/vdsm/common/config.py
 lib/vdsm/dsaversion.py
 lib/sos/vdsm.py
 lib/vdsm/storage/lvm.env
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index cdc0247..8f9d4d2 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -31,6 +31,7 @@
cmdutils.py \
commands.py \
constants.py \
+   config.py \
containersconnection.py \
cpuarch.py \
cpuinfo.py \
@@ -68,7 +69,6 @@
$(NULL)
 
 nodist_vdsmpylib_PYTHON = \
-   config.py \
dsaversion.py \
$(NULL)
 
@@ -83,13 +83,12 @@
 
 
 EXTRA_DIST = \
-   config.py.in \
dsaversion.py.in \
vdsm.conf.sample \
$(NULL)
 
-vdsm.conf.sample: Makefile config.py
-   @echo "  CONFIG $@"; $(PYTHON) $(builddir)/config.py > $@
+vdsm.conf.sample: Makefile common/config.py
+   @echo "  CONFIG $@"; $(PYTHON) -m common.config > $@
 
 install-data-local: \
install-data-sample-vdsm-conf
diff --git a/lib/vdsm/common/Makefile.am b/lib/vdsm/common/Makefile.am
index 0e8de2b..255b231 100644
--- a/lib/vdsm/common/Makefile.am
+++ b/lib/vdsm/common/Makefile.am
@@ -29,6 +29,7 @@
 dist_vdsmcommon_PYTHON = *.py
 
 EXTRA_DIST = \
+   config.py.in \
constants.py.in \
$(NULL)
 
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/common/config.py.in
similarity index 100%
rename from lib/vdsm/config.py.in
rename to lib/vdsm/common/config.py.in


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84514aed56034c79044a94f7ce391b368cb99c4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

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

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

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 
---
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 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to

Change in vdsm[master]: move exec_sync_bytes to common.cmdutils.exec_cmd

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: move exec_sync_bytes to common.cmdutils.exec_cmd
..


Patch Set 8:

(1 comment)

https://gerrit.ovirt.org/#/c/79693/8/lib/vdsm/network/cmd.py
File lib/vdsm/network/cmd.py:

Line 51
Line 52
Line 53
Line 54
Line 55
> Dan, did you miss my comment about the docstring and the warnings needed he
yep


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

Gerrit-MessageType: comment
Gerrit-Change-Id: Idca5b123a4ce6ef5ebaff8084d788e2acd47c2be
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: dockerfile: Remove Fedora 24 image

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

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

Change subject: dockerfile: Remove Fedora 24 image
..


dockerfile: Remove Fedora 24 image

We stopped using this image since commit 33e80260b1cf (rawhide: Add
travis Fedora rawhide build) on May 7, and Fedora 24 is approaching end
of life soon.

Change-Id: I846dc05a451423f85fd2864fc913cc74d7aeffa7
Signed-off-by: Nir Soffer 
---
D docker/Dockerfile.fedora.24
1 file changed, 0 insertions(+), 57 deletions(-)

Approvals:
  Nir Soffer: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I846dc05a451423f85fd2864fc913cc74d7aeffa7
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: gluster: Disable blivet tests also on Fedora 26

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

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

Change subject: gluster: Disable blivet tests also on Fedora 26
..


gluster: Disable blivet tests also on Fedora 26

Same issue seen on rawhide exists also in Fedora 26.
See https://bugzilla.redhat.com/1450607.

Change-Id: I939f2791c3dbf0892704193ebc63d5accc5f99d8
Signed-off-by: Nir Soffer 
---
M tests/check_imports.py
M tests/gluster_cli_test.py
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Nir Soffer: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I939f2791c3dbf0892704193ebc63d5accc5f99d8
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: dockerfile: Remove Fedora 24 image

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: dockerfile: Remove Fedora 24 image
..


Patch Set 3: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I846dc05a451423f85fd2864fc913cc74d7aeffa7
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: travis: Add Fedora 26 build

2017-07-30 Thread Code Review 
From Dan Kenigsberg :

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

Change subject: travis: Add Fedora 26 build
..


travis: Add Fedora 26 build

Change-Id: Ie036c6d6ac928210670460a748b05bfe967ab980
Signed-off-by: Nir Soffer 
---
M .travis.yml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Nir Soffer: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie036c6d6ac928210670460a748b05bfe967ab980
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org