Change in vdsm[master]: net: import config from vdsm.common.config
by Code Review
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>
6 years
Change in vdsm[master]: move vdsm.config to common
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
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 <danken(a)redhat.com>
---
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 <danken(a)redhat.com>
6 years, 1 month
Change in vdsm[master]: cmdutils: add env to exec_sync_bytes()'s args
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: cmdutils: add env to exec_sync_bytes()'s args
......................................................................
cmdutils: add env to exec_sync_bytes()'s args
Expose Popen's env argument throught exec_sync_bytes()
Change-Id: I109c50c4dd85347e12e8a9a11963b0cded685536
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/common/cmdutils.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/79694/1
diff --git a/lib/vdsm/common/cmdutils.py b/lib/vdsm/common/cmdutils.py
index 26e08a7..c4b1d31 100644
--- a/lib/vdsm/common/cmdutils.py
+++ b/lib/vdsm/common/cmdutils.py
@@ -110,11 +110,12 @@
BlockIO = 'BlockIO'
-def exec_sync_bytes(cmds):
+def exec_sync_bytes(cmds, env=None):
logging.debug(cmdutils.command_log_line(cmds))
p = Popen(
- cmds, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ cmds, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+ env=env)
out, err = p.communicate()
--
To view, visit https://gerrit.ovirt.org/79694
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I109c50c4dd85347e12e8a9a11963b0cded685536
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 1 month
Change in vdsm[master]: move exec_sync_bytes to common.cmdutils
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: move exec_sync_bytes to common.cmdutils
......................................................................
move exec_sync_bytes to common.cmdutils
exec_sync_bytes is useful not only in the network subpackage, so it
needs to reside under vdsm.common.
Change-Id: Idca5b123a4ce6ef5ebaff8084d788e2acd47c2be
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/common/cmdutils.py
M lib/vdsm/network/cmd.py
2 files changed, 16 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/79693/1
diff --git a/lib/vdsm/common/cmdutils.py b/lib/vdsm/common/cmdutils.py
index 85a4ae0..26e08a7 100644
--- a/lib/vdsm/common/cmdutils.py
+++ b/lib/vdsm/common/cmdutils.py
@@ -22,6 +22,8 @@
import os
import re
+from vdsm.common.compat import CPopen as Popen
+
SYSTEMD_RUN = "/usr/bin/systemd-run"
@@ -106,3 +108,16 @@
CPU = 'CPU'
Memory = 'Memory'
BlockIO = 'BlockIO'
+
+
+def exec_sync_bytes(cmds):
+ logging.debug(cmdutils.command_log_line(cmds))
+
+ p = Popen(
+ cmds, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+ out, err = p.communicate()
+
+ logging.debug(cmdutils.retcode_log_line(p.returncode, err=err))
+
+ return p.returncode, out, err
diff --git a/lib/vdsm/network/cmd.py b/lib/vdsm/network/cmd.py
index f6d9b73..bf5d537 100644
--- a/lib/vdsm/network/cmd.py
+++ b/lib/vdsm/network/cmd.py
@@ -23,8 +23,7 @@
import uuid
from vdsm.common import cmdutils
-from vdsm.common.cmdutils import systemd_run
-from vdsm.common.compat import CPopen as Popen
+from vdsm.common.cmdutils import systemd_run, exec_sync_bytes
from vdsm.network import py2to3
@@ -50,16 +49,3 @@
cmds = systemd_run(cmds, scope=True, unit=unit, slice=slice_name)
return exec_sync(cmds)
-
-
-def exec_sync_bytes(cmds):
- logging.debug(cmdutils.command_log_line(cmds))
-
- p = Popen(
- cmds, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
- out, err = p.communicate()
-
- logging.debug(cmdutils.retcode_log_line(p.returncode, err=err))
-
- return p.returncode, out, err
--
To view, visit https://gerrit.ovirt.org/79693
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idca5b123a4ce6ef5ebaff8084d788e2acd47c2be
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 1 month
Change in vdsm[master]: move hooks to common
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: move hooks to common
......................................................................
move hooks to common
hooks.py is used by host, network and virt subsystems. This means that
it should sit under the common package.
Change-Id: I4be8e8b2418ea758047234c5ae061dc5134bc0da
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M init/vdsmd_init_common.sh.in
M lib/vdsm/API.py
M lib/vdsm/Makefile.am
M lib/vdsm/common/cmdutils.py
R lib/vdsm/common/hooks.py
M lib/vdsm/host/api.py
M lib/vdsm/host/caps.py
M lib/vdsm/hostdev.py
M lib/vdsm/network/api.py
M lib/vdsm/network/cmd.py
M lib/vdsm/network/configurators/ifcfg.py
M lib/vdsm/virt/vm.py
M tests/hooks_test.py
M tests/hostdev_test.py
M tests/vmoperations_test.py
M vdsm.spec.in
M vdsm/hooking.py
17 files changed, 19 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/79695/1
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index 2a6f5c3..445e766 100755
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -55,7 +55,7 @@
}
task_run_init_hooks(){
- "@PYTHON@" -m "vdsm.hooks" before_vdsm_start
+ "@PYTHON@" -m "vdsm.common.hooks" before_vdsm_start
}
@@ -200,7 +200,7 @@
#### post-stop tasks ####
task_run_final_hooks(){
- "@PYTHON@" -m "vdsm.hooks" after_vdsm_stop
+ "@PYTHON@" -m "vdsm.common.hooks" after_vdsm_stop
}
#### post-stop tasks end ####
diff --git a/lib/vdsm/API.py b/lib/vdsm/API.py
index 552b9d1..1672537 100644
--- a/lib/vdsm/API.py
+++ b/lib/vdsm/API.py
@@ -29,7 +29,6 @@
from vdsm import commands
from vdsm import utils
from vdsm import constants
-from vdsm import hooks
from vdsm import hostdev
from vdsm import supervdsm
from vdsm import throttledlog
@@ -39,6 +38,7 @@
from vdsm.common import api
from vdsm.common import exception
from vdsm.common import fileutils
+from vdsm.common import hooks
from vdsm.common import logutils
from vdsm.common import response
from vdsm.common import validate
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 2865653..4ee67dc 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -36,7 +36,6 @@
dmidecodeUtil.py \
executor.py \
health.py \
- hooks.py \
hostdev.py \
hugepages.py \
jobs.py \
diff --git a/lib/vdsm/common/cmdutils.py b/lib/vdsm/common/cmdutils.py
index c4b1d31..d200981 100644
--- a/lib/vdsm/common/cmdutils.py
+++ b/lib/vdsm/common/cmdutils.py
@@ -19,9 +19,12 @@
from __future__ import absolute_import
import distutils.spawn
+import logging
import os
import re
+import subprocess
+from vdsm.common import cmdutils
from vdsm.common.compat import CPopen as Popen
diff --git a/lib/vdsm/hooks.py b/lib/vdsm/common/hooks.py
similarity index 98%
rename from lib/vdsm/hooks.py
rename to lib/vdsm/common/hooks.py
index 2baa2df..e60bd42 100644
--- a/lib/vdsm/hooks.py
+++ b/lib/vdsm/common/hooks.py
@@ -32,9 +32,9 @@
import sys
import tempfile
-from vdsm.common import exception
-from . import commands
+from .cmdutils import exec_sync_bytes
from .constants import P_VDSM_HOOKS, P_VDSM, P_VDSM_RUN
+from . import exception
_LAUNCH_FLAGS_FILE = 'launchflags'
_LAUNCH_FLAGS_PATH = os.path.join(
@@ -103,8 +103,7 @@
errorSeen = False
for s in scripts:
- rc, out, err = commands.execCmd([s], raw=True,
- env=scriptenv)
+ rc, out, err = exec_sync_bytes([s], env=scriptenv)
logging.info(err)
if rc != 0:
errorSeen = True
diff --git a/lib/vdsm/host/api.py b/lib/vdsm/host/api.py
index b77b57b..b9a1587 100644
--- a/lib/vdsm/host/api.py
+++ b/lib/vdsm/host/api.py
@@ -23,10 +23,10 @@
import logging
import time
from . import stats
-from vdsm import hooks
from vdsm import utils
from vdsm import metrics
from vdsm.common.define import Kbytes, Mbytes
+from vdsm.common import hooks
from vdsm.config import config
from vdsm.virt import vmstatus
diff --git a/lib/vdsm/host/caps.py b/lib/vdsm/host/caps.py
index 21c02a8..eadcb48 100644
--- a/lib/vdsm/host/caps.py
+++ b/lib/vdsm/host/caps.py
@@ -27,6 +27,7 @@
import libvirt
from vdsm.common import cache
+from vdsm.common import hooks
from vdsm.config import config
from vdsm.host import rngsources
from vdsm.storage import hba
@@ -34,7 +35,6 @@
from vdsm import cpuarch
from vdsm import cpuinfo
from vdsm import dsaversion
-from vdsm import hooks
from vdsm import host
from vdsm import hostdev
from vdsm import hugepages
diff --git a/lib/vdsm/hostdev.py b/lib/vdsm/hostdev.py
index 22626dc..55856eb 100644
--- a/lib/vdsm/hostdev.py
+++ b/lib/vdsm/hostdev.py
@@ -29,11 +29,11 @@
import libvirt
from vdsm.common import conv
+from vdsm.common import hooks
from vdsm.common import validate
from vdsm.common.cache import memoized
from . import cpuarch
-from . import hooks
from . import libvirtconnection
from . import supervdsm
diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index cb7210f..6bf7c3f 100644
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -25,8 +25,7 @@
import logging
import six
-from vdsm import hooks
-
+from vdsm.common import hooks
from vdsm.network import netswitch
from vdsm.network import sourceroute
from vdsm.network.configurators.ifcfg import ConfigWriter
diff --git a/lib/vdsm/network/cmd.py b/lib/vdsm/network/cmd.py
index bf5d537..343f967 100644
--- a/lib/vdsm/network/cmd.py
+++ b/lib/vdsm/network/cmd.py
@@ -18,11 +18,8 @@
#
from __future__ import absolute_import
-import logging
-import subprocess
import uuid
-from vdsm.common import cmdutils
from vdsm.common.cmdutils import systemd_run, exec_sync_bytes
from vdsm.network import py2to3
diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py
index ab5dfc2..dd3824b 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -34,11 +34,11 @@
from vdsm.config import config
from vdsm import dsaversion
-from vdsm import hooks
from vdsm.common import concurrent
from vdsm.common import constants
from vdsm.common import fileutils
from vdsm.common.conv import tobool
+from vdsm.common import hooks
from vdsm.network import cmd
from vdsm.network import ifacetracking
diff --git a/lib/vdsm/virt/vm.py b/lib/vdsm/virt/vm.py
index 85e3707..99fb010 100644
--- a/lib/vdsm/virt/vm.py
+++ b/lib/vdsm/virt/vm.py
@@ -37,13 +37,13 @@
# vdsm imports
from vdsm.common import api
from vdsm.common import exception
+from vdsm.common import hooks
from vdsm.common import logutils
from vdsm.common import response
import vdsm.common.time
from vdsm import constants
from vdsm import containersconnection
from vdsm import cpuarch
-from vdsm import hooks
from vdsm import host
from vdsm import hugepages
from vdsm import libvirtconnection
diff --git a/tests/hooks_test.py b/tests/hooks_test.py
index 11a87c0..2103710 100644
--- a/tests/hooks_test.py
+++ b/tests/hooks_test.py
@@ -31,7 +31,7 @@
from testlib import VdsmTestCase as TestCaseBase
from testlib import namedTemporaryDir
-from vdsm import hooks
+from vdsm.common import hooks
class TestHooks(TestCaseBase):
diff --git a/tests/hostdev_test.py b/tests/hostdev_test.py
index 9b2ad21..7de6f53 100644
--- a/tests/hostdev_test.py
+++ b/tests/hostdev_test.py
@@ -27,8 +27,8 @@
from testlib import find_xml_element
from monkeypatch import MonkeyClass
+from vdsm.common import hooks
from vdsm import cpuarch
-from vdsm import hooks
from vdsm import hostdev
from vdsm import libvirtconnection
diff --git a/tests/vmoperations_test.py b/tests/vmoperations_test.py
index cb509b3..bf40d4b 100644
--- a/tests/vmoperations_test.py
+++ b/tests/vmoperations_test.py
@@ -32,9 +32,9 @@
from vdsm.virt.vmdevices import hwclass
from vdsm.common import define
+from vdsm.common import hooks
from vdsm.common import response
from vdsm.config import config
-from vdsm import hooks
from vdsm import libvirtconnection
from vdsm import password
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 9e28859..9e1a314 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1057,7 +1057,6 @@
%{python_sitelib}/%{vdsm_name}/gluster/cli.py*
%{python_sitelib}/%{vdsm_name}/gluster/exception.py*
%{python_sitelib}/%{vdsm_name}/health.py*
-%{python_sitelib}/%{vdsm_name}/hooks.py*
%{python_sitelib}/%{vdsm_name}/hostdev.py*
%{python_sitelib}/%{vdsm_name}/hugepages.py*
%{python_sitelib}/%{vdsm_name}/jobs.py*
diff --git a/vdsm/hooking.py b/vdsm/hooking.py
index 803231a..4a2cddd 100644
--- a/vdsm/hooking.py
+++ b/vdsm/hooking.py
@@ -36,7 +36,6 @@
>2 - reserved
"""
-from vdsm import hooks
import json
import os
import sys
@@ -44,6 +43,7 @@
from vdsm.commands import execCmd
from vdsm.common.conv import tobool
+from vdsm.common import hooks
# make pyflakes happy
execCmd
--
To view, visit https://gerrit.ovirt.org/79695
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4be8e8b2418ea758047234c5ae061dc5134bc0da
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 1 month
Change in vdsm[master]: pytest: Set locale properly for pytest based tests
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: pytest: Set locale properly for pytest based tests
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/80027
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6d75e19bb72c054ec90b2bab2539cd8544d3fe39
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 1 month
Change in vdsm[master]: build: remove constants.py from dist package
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: build: remove constants.py from dist package
......................................................................
Patch Set 1:
Tomas, it does not have to be part of `make check`. If it helps you, you can introduce it to make-check.sh.
--
To view, visit https://gerrit.ovirt.org/79925
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I36820d3c458c5d162dcb8fbe2baf1c9647c9032d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tomas Golembiovsky <tgolembi(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tomas Golembiovsky <tgolembi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 1 month
Change in vdsm[master]: api: log only external pings
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: api: log only external pings
......................................................................
Patch Set 13: Code-Review-1
(1 comment)
https://gerrit.ovirt.org/#/c/78142/13//COMMIT_MSG
Commit Message:
Line 15: is successful (pinged from localhost) although the host lost its
Line 16: network connectivity.
Line 17:
Line 18: With this patch we confirm connectivity (touch P_VDSM_CLIENT_LOG)
Line 19: only when ping is used by a non-localhost caller.
per discussion with Petr, I am convinced that we cannot just change the existing verb (since there still might be someone running Engine on a Vdsm host).
We'd better deprecate ping, and create 2 new verbs:
- ping2 (or echo or whatever to check connectivity)
- confirm_connectivity (for explict confirmation of connectivity)
Line 20:
Line 21: Change-Id: I9eff40244f38d5707f9e1cec64d20bcd68415b2d
--
To view, visit https://gerrit.ovirt.org/78142
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9eff40244f38d5707f9e1cec64d20bcd68415b2d
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
6 years, 1 month
Change in vdsm[master]: gluster: Disable blivet tests also on Fedora 26
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
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 <nsoffer(a)redhat.com>
---
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 <nsoffer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 1 month
Change in vdsm[master]: dockerfile: Remove Fedora 24 image
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
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 <nsoffer(a)redhat.com>
---
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 <nsoffer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 1 month