July 2017 - vdsm-patches - Fedora mailing-lists

Change in vdsm[master]: net: import config from vdsm.common.config
by Code Review 27 Aug '17

27 Aug '17

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>

1 6

Change in vdsm[master]: move vdsm.config to common
by Code Review 23 Aug '17

23 Aug '17

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>

1 5

Change in vdsm[master]: cmdutils: add env to exec_sync_bytes()'s args
by Code Review 17 Aug '17

17 Aug '17

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>

1 5

Change in vdsm[master]: move exec_sync_bytes to common.cmdutils
by Code Review 17 Aug '17

17 Aug '17

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>

1 7

Change in vdsm[master]: move hooks to common
by Code Review 03 Aug '17

03 Aug '17

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>

1 7

Change in vdsm[master]: pytest: Set locale properly for pytest based tests
by Code Review 31 Jul '17

31 Jul '17

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

1 0

Change in vdsm[master]: build: remove constants.py from dist package
by Code Review 31 Jul '17

31 Jul '17

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

1 0

Change in vdsm[master]: api: log only external pings
by Code Review 31 Jul '17

31 Jul '17

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

1 0

Change in vdsm[master]: gluster: Disable blivet tests also on Fedora 26
by Code Review 30 Jul '17

30 Jul '17

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>

1 0

Change in vdsm[master]: travis: Add Fedora 26 build
by Code Review 30 Jul '17

30 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: 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 <nsoffer(a)redhat.com> --- 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 <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>

1 0

Change in vdsm[master]: dockerfile: Remove Fedora 24 image
by Code Review 30 Jul '17

30 Jul '17

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>

1 0

Change in vdsm[master]: dockerfile: Remove Fedora 24 image
by Code Review 30 Jul '17

30 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: 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 <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> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: sb validator: raise on missing sb device.
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: sb validator: raise on missing sb device. ...................................................................... Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/79953/1//COMMIT_MSG Commit Message: Line 5: CommitDate: 2017-07-29 16:32:40 +0300 Line 6: Line 7: net: sb validator: raise on missing sb device. Line 8: Line 9: If no nic and no bond were given to a network, raise. why? we wanted to have nicless (bridge-only) networks. Line 10: Line 11: Change-Id: I6f3503faa5c84155ed667e2a474d1dc148798e35 -- To view, visit https://gerrit.ovirt.org/79953 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6f3503faa5c84155ed667e2a474d1dc148798e35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Leon Goldberg <lgoldber(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: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: net: tests: add "param" to test_add_net_missing_sb_device_fails
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: tests: add "param" to test_add_net_missing_sb_device_fails ...................................................................... Patch Set 1: (1 comment) https://gerrit.ovirt.org/#/c/79952/1//COMMIT_MSG Commit Message: Line 7: net: tests: add "param" to test_add_net_missing_sb_device_fails Line 8: Line 9: In order to differentiate between the non-existent nic and Line 10: not supplied nic (sb) parameter, "param" was added to the Line 11: tests' signature (test_add_net_missing_sb_device_param_fails). sorry, but I don't understand what "param" means Line 12: Line 13: Change-Id: I8d4d4654dcbe70aac586971530d9b1bf13bcb728 -- To view, visit https://gerrit.ovirt.org/79952 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8d4d4654dcbe70aac586971530d9b1bf13bcb728 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Leon Goldberg <lgoldber(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: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: dockerfile: Add Fedora 26 image
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79945 ) Change subject: dockerfile: Add Fedora 26 image ...................................................................... dockerfile: Add Fedora 26 image Change-Id: Ia63d38c578094b88602477418923acb96ac196ab Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- A docker/Dockerfile.fedora.26 1 file changed, 59 insertions(+), 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/79945 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia63d38c578094b88602477418923acb96ac196ab 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: 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>

1 0

Change in vdsm[master]: net: Introduce the LLDPAD driver with an LLDP interface
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Introduce the LLDPAD driver with an LLDP interface ...................................................................... Patch Set 18: CI-1 due to ./lib/vdsm/network/lldpad/lldptool.py:126:80: E501 line too long (83 > 79 characters) -- To view, visit https://gerrit.ovirt.org/78117 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaaa889789f7bbcc1cb3d9a9d0c8b02f1cf83bea9 Gerrit-PatchSet: 18 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Dominik Holler <dholler(a)redhat.com> Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: Yaniv Kaul <ykaul(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79664 ) Change subject: m2c: uses different protocol constant names ...................................................................... m2c: uses different protocol constant names M2crypto uses the same name scheme as openssl which differs from ssl module. SSL_OP_NO_TLSv1_1 is not defined m2c master upstream. Label: ovirt-4.1-only Bug-Url: https://bugzilla.redhat.com/1473344 Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> --- M lib/vdsm/m2cutils.py 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Piotr Kliczewski: Verified Jenkins CI: Passed CI tests Irit Goihman: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Francesco Romani: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 4: Code-Review+2 (1 comment) https://gerrit.ovirt.org/#/c/79664/4/lib/vdsm/m2cutils.py File lib/vdsm/m2cutils.py: Line 37: except ImportError as e: Line 38: raise compat.Unsupported(str(e)) Line 39: Line 40: CLIENT_PROTOCOL = "sslv23" Line 41: SSL_OP_NO_TLSv1_1 = 268435456 0x10000000 is SOOO much more readable. Line 42: Line 43: DEFAULT_ACCEPT_TIMEOUT = 5 Line 44: SOCKET_DEFAULT_TIMEOUT = socket._GLOBAL_DEFAULT_TIMEOUT Line 45: -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: ssl: handle handshake errors
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: ssl: handle handshake errors ...................................................................... Patch Set 7: (1 comment) https://gerrit.ovirt.org/#/c/79668/7/lib/vdsm/sslutils.py File lib/vdsm/sslutils.py: Line 254: elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE: Line 255: self.want_write = True Line 256: else: Line 257: dispatcher.close() Line 258: except socket.error: silently ignoring these two errors is counter intuitive. Maybe you can add a comment for future developers? Line 259: dispatcher.close() Line 260: else: Line 261: self.want_read = self.want_write = True Line 262: self._is_handshaking = False -- To view, visit https://gerrit.ovirt.org/79668 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I99cfa35e608f429640455c35495be1783854e3da Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: jsonrpc tests: Discard the dependency on the network package
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: jsonrpc tests: Discard the dependency on the network package ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79950 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I708c50567e4ec9b2c72cd34f8435ccb66aac7281 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: gluster: Disable blivet tests also on Fedora 26
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: gluster: Disable blivet tests also on Fedora 26 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79948 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I939f2791c3dbf0892704193ebc63d5accc5f99d8 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> Gerrit-HasComments: No

1 0

Change in vdsm[master]: travis: Add Fedora 26 build
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: travis: Add Fedora 26 build ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79947 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie036c6d6ac928210670460a748b05bfe967ab980 Gerrit-PatchSet: 2 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> Gerrit-HasComments: No

1 0

Change in vdsm[master]: dockerfile: Remove Fedora 24 image
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: dockerfile: Remove Fedora 24 image ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/79946/2//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2017-07-29 01:33:15 +0300 Line 4: Commit: Nir Soffer <nsoffer(a)redhat.com> Line 5: CommitDate: 2017-07-29 02:23:48 +0300 Line 6: Line 7: dockerfile: Remove Fedora 24 image can you add a word regarding why, and why it does not hurt anybody? Line 8: Line 9: Change-Id: I846dc05a451423f85fd2864fc913cc74d7aeffa7 -- 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: 2 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> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: dockerfile: Add Fedora 26 image
by Code Review 29 Jul '17

29 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: dockerfile: Add Fedora 26 image ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79945 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia63d38c578094b88602477418923acb96ac196ab 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: 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> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: tests: Migrate testFailWithInvalidParams to the new fun...
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79905 ) Change subject: net: tests: Migrate testFailWithInvalidParams to the new func tests ...................................................................... net: tests: Migrate testFailWithInvalidParams to the new func tests Change-Id: I848f360e3e4f0e8cda17870f53ce27af25252343 Signed-off-by: Leon Goldberg <lgoldber(a)redhat.com> --- M tests/functional/networkTests.py M tests/network/func_bond_basic_test.py M tests/network/func_net_basic_test.py 3 files changed, 23 insertions(+), 12 deletions(-) Approvals: Jenkins CI: Passed CI tests Leon Goldberg: Verified Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/79905 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I848f360e3e4f0e8cda17870f53ce27af25252343 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: hooking: move to lib
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79638 ) Change subject: hooking: move to lib ...................................................................... hooking: move to lib As part of broader migration we move hooking.py away from vdsm dir. Change-Id: If2f1581d75cfb33868af41d1b116f56af89801a5 Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> --- M Makefile.am M configure.ac M lib/vdsm/Makefile.am A lib/vdsm/hook/Makefile.am A lib/vdsm/hook/__init__.py R lib/vdsm/hook/hooking.py M lib/vdsm/hooks.py M vdsm.spec.in M vdsm/Makefile.am 9 files changed, 33 insertions(+), 7 deletions(-) Approvals: Piotr Kliczewski: Verified Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/79638 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2f1581d75cfb33868af41d1b116f56af89801a5 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: hooking: move to lib
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: hooking: move to lib ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79638 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2f1581d75cfb33868af41d1b116f56af89801a5 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: RPC: Fix tests in integration/jsonRpcTests.py
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79744 ) Change subject: RPC: Fix tests in integration/jsonRpcTests.py ...................................................................... RPC: Fix tests in integration/jsonRpcTests.py The tests were broken by patch: https://gerrit.ovirt.org/#/c/79299/ This patch fixes them. Change-Id: Icde4642ae8c541422aedee73cfedb57c7856cf8e Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com> --- M tests/integration/jsonRpcHelper.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Jenkins CI: Passed CI tests Andrej Krejcir: Verified -- To view, visit https://gerrit.ovirt.org/79744 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icde4642ae8c541422aedee73cfedb57c7856cf8e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: RPC: Fix tests in integration/jsonRpcTests.py
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: RPC: Fix tests in integration/jsonRpcTests.py ...................................................................... Patch Set 7: so very sorry, I forgot all about these tests. -- To view, visit https://gerrit.ovirt.org/79744 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icde4642ae8c541422aedee73cfedb57c7856cf8e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: build: remove constants.py from dist package
by Code Review 28 Jul '17

28 Jul '17

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, can you suggest a test that would make sure we do not break your use case again? -- 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: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: tests: Migrate testFailWithInvalidParams to the new fun...
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: tests: Migrate testFailWithInvalidParams to the new func tests ...................................................................... Patch Set 2: Code-Review-1 requires manual rebase -- To view, visit https://gerrit.ovirt.org/79905 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I848f360e3e4f0e8cda17870f53ce27af25252343 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: tests: Migrate testFailWithInvalidIpConfig to the new f...
by Code Review 28 Jul '17

28 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79438 ) Change subject: net: tests: Migrate testFailWithInvalidIpConfig to the new func tests ...................................................................... net: tests: Migrate testFailWithInvalidIpConfig to the new func tests Change-Id: I4a46e5e5e210fd4d17b70d1f77405ffbadedb44d Signed-off-by: Leon Goldberg <lgoldber(a)redhat.com> --- M tests/functional/networkTests.py A tests/network/func_net_ip_test.py 2 files changed, 75 insertions(+), 16 deletions(-) Approvals: Jenkins CI: Passed CI tests Leon Goldberg: Verified Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/79438 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a46e5e5e210fd4d17b70d1f77405ffbadedb44d Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: place bonding defaults under /var/lib
by Code Review 27 Jul '17

27 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net: place bonding defaults under /var/lib ...................................................................... net: place bonding defaults under /var/lib vdsm-tool places bonding-defaults.json under /usr/share. However, the proper place to store application data is under /var/lib Change-Id: Ib50e3c34d54c949ef22e780731518ff17890226f Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/network/link/bond/sysfs_options.py M lib/vdsm/network/link/bond/sysfs_options_mapper.py M lib/vdsm/tool/configurators/bond_defaults.py 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/79436/1 diff --git a/lib/vdsm/network/link/bond/sysfs_options.py b/lib/vdsm/network/link/bond/sysfs_options.py index d230736..bf5e93c 100644 --- a/lib/vdsm/network/link/bond/sysfs_options.py +++ b/lib/vdsm/network/link/bond/sysfs_options.py @@ -27,7 +27,7 @@ from vdsm import constants from vdsm.common.cache import memoized -BONDING_DEFAULTS = constants.P_VDSM + 'bonding-defaults.json' +BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' BONDING_OPT = '/sys/class/net/%s/bonding/%s' ARP_IP_TARGET = 'arp_ip_target' diff --git a/lib/vdsm/network/link/bond/sysfs_options_mapper.py b/lib/vdsm/network/link/bond/sysfs_options_mapper.py index 01aaa0c..2219ab3 100644 --- a/lib/vdsm/network/link/bond/sysfs_options_mapper.py +++ b/lib/vdsm/network/link/bond/sysfs_options_mapper.py @@ -35,7 +35,7 @@ from vdsm.network.link.bond.sysfs_driver import BONDING_MASTERS from vdsm.network.link.iface import random_iface_name -BONDING_NAME2NUMERIC_PATH = constants.P_VDSM + 'bonding-name2numeric.json' +BONDING_NAME2NUMERIC_PATH = constants.P_VDSM_LIB + 'bonding-name2numeric.json' _MAX_BONDING_MODES = 6 diff --git a/lib/vdsm/tool/configurators/bond_defaults.py b/lib/vdsm/tool/configurators/bond_defaults.py index 6487506..adad925 100644 --- a/lib/vdsm/tool/configurators/bond_defaults.py +++ b/lib/vdsm/tool/configurators/bond_defaults.py @@ -28,7 +28,7 @@ from . import YES, NO -BONDING_DEFAULTS = constants.P_VDSM + 'bonding-defaults.json' +BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' def isconfigured(): -- To view, visit https://gerrit.ovirt.org/79436 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib50e3c34d54c949ef22e780731518ff17890226f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 6

Change in vdsm[master]: net test: use static bonding defaults if dump fails
by Code Review 27 Jul '17

27 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net test: use static bonding defaults if dump fails ...................................................................... net test: use static bonding defaults if dump fails sysfs_options_mapper.dump_bonding_options may fail during the test if its target directory is missing. In such a case, take the shipped defaults. Change-Id: I33a6ecc14f6d1a2f7cc9da9bfaff4fad13fa8055 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/network/nettestlib.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/79889/1 diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index 7395755..79f55f4 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -532,13 +532,18 @@ bonding_name2num_fpath = ALTERNATIVE_BONDING_NAME2NUMERIC_PATH if _has_sysfs_bond_permission(): - sysfs_options_mapper.dump_bonding_options() + try: + sysfs_options_mapper.dump_bonding_options() + except SystemError as e: + if e.errno != errno.ENOENT: + raise if os.path.exists(BONDING_DEFAULTS): bonding_defaults_fpath = BONDING_DEFAULTS if os.path.exists(sysfs_options_mapper.BONDING_NAME2NUMERIC_PATH): - bonding_name2num_fpath = sysfs_options_mapper.BONDING_NAME2NUMERIC_PATH + bonding_name2num_fpath = \ + sysfs_options_mapper.BONDING_NAME2NUMERIC_PATH return bonding_defaults_fpath, bonding_name2num_fpath -- To view, visit https://gerrit.ovirt.org/79889 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33a6ecc14f6d1a2f7cc9da9bfaff4fad13fa8055 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 4

Change in vdsm[master]: testrunner: mock vdsm.common.constants.P_VDSM
by Code Review 27 Jul '17

27 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: testrunner: mock vdsm.common.constants.P_VDSM ...................................................................... testrunner: mock vdsm.common.constants.P_VDSM As long as we keep vdsm.constants as proxy to vdsm.common.constants, we need to keep them align also when mocked. Change-Id: I39231c2e9d4b883de0294d90f42860d72edc67f4 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/testrunner.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/79911/1 diff --git a/tests/testrunner.py b/tests/testrunner.py index e4dab3b..7586158 100644 --- a/tests/testrunner.py +++ b/tests/testrunner.py @@ -49,6 +49,7 @@ "instead of installed ones.\n") if findRemove(sys.argv, "--local-modules"): from vdsm import constants - constants.P_VDSM = "../vdsm/" + from vdsm.common import common_constants + common_constants.P_VDSM = constants.P_VDSM = "../vdsm/" testlib.run() -- To view, visit https://gerrit.ovirt.org/79911 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39231c2e9d4b883de0294d90f42860d72edc67f4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[ovirt-4.1]: storage: Add LibgfApi support as additional feature
by Code Review 27 Jul '17

27 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: storage: Add LibgfApi support as additional feature ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79605 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0aac04c144ae647aad1c0714379246060f4e991f Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(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: Raz Tamir <ratamir(a)redhat.com> Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: introduce network.constants
by Code Review 27 Jul '17

27 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: introduce network.constants ...................................................................... introduce network.constants This patch places a copy of autoconf-generated P_VDSM_RUN and P_VDSM_LIB inside the network subpackage. This removes the dependency of the network package on the global vdsm.constants module. Change-Id: I8571a806f09195007622d15eff59e72b55042559 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M .gitignore M lib/vdsm/network/Makefile.am M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/connectivity.py M lib/vdsm/network/dhclient_monitor.py M lib/vdsm/network/ifacetracking.py M lib/vdsm/network/link/bond/sysfs_options.py M lib/vdsm/network/link/bond/sysfs_options_mapper.py M lib/vdsm/network/netconfpersistence.py M lib/vdsm/network/netrestore.py M lib/vdsm/network/sourceroute.py M vdsm.spec.in 12 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/79437/1 diff --git a/.gitignore b/.gitignore index 9937872..9300c20 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ lib/vdsm/config.py lib/vdsm/constants.py lib/vdsm/dsaversion.py +lib/vdsm/network/constants.py lib/sos/vdsm.py lib/vdsm/storage/lvm.env lib/vdsm/storage/protect/spmprotect.sh diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am index abf1db6..290af4e 100644 --- a/lib/vdsm/network/Makefile.am +++ b/lib/vdsm/network/Makefile.am @@ -46,3 +46,11 @@ sourceroute.py \ sysctl.py \ $(NULL) + +nodist_vdsmnetwork_PYTHON = \ + constants.py \ + $(NULL) + +EXTRA_DIST = \ + constants.py.in \ + $(NULL) diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index 78fcb26..5b0ef02 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -33,7 +33,6 @@ import six from vdsm.config import config -from vdsm import constants from vdsm import dsaversion from vdsm import hooks from vdsm.common import concurrent @@ -41,6 +40,7 @@ from vdsm.common.conv import tobool from vdsm.network import cmd +from vdsm.network import constants from vdsm.network import ifacetracking from vdsm.network import ipwrapper from vdsm.network import sysctl diff --git a/lib/vdsm/network/connectivity.py b/lib/vdsm/network/connectivity.py index 11e5601..ccd8234 100644 --- a/lib/vdsm/network/connectivity.py +++ b/lib/vdsm/network/connectivity.py @@ -23,9 +23,9 @@ import time import logging -from vdsm import constants from vdsm.common.conv import tobool +from . import constants from . import errors as ne from .errors import ConfigNetworkError diff --git a/lib/vdsm/network/dhclient_monitor.py b/lib/vdsm/network/dhclient_monitor.py index fb6471d..aca0d8f 100644 --- a/lib/vdsm/network/dhclient_monitor.py +++ b/lib/vdsm/network/dhclient_monitor.py @@ -26,8 +26,8 @@ import pyinotify -from vdsm.constants import P_VDSM_RUN from vdsm.common import logutils +from vdsm.network.constants import P_VDSM_RUN from vdsm.network import ifacetracking from vdsm.network.kernelconfig import networks_northbound_ifaces diff --git a/lib/vdsm/network/ifacetracking.py b/lib/vdsm/network/ifacetracking.py index 5b328f4..baf1f2a 100644 --- a/lib/vdsm/network/ifacetracking.py +++ b/lib/vdsm/network/ifacetracking.py @@ -23,7 +23,7 @@ from vdsm.common.fileutils import rm_file from vdsm.common.fileutils import touch_file -from vdsm.constants import P_VDSM_RUN +from vdsm.network.constants import P_VDSM_RUN TRACKED_INTERFACES_FOLDER = os.path.join(P_VDSM_RUN, 'trackedInterfaces') diff --git a/lib/vdsm/network/link/bond/sysfs_options.py b/lib/vdsm/network/link/bond/sysfs_options.py index bf5e93c..eadfbc2 100644 --- a/lib/vdsm/network/link/bond/sysfs_options.py +++ b/lib/vdsm/network/link/bond/sysfs_options.py @@ -24,7 +24,7 @@ import six -from vdsm import constants +from vdsm.network import constants from vdsm.common.cache import memoized BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' diff --git a/lib/vdsm/network/link/bond/sysfs_options_mapper.py b/lib/vdsm/network/link/bond/sysfs_options_mapper.py index 2219ab3..cc2b469 100644 --- a/lib/vdsm/network/link/bond/sysfs_options_mapper.py +++ b/lib/vdsm/network/link/bond/sysfs_options_mapper.py @@ -28,9 +28,9 @@ import six -from vdsm import constants from vdsm.common.cache import memoized +from vdsm.network import constants from vdsm.network.link.bond import sysfs_options from vdsm.network.link.bond.sysfs_driver import BONDING_MASTERS from vdsm.network.link.iface import random_iface_name diff --git a/lib/vdsm/network/netconfpersistence.py b/lib/vdsm/network/netconfpersistence.py index 79095d8..864126d 100644 --- a/lib/vdsm/network/netconfpersistence.py +++ b/lib/vdsm/network/netconfpersistence.py @@ -28,9 +28,9 @@ import six -from vdsm import constants from vdsm.common import fileutils +from vdsm.network import constants from vdsm.network.link.iface import random_iface_name from . import errors as ne diff --git a/lib/vdsm/network/netrestore.py b/lib/vdsm/network/netrestore.py index d2739cf..715401f 100644 --- a/lib/vdsm/network/netrestore.py +++ b/lib/vdsm/network/netrestore.py @@ -25,7 +25,7 @@ import six from vdsm.config import config -from vdsm.constants import P_VDSM_RUN +from vdsm.network.constants import P_VDSM_RUN from vdsm.network import netswitch from vdsm.network.link import setup from vdsm.network.link.bond import Bond diff --git a/lib/vdsm/network/sourceroute.py b/lib/vdsm/network/sourceroute.py index 0d5e47a..a3e4e2d 100644 --- a/lib/vdsm/network/sourceroute.py +++ b/lib/vdsm/network/sourceroute.py @@ -22,7 +22,7 @@ import netaddr from vdsm.common.contextlib import suppress -from vdsm.constants import P_VDSM_RUN +from vdsm.network.constants import P_VDSM_RUN from vdsm.network.ip import route as ip_route from vdsm.network.ip import rule as ip_rule from vdsm.network.ip.route import IPRouteData diff --git a/vdsm.spec.in b/vdsm.spec.in index 8ba16d8..f4fa0e9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1084,6 +1084,7 @@ %{python_sitelib}/%{vdsm_name}/network/canonicalize.py* %{python_sitelib}/%{vdsm_name}/network/cmd.py* %{python_sitelib}/%{vdsm_name}/network/connectivity.py* +%{python_sitelib}/%{vdsm_name}/network/constants.py* %{python_sitelib}/%{vdsm_name}/network/dhclient_monitor.py* %{python_sitelib}/%{vdsm_name}/network/driverloader.py* %{python_sitelib}/%{vdsm_name}/network/ip/*.py* -- To view, visit https://gerrit.ovirt.org/79437 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8571a806f09195007622d15eff59e72b55042559 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 26 Jul '17

26 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.ovirt.org/#/c/79664/3/lib/vdsm/m2cutils.py File lib/vdsm/m2cutils.py: Line 331: excludes = 0 Line 332: Line 333: for no_protocol in config.get('vars', 'ssl_excludes').split(','): Line 334: if no_protocol != '': Line 335: protocol = 'SSL_' + no_protocol.strip() > SSL_OP_NO_TLSv1_1 is not supported. Only two values are supported as specif didn't we say that we'll just support both ..? you agreed. just add the SSL_ prefix if it was not provided. But I don't mind to restrict it. Line 336: if protocol == 'SSL_OP_NO_TLSv1_1': Line 337: # not all m2crypto provide this constant Line 338: excludes |= 268435456 Line 339: else: -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: Revert "Revert "storage: Made diskType a real property.""
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: Revert "Revert "storage: Made diskType a real property."" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79800 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id98229bd3705fc056d54d9eb536d74c7b7729f47 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: Revert "Revert "storage: Added disk type change logging""
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: Revert "Revert "storage: Added disk type change logging"" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79801 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia2e875c82b672384d04b23907292a8b7dfd5dcc3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: storage: Add LibgfApi support as additional feature
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: storage: Add LibgfApi support as additional feature ...................................................................... Patch Set 3: Code-Review-1 the bug is set for 4.1.5. let's stall this patch until 4.1.4 is out. otherwise, we may need to fork out ovirt-4.1.4 branch. -- To view, visit https://gerrit.ovirt.org/79605 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0aac04c144ae647aad1c0714379246060f4e991f Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(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: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: introduce common.constants
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: introduce common.constants ...................................................................... introduce common.constants Several constants are used by all vdsm subsystems. This patch itroduces common.constants to host them. I do not simply move vdsm.constants into vdsm.common.constants in order to scrutinize better which constants are placed in common. Change-Id: I8568a806f9195007620d15eff59e72b55042557b Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M .gitignore M lib/vdsm/common/Makefile.am A lib/vdsm/common/constants.py.in M lib/vdsm/constants.py.in 4 files changed, 40 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/79692/1 diff --git a/.gitignore b/.gitignore index e334131..7786c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ init/systemd/vdsm-tmpfiles.d.conf init/vdsmd_init_common.sh lib/vdsm/api/vdsm-api.html +lib/vdsm/common/constants.py lib/vdsm/config.py lib/vdsm/constants.py lib/vdsm/dsaversion.py diff --git a/lib/vdsm/common/Makefile.am b/lib/vdsm/common/Makefile.am index a7ed5da..447e4e8 100644 --- a/lib/vdsm/common/Makefile.am +++ b/lib/vdsm/common/Makefile.am @@ -21,4 +21,13 @@ SUBDIRS = network vdsmcommondir = $(vdsmpylibdir)/common + +nodist_vdsmcommon_PYTHON = \ + constants.py \ + $(NULL) + dist_vdsmcommon_PYTHON = *.py + +EXTRA_DIST = \ + constants.py.in \ + $(NULL) diff --git a/lib/vdsm/common/constants.py.in b/lib/vdsm/common/constants.py.in new file mode 100644 index 0000000..e657f06 --- /dev/null +++ b/lib/vdsm/common/constants.py.in @@ -0,0 +1,26 @@ +# +# Copyright 2009-2017 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +from __future__ import absolute_import + +P_VDSM = '@VDSMDIR@/' # NOQA: E501 (potentially long line) +P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line) +P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line) +P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 32c87d9..7b2a055 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -23,6 +23,10 @@ from __future__ import absolute_import import os +from vdsm.common.constants import ( # NOQA: F401 (intentionally exposed here) + P_VDSM, P_VDSM_HOOKS, P_VDSM_LIB, + P_VDSM_RUN) + GLUSTER_MGMT_ENABLED = bool(@GLUSTER_MGMT@) # SMBIOS manufacturer @@ -72,10 +76,6 @@ # P_LIBVIRT_VMCHANNELS = '/var/lib/libvirt/qemu/channels/' P_OVIRT_VMCONSOLES = '/var/run/ovirt-vmconsole-console/' -P_VDSM = '@VDSMDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) P_VDSM_STORAGE = os.path.join(P_VDSM_RUN, 'storage/') P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) P_VDSM_KEYS = '/etc/pki/vdsm/keys/' -- To view, visit https://gerrit.ovirt.org/79692 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8568a806f9195007620d15eff59e72b55042557b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[master]: net.tc_tests: mock BONDING_DEFAULTS
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net.tc_tests: mock BONDING_DEFAULTS ...................................................................... net.tc_tests: mock BONDING_DEFAULTS I don't really understand how this popped up suddely, but various tc_tests failed on CI due to trying to read from /usr/share/vdsm/bonding-defaults.json Change-Id: I99824c5b1fad63b5f07b4ad40c3e134cc98d91c6 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/network/tc_test.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/02/79702/1 diff --git a/tests/network/tc_test.py b/tests/network/tc_test.py index 4cb8aa6..dd9b3a3 100644 --- a/tests/network/tc_test.py +++ b/tests/network/tc_test.py @@ -400,6 +400,7 @@ @MonkeyClass(libvirtconnection, 'get', Connection) @expandPermutations +(a)mock.patch.object(sysfs_options, 'BONDING_DEFAULTS', bonding_default_fpath()) class TestConfigureOutbound(TestCaseBase): def setUp(self): self.device = Dummy() -- To view, visit https://gerrit.ovirt.org/79702 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99824c5b1fad63b5f07b4ad40c3e134cc98d91c6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 1

Change in vdsm[master]: net tests: Patch BONDING_DEFAULTS on package level
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79810 ) Change subject: net tests: Patch BONDING_DEFAULTS on package level ...................................................................... net tests: Patch BONDING_DEFAULTS on package level Multiple tests are dependent on BONDING_DEFAULTS. Several tests (see tc_test module) are dependent on the bonding defaults but do not specify it (by patching it). These tests have been passing so far by chance: one of the patched tests have been chosen to run first. If an unpatched test runs first, it will fail. This patch is patching the BONDING_DEFAULTS at package level once, removing the need to patch individual tests. Change-Id: I7ea0c3783b4b9224320dc643b801d93808b14fee Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M tests/network/__init__.py M tests/network/link_bond_test.py M tests/network/models_test.py M tests/network/netinfo_test.py 4 files changed, 18 insertions(+), 13 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ea0c3783b4b9224320dc643b801d93808b14fee Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net tests: Patch BONDING_DEFAULTS on package level
by Code Review 26 Jul '17

26 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net tests: Patch BONDING_DEFAULTS on package level ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79810 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7ea0c3783b4b9224320dc643b801d93808b14fee Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 25 Jul '17

25 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/79664/3/lib/vdsm/m2cutils.py File lib/vdsm/m2cutils.py: Line 331: excludes = 0 Line 332: Line 333: for no_protocol in config.get('vars', 'ssl_excludes').split(','): Line 334: if no_protocol != '': Line 335: protocol = 'SSL_' + no_protocol.strip() if user entered SSL_OP_NO_TLSv1_1 now you have a bug Line 336: if protocol == 'SSL_OP_NO_TLSv1_1': Line 337: # not all m2crypto provide this constant Line 338: excludes |= 268435456 Line 339: else: -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: move constants.P_VDSM_STORAGE to storage.constants
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.P_VDSM_STORAGE to storage.constants ...................................................................... move constants.P_VDSM_STORAGE to storage.constants Change-Id: I4bf8cbe4a8c435d93e7683336d5334880de1a811 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/storage/blockSD.py M lib/vdsm/storage/constants.py M lib/vdsm/storage/fileSD.py M lib/vdsm/storage/sd.py 5 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/79741/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index f851065..66c669b 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -63,7 +63,6 @@ P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line) P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_STORAGE = os.path.join(P_VDSM_RUN, 'storage/') P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/storage/blockSD.py b/lib/vdsm/storage/blockSD.py index 90844c8..44d721d 100644 --- a/lib/vdsm/storage/blockSD.py +++ b/lib/vdsm/storage/blockSD.py @@ -901,7 +901,7 @@ """ Remove /run/vdsm/storage/sdUUID/imgUUID/volUUID """ - vol_run_link = os.path.join(constants.P_VDSM_STORAGE, + vol_run_link = os.path.join(sc.P_VDSM_STORAGE, self.sdUUID, imgUUID, volUUID) self.log.info("Unlinking volme runtime link: %r", vol_run_link) try: @@ -1312,7 +1312,7 @@ srcImgPath: Dir where the image volumes are. """ - sdRunDir = os.path.join(constants.P_VDSM_STORAGE, self.sdUUID) + sdRunDir = os.path.join(sc.P_VDSM_STORAGE, self.sdUUID) imgRunDir = os.path.join(sdRunDir, imgUUID) fileUtils.createdir(imgRunDir) for volUUID in volUUIDs: diff --git a/lib/vdsm/storage/constants.py b/lib/vdsm/storage/constants.py index 2fb929b..e282c2f 100644 --- a/lib/vdsm/storage/constants.py +++ b/lib/vdsm/storage/constants.py @@ -196,3 +196,5 @@ # accepts currently its all of the version but in the # future we might slice it (eg. tuple(DOMAIN_VERSION[1:])) SUPPORTED_DOMAIN_VERSIONS = DOMAIN_VERSIONS + +P_VDSM_STORAGE = os.path.join(constants.P_VDSM_RUN, 'storage/') diff --git a/lib/vdsm/storage/fileSD.py b/lib/vdsm/storage/fileSD.py index b9160d0..861b299 100644 --- a/lib/vdsm/storage/fileSD.py +++ b/lib/vdsm/storage/fileSD.py @@ -545,7 +545,7 @@ srcImgPath: Dir where the image volumes are. """ - sdRunDir = os.path.join(constants.P_VDSM_STORAGE, self.sdUUID) + sdRunDir = os.path.join(sc.P_VDSM_STORAGE, self.sdUUID) fileUtils.createdir(sdRunDir) imgRunDir = os.path.join(sdRunDir, imgUUID) self.log.debug("Creating symlink from %s to %s", srcImgPath, imgRunDir) diff --git a/lib/vdsm/storage/sd.py b/lib/vdsm/storage/sd.py index d66a1a2..5b9ece0 100644 --- a/lib/vdsm/storage/sd.py +++ b/lib/vdsm/storage/sd.py @@ -979,7 +979,7 @@ getLinkBCImagePath = getImageDir def getImageRundir(self, imgUUID): - return os.path.join(constants.P_VDSM_STORAGE, self.sdUUID, imgUUID) + return os.path.join(sc.P_VDSM_STORAGE, self.sdUUID, imgUUID) def getIsoDomainImagesDir(self): return self._manifest.getIsoDomainImagesDir() -- To view, visit https://gerrit.ovirt.org/79741 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bf8cbe4a8c435d93e7683336d5334880de1a811 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[master]: drop constants.EXT_PYTHON
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: drop constants.EXT_PYTHON ...................................................................... drop constants.EXT_PYTHON commands_test can use any python, and gluster.gfapi's ugly hack may well use its own private cconstant. Change-Id: I826a89d4b63f0b4217173795638600a533a82f5c Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/gluster/gfapi.py M tests/commands_test.py 3 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/79733/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index a123a26..f851065 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -105,8 +105,6 @@ EXT_NICE = '@NICE_PATH@' -EXT_PYTHON = '@PYTHON@' - EXT_SETSID = '@SETSID_PATH@' EXT_SH = '/bin/sh' # The shell path is invariable EXT_SU = '@SU_PATH@' diff --git a/lib/vdsm/gluster/gfapi.py b/lib/vdsm/gluster/gfapi.py index cafb9e0..4976a53 100644 --- a/lib/vdsm/gluster/gfapi.py +++ b/lib/vdsm/gluster/gfapi.py @@ -27,6 +27,7 @@ from . import gluster_mgmt_api +EXT_PYTHON = '/usr/bin/python2' GLUSTER_VOL_PROTOCOL = 'tcp' GLUSTER_VOL_HOST = 'localhost' GLUSTER_VOL_PORT = 24007 @@ -217,7 +218,7 @@ port=GLUSTER_VOL_PORT, protocol=GLUSTER_VOL_PROTOCOL): module = "vdsm.gluster.gfapi" - command = [constants.EXT_PYTHON, '-m', module, '-v', volumeName, + command = [EXT_PYTHON, '-m', module, '-v', volumeName, '-p', str(port), '-H', host, '-t', protocol, '-c', 'statvfs'] # to include /usr/share/vdsm in python path @@ -248,7 +249,7 @@ port=GLUSTER_VOL_PORT, protocol=GLUSTER_VOL_PROTOCOL): module = "gluster.gfapi" - command = [constants.EXT_PYTHON, '-m', module, '-v', volumeName, + command = [EXT_PYTHON, '-m', module, '-v', volumeName, '-p', str(port), '-H', host, '-t', protocol, '-c', 'readdir'] # to include /usr/share/vdsm in python path diff --git a/tests/commands_test.py b/tests/commands_test.py index 8b12357..b7f42db 100644 --- a/tests/commands_test.py +++ b/tests/commands_test.py @@ -58,7 +58,7 @@ @permutations(CMD_TYPES) def testSetSid(self, cmd): - cmd_args = (constants.EXT_PYTHON, '-c', + cmd_args = ('python', '-c', 'import os; print os.getsid(os.getpid())') rc, out, _ = commands.execCmd(cmd(cmd_args), setsid=True) self.assertNotEquals(int(out[0]), os.getsid(os.getpid())) -- To view, visit https://gerrit.ovirt.org/79733 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I826a89d4b63f0b4217173795638600a533a82f5c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 4

Change in vdsm[master]: move constants.SUPPORTED_DOMAIN_VERSIONS to storage.constants
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.SUPPORTED_DOMAIN_VERSIONS to storage.constants ...................................................................... move constants.SUPPORTED_DOMAIN_VERSIONS to storage.constants DOMAIN_VERSIONS and SUPPORTED_DOMAIN_VERSIONS belong to storage subsystem. Change-Id: Ib8ed048c8f36964a209186ebfefd62a899700277 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/API.py M lib/vdsm/constants.py.in M lib/vdsm/storage/constants.py M lib/vdsm/storage/hsm.py M lib/vdsm/storage/sd.py 5 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/79732/1 diff --git a/lib/vdsm/API.py b/lib/vdsm/API.py index 8e7f745..0bbfb45 100644 --- a/lib/vdsm/API.py +++ b/lib/vdsm/API.py @@ -932,7 +932,7 @@ return self._irs.attachStorageDomain(self._UUID, storagepoolID) def create(self, domainType, typeArgs, name, domainClass, - version=constants.SUPPORTED_DOMAIN_VERSIONS[0]): + version=sc.SUPPORTED_DOMAIN_VERSIONS[0]): return self._irs.createStorageDomain(domainType, self._UUID, name, typeArgs, domainClass, version) diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 68c8b7a..a123a26 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -51,16 +51,6 @@ # Libvirt selinux LIBVIRT_SELINUX = '@ENABLE_LIBVIRT_SELINUX@' == 'yes' - -# This is the domain version translation list -# DO NOT CHANGE OLD VALUES ONLY APPEND -DOMAIN_VERSIONS = (0, 2, 3, 4) - -# This contains the domains versions that this VDSM -# accepts currently its all of the version but in the -# future we might slice it (eg. tuple(DOMAIN_VERSION[1:])) -SUPPORTED_DOMAIN_VERSIONS = DOMAIN_VERSIONS - MEGAB = 2 ** 20 # = 1024 ** 2 = 1 MiB GIB = 1024 * MEGAB diff --git a/lib/vdsm/storage/constants.py b/lib/vdsm/storage/constants.py index d08f688..8ee108e 100644 --- a/lib/vdsm/storage/constants.py +++ b/lib/vdsm/storage/constants.py @@ -185,3 +185,13 @@ TAG_PREFIX_IMAGE, TAG_PREFIX_MD, TAG_PREFIX_MDNUMBLKS] + + +# This is the domain version translation list +# DO NOT CHANGE OLD VALUES ONLY APPEND +DOMAIN_VERSIONS = (0, 2, 3, 4) + +# This contains the domains versions that this VDSM +# accepts currently its all of the version but in the +# future we might slice it (eg. tuple(DOMAIN_VERSION[1:])) +SUPPORTED_DOMAIN_VERSIONS = DOMAIN_VERSIONS diff --git a/lib/vdsm/storage/hsm.py b/lib/vdsm/storage/hsm.py index 3d04b80..418ff6f 100644 --- a/lib/vdsm/storage/hsm.py +++ b/lib/vdsm/storage/hsm.py @@ -2489,7 +2489,7 @@ @public def createStorageDomain(self, storageType, sdUUID, domainName, typeSpecificArg, domClass, - domVersion=constants.SUPPORTED_DOMAIN_VERSIONS[0], + domVersion=sc.SUPPORTED_DOMAIN_VERSIONS[0], options=None): """ Creates a new storage domain. diff --git a/lib/vdsm/storage/sd.py b/lib/vdsm/storage/sd.py index d1964ba..d66a1a2 100644 --- a/lib/vdsm/storage/sd.py +++ b/lib/vdsm/storage/sd.py @@ -206,7 +206,7 @@ def validateDomainVersion(version): - if version not in constants.SUPPORTED_DOMAIN_VERSIONS: + if version not in sc.SUPPORTED_DOMAIN_VERSIONS: raise se.UnsupportedDomainVersion(version) -- To view, visit https://gerrit.ovirt.org/79732 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8ed048c8f36964a209186ebfefd62a899700277 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[master]: move constants.SUPPORTED_BLOCKSIZE to its sole user
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.SUPPORTED_BLOCKSIZE to its sole user ...................................................................... move constants.SUPPORTED_BLOCKSIZE to its sole user Change-Id: I2845bd782b2641accfa1b3bd27a6a47c5723ae06 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/storage/lvm.py 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/79731/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 2d16d31..68c8b7a 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -55,7 +55,6 @@ # This is the domain version translation list # DO NOT CHANGE OLD VALUES ONLY APPEND DOMAIN_VERSIONS = (0, 2, 3, 4) -SUPPORTED_BLOCKSIZE = (512,) # This contains the domains versions that this VDSM # accepts currently its all of the version but in the diff --git a/lib/vdsm/storage/lvm.py b/lib/vdsm/storage/lvm.py index 3421d20..7d26d9c 100644 --- a/lib/vdsm/storage/lvm.py +++ b/lib/vdsm/storage/lvm.py @@ -71,6 +71,8 @@ LV_ATTR = namedtuple("LV_ATTR", LV_ATTR_BITS) Stub = namedtuple("Stub", "name, stale") +SUPPORTED_BLOCKSIZE = (512,) + class Unreadable(Stub): __slots__ = () @@ -1095,7 +1097,7 @@ pvBlkSize = _getpvblksize(pv) logPvBlkSize, phyPvBlkSize = pvBlkSize - if logPvBlkSize not in constants.SUPPORTED_BLOCKSIZE: + if logPvBlkSize not in SUPPORTED_BLOCKSIZE: raise se.DeviceBlockSizeError(pvBlkSize) if phyPvBlkSize < logPvBlkSize: -- To view, visit https://gerrit.ovirt.org/79731 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2845bd782b2641accfa1b3bd27a6a47c5723ae06 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 4

Change in vdsm[master]: Makefile: replace astrisks with equal signs
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: Makefile: replace astrisks with equal signs ...................................................................... Makefile: replace astrisks with equal signs Tripple astrisks are used to mark failures in make and other utilities. Let us use '===' instead for comments. Change-Id: I0a7f41effd11152195ff4bd7e499ca585fd3349f Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/Makefile.am 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/79750/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 464850f..734e80d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -304,16 +304,16 @@ @true check-net: - @echo '*** Running networking tests. ***' + @echo '=== Running networking tests. ===' @$(top_srcdir)/tests/run_tests_local.sh $(network_modules) check-virt: - @echo '*** Running virt tests. ***' + @echo '=== Running virt tests. ===' @$(top_srcdir)/tests/run_tests_local.sh $(virt_modules) check: - @echo '*** Running tests. To skip this step place NOSE_EXCLUDE=.* ***' - @echo '*** into your environment. Do not submit untested code! ***' + @echo '=== Running tests. To skip this step place NOSE_EXCLUDE=.* ===' + @echo '=== into your environment. Do not submit untested code! ===' $(top_srcdir)/tests/run_tests_local.sh $(run_modules) if [ "$(PYTHON3_SUPPORT)" == "1" ]; then \ all_modules=`mktemp`; \ -- To view, visit https://gerrit.ovirt.org/79750 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a7f41effd11152195ff4bd7e499ca585fd3349f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 4

Change in vdsm[master]: move constants.P_VDSM_CONF to vdsm.config
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.P_VDSM_CONF to vdsm.config ...................................................................... move constants.P_VDSM_CONF to vdsm.config Change-Id: Ic0ba7de6aae8331a3587d82eadf16346437cafb6 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/config.py.in M lib/vdsm/constants.py.in M lib/vdsm/vdsmd.py 3 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/79742/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index d7b4cfc..06245a4 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -43,8 +43,8 @@ import textwrap import glob -_SYSCONFDIR = '@sysconfdir@' -_DROPPIN_BASES = ("/usr/lib/", "/run/", _SYSCONFDIR) +P_VDSM_CONF = '@sysconfdir@' +_DROPPIN_BASES = ("/usr/lib/", "/run/", P_VDSM_CONF) parameters = [ @@ -617,7 +617,7 @@ or users can overwrite the defaults, by placing a complete or partial configuration file into /etc or a drop-in directory. """ - default_conf = os.path.join(_SYSCONFDIR, name, name + '.conf') + default_conf = os.path.join(P_VDSM_CONF, name, name + '.conf') cfg.read(default_conf) dropins = [] diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 66c669b..72d4a67 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -63,7 +63,6 @@ P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line) P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/vdsmd.py b/lib/vdsm/vdsmd.py index ee734bc..75049e1 100755 --- a/lib/vdsm/vdsmd.py +++ b/lib/vdsm/vdsmd.py @@ -50,7 +50,7 @@ from vdsm.virt import periodic -loggerConfFile = constants.P_VDSM_CONF + 'logger.conf' +loggerConfFile = os.path.join(config.P_VDSM_CONF, 'logger.conf') class FatalError(Exception): -- To view, visit https://gerrit.ovirt.org/79742 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0ba7de6aae8331a3587d82eadf16346437cafb6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: network: add IPAddressApi and its iproute implementation
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/76153 ) Change subject: network: add IPAddressApi and its iproute implementation ...................................................................... network: add IPAddressApi and its iproute implementation Change-Id: I8f90df4142aee11cf1cba1293fb89ebc7cace1ac Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M automation/check-merged.packages.el7 M automation/check-merged.packages.fc24 M automation/check-patch.packages.el7 M automation/check-patch.packages.fc24 M automation/check-patch.packages.fc25 M docker/Dockerfile.centos M docker/Dockerfile.fedora.25 M docker/Dockerfile.fedora.rawhide M lib/vdsm/network/ip/address/__init__.py A lib/vdsm/network/ip/address/iproute2.py M lib/vdsm/network/ipwrapper.py M tests/network/ip_address_test.py M vdsm.spec.in 13 files changed, 445 insertions(+), 19 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/76153 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f90df4142aee11cf1cba1293fb89ebc7cace1ac Gerrit-PatchSet: 30 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: RPC: Refactor JSON RPC exceptions
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78660 ) Change subject: RPC: Refactor JSON RPC exceptions ...................................................................... RPC: Refactor JSON RPC exceptions JsonRpcError class is now derived from ContextException and other derived exceptions use the context to provide more information. For example, new error message for JsonRpcMethodNotFoundError is: The method does not exist or is not available: {'method': 'some_missing_method'} Also added a new class JsonRpcServerError, that can have any code and message. Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958 Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com> --- M lib/vdsm/common/exception.py M lib/vdsm/jsonrpcvdscli.py M lib/vdsm/rpc/Bridge.py M lib/yajsonrpc/__init__.py M tests/bridge_test.py M tests/integration/jsonRpcTests.py M tests/stomp_test.py M tests/vdsmapi_test.py 8 files changed, 97 insertions(+), 91 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Nir Soffer: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Andrej Krejcir: Verified -- To view, visit https://gerrit.ovirt.org/78660 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958 Gerrit-PatchSet: 37 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: RPC: Fix error messages in JsonRpcResponse
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79665 ) Change subject: RPC: Fix error messages in JsonRpcResponse ...................................................................... RPC: Fix error messages in JsonRpcResponse JsonRpcResponse.error is now always an exception object derived from JsonRpcError. Previously it could also be a dictionary which caused problems. Change-Id: Ie9a4b318dfca66e8b50eb44fe9a24fb43ee32275 Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com> --- M lib/vdsm/client.py M lib/vdsm/jsonrpcvdscli.py M lib/yajsonrpc/__init__.py M tests/integration/jsonRpcTests.py 4 files changed, 9 insertions(+), 8 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Nir Soffer: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Andrej Krejcir: Verified -- To view, visit https://gerrit.ovirt.org/79665 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9a4b318dfca66e8b50eb44fe9a24fb43ee32275 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: sslutils: add info to SSLHandshake errors
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: sslutils: add info to SSLHandshake errors ...................................................................... sslutils: add info to SSLHandshake errors Include name of peer and its full certificate if they do not match, in order to understand which non-legitimate client attempts to connect. Change-Id: I0cb2d7e0c6c86ca12a34be13b07bc960e3ad313e Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/sslutils.py 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/76221/1 diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py index 10fc172..8c349ca 100644 --- a/lib/vdsm/sslutils.py +++ b/lib/vdsm/sslutils.py @@ -219,9 +219,12 @@ if self._is_handshaking: self._handshake(dispatcher) else: - if not self._verify_host(dispatcher.socket.getpeercert(), - dispatcher.socket.getpeername()[0]): - self.log.error("peer certificate does not match host name") + peercert = dispatcher.socket.getpeercert() + peername = dispatcher.socket.getpeername()[0] + if not self._verify_host(peercert, peername): + self.log.error( + "peer certificate '%s' does not match host name '%s'", + peercert, peername) dispatcher.socket.close() return -- To view, visit https://gerrit.ovirt.org/76221 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cb2d7e0c6c86ca12a34be13b07bc960e3ad313e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 24 Jul '17

24 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/79664/2//COMMIT_MSG Commit Message: Line 9: M2crypto uses the same name scheme as openssl which differs from ssl Line 10: module. SSL_OP_NO_TLSv1_1 is not available on some of m2c versions. Line 11: Line 12: Line 13: Label: ovirt-4.1-only > There is no need to write anything about m2c being removed from master. sounds reasonable to me to say why its ovirt-4.1 only.. but as you wish Line 14: Bug-Url: https://bugzilla.redhat.com/1473344 Line 15: Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: ssl: handle handshake errors
by Code Review 24 Jul '17

24 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: handle handshake errors ...................................................................... Patch Set 4: (2 comments) https://gerrit.ovirt.org/#/c/79668/4//COMMIT_MSG Commit Message: Line 5: CommitDate: 2017-07-24 12:08:16 +0200 Line 6: Line 7: ssl: handle handshake errors Line 8: Line 9: We need to make sure to close socket when handshake fails. what happened otherwise? Line 10: Line 11: Line 12: Bug-url: https://bugzilla.redhat.com/1473295 Line 13: Change-Id: I99cfa35e608f429640455c35495be1783854e3da https://gerrit.ovirt.org/#/c/79668/4/lib/vdsm/sslutils.py File lib/vdsm/sslutils.py: Line 250: self.want_read = True Line 251: elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE: Line 252: self.want_write = True Line 253: else: Line 254: dispatcher.close() don't we need the above treatment ? Line 255: except socket.error: Line 256: dispatcher.close() Line 257: else: Line 258: self.want_read = self.want_write = True -- To view, visit https://gerrit.ovirt.org/79668 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I99cfa35e608f429640455c35495be1783854e3da Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: move constants.EXT_BRCTL to its sole current user
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.EXT_BRCTL to its sole current user ...................................................................... move constants.EXT_BRCTL to its sole current user EXT_BRCTL is not going to move anytime soon from /usr/sbin/brctl. This patch defines this constant inside its sole current user, dummybr. Change-Id: Icaaf576d5d3456935fa848c04bd65517d09b37ed Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M configure.ac M lib/vdsm/constants.py.in M lib/vdsm/tool/dummybr.py 3 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/79717/1 diff --git a/configure.ac b/configure.ac index 41c7c10..df28741 100644 --- a/configure.ac +++ b/configure.ac @@ -323,7 +323,6 @@ AX_PYTHON_MODULE([six], [fatal], python2) # External programs (sorted, please keep in order) -AC_PATH_PROG([BRCTL_PATH], [brctl], [/usr/sbin/brctl]) AC_PATH_PROG([CAT_PATH], [cat], [/bin/cat]) AC_PATH_PROG([CHCON_PATH], [chcon], [/bin/chcon]) AC_PATH_PROG([CHMOD_PATH], [chmod], [/bin/chmod]) diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index b6193f6..a0cbe86 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -90,8 +90,6 @@ # # External programs (sorted, please keep in order). # -EXT_BRCTL = '@BRCTL_PATH@' - EXT_CHOWN = '@CHOWN_PATH@' EXT_DD = '@DD_PATH@' diff --git a/lib/vdsm/tool/dummybr.py b/lib/vdsm/tool/dummybr.py index 4356fe1..84a1af7 100644 --- a/lib/vdsm/tool/dummybr.py +++ b/lib/vdsm/tool/dummybr.py @@ -22,12 +22,14 @@ import os from vdsm.network.api import DUMMY_BRIDGE -from .. import libvirtconnection, commands, constants +from .. import libvirtconnection, commands from . import expose, ExtraArgsError + +EXT_BRCTL = '/usr/sbin/brctl' def createEphemeralBridge(bridgeName): - rc, out, err = commands.execCmd([constants.EXT_BRCTL, 'addbr', bridgeName]) + rc, out, err = commands.execCmd([EXT_BRCTL, 'addbr', bridgeName]) if rc != 0: raise EnvironmentError( 'Failed to create ephemeral dummy bridge. Err: %s' % err -- To view, visit https://gerrit.ovirt.org/79717 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icaaf576d5d3456935fa848c04bd65517d09b37ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 4

Change in vdsm[master]: hook: checkimages: define GiB properly
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: hook: checkimages: define GiB properly ...................................................................... hook: checkimages: define GiB properly The constant is called GIB, but the value was that of the plain decimal GB. Change-Id: I96085ece34026dd67158a320b8dff3f9f73be927 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm_hooks/checkimages/before_vm_start.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/79730/1 diff --git a/vdsm_hooks/checkimages/before_vm_start.py b/vdsm_hooks/checkimages/before_vm_start.py index e024dd3..31b123d 100755 --- a/vdsm_hooks/checkimages/before_vm_start.py +++ b/vdsm_hooks/checkimages/before_vm_start.py @@ -10,7 +10,7 @@ BLKGETSIZE64 = 0x80081272 # Obtain device size in bytes FORMAT = 'L' TIMEPERGIB = 0.02 # Approximate qemu-img check time (in seconds) to check 1GiB -GIB = 10 ** 9 # GiB +GIB = 2 ** 30 # GiB ''' checkimages vdsm hook -- To view, visit https://gerrit.ovirt.org/79730 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96085ece34026dd67158a320b8dff3f9f73be927 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[master]: move vdsm.constants.UUID_GLOB_PATTERN to storage.constants
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move vdsm.constants.UUID_GLOB_PATTERN to storage.constants ...................................................................... move vdsm.constants.UUID_GLOB_PATTERN to storage.constants UUID_GLOB_PATTERN is used only by storage, and should be defined there as well. Change-Id: If50684c256ff3e732ea1f058fe7b48b9becd3ac6 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/storage/constants.py M lib/vdsm/storage/fileSD.py M lib/vdsm/storage/sd.py M lib/vdsm/storage/sp.py 5 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/79714/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 7ad3eb1..6be6b57 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -62,8 +62,6 @@ # future we might slice it (eg. tuple(DOMAIN_VERSION[1:])) SUPPORTED_DOMAIN_VERSIONS = DOMAIN_VERSIONS -UUID_GLOB_PATTERN = '*-*-*-*-*' - MEGAB = 2 ** 20 # = 1024 ** 2 = 1 MiB GIB = 1024 * MEGAB diff --git a/lib/vdsm/storage/constants.py b/lib/vdsm/storage/constants.py index 85fc536..d08f688 100644 --- a/lib/vdsm/storage/constants.py +++ b/lib/vdsm/storage/constants.py @@ -92,6 +92,8 @@ BLANK_UUID = "00000000-0000-0000-0000-000000000000" +UUID_GLOB_PATTERN = '*-*-*-*-*' + def fmt2str(format): return FMT2STR[format] diff --git a/lib/vdsm/storage/fileSD.py b/lib/vdsm/storage/fileSD.py index 9964f65..b9160d0 100644 --- a/lib/vdsm/storage/fileSD.py +++ b/lib/vdsm/storage/fileSD.py @@ -41,7 +41,7 @@ from vdsm import constants from vdsm.utils import stripNewLines -from vdsm.storage.constants import LEASE_FILEEXT +from vdsm.storage.constants import LEASE_FILEEXT, UUID_GLOB_PATTERN from vdsm import supervdsm REMOTE_PATH = "REMOTE_PATH" @@ -329,7 +329,7 @@ """ # Get Volumes of an image pattern = os.path.join(self.mountpoint, self.sdUUID, sd.DOMAIN_IMAGES, - constants.UUID_GLOB_PATTERN) + UUID_GLOB_PATTERN) files = self.oop.glob.glob(pattern) images = set() for i in files: @@ -792,7 +792,7 @@ # possibleDomain that we pass to glob. metaFiles = oop.getProcessPool(possibleDomain).glob.glob( os.path.join(glob_escape(possibleDomain), - constants.UUID_GLOB_PATTERN, + UUID_GLOB_PATTERN, sd.DOMAIN_META_DATA)) for metaFile in metaFiles: diff --git a/lib/vdsm/storage/sd.py b/lib/vdsm/storage/sd.py index b121ef9..d1964ba 100644 --- a/lib/vdsm/storage/sd.py +++ b/lib/vdsm/storage/sd.py @@ -915,7 +915,7 @@ def getVMsList(self): vmsPath = self.getVMsDir() # find out VMs list - VM_PATTERN = os.path.join(vmsPath, constants.UUID_GLOB_PATTERN) + VM_PATTERN = os.path.join(vmsPath, sc.UUID_GLOB_PATTERN) vms = self.oop.glob.glob(VM_PATTERN) vmList = [os.path.basename(i) for i in vms] self.log.info("vmList=%s", str(vmList)) diff --git a/lib/vdsm/storage/sp.py b/lib/vdsm/storage/sp.py index e39cbc3..e63e826 100644 --- a/lib/vdsm/storage/sp.py +++ b/lib/vdsm/storage/sp.py @@ -1278,7 +1278,7 @@ fileUtils.createdir(self.poolPath) # Find out all domains for future cleanup - domainpat = os.path.join(self.poolPath, constants.UUID_GLOB_PATTERN) + domainpat = os.path.join(self.poolPath, sc.UUID_GLOB_PATTERN) oldLinks = set(iglob(domainpat)) # We should not rebuild non-active domains, because -- To view, visit https://gerrit.ovirt.org/79714 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If50684c256ff3e732ea1f058fe7b48b9becd3ac6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: move constants.P_VDSM_NODE_ID to its sole user
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: move constants.P_VDSM_NODE_ID to its sole user ...................................................................... move constants.P_VDSM_NODE_ID to its sole user Change-Id: Iae0a734fa9903d978e6e6ce1a03ce86cbc898e83 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/host/__init__.py 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/79715/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 6be6b57..b6193f6 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -79,7 +79,6 @@ P_VDSM_KEYS = '/etc/pki/vdsm/keys/' P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) -P_VDSM_NODE_ID = '/etc/vdsm/vdsm.id' P_VDSM_EXEC = '@LIBEXECDIR@' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/host/__init__.py b/lib/vdsm/host/__init__.py index 5bcd572..14e01b8 100644 --- a/lib/vdsm/host/__init__.py +++ b/lib/vdsm/host/__init__.py @@ -27,14 +27,16 @@ from vdsm import constants from vdsm import cpuarch +P_VDSM_NODE_ID = '/etc/vdsm/vdsm.id' + @memoized def uuid(): host_UUID = None try: - if os.path.exists(constants.P_VDSM_NODE_ID): - with open(constants.P_VDSM_NODE_ID) as f: + if os.path.exists(P_VDSM_NODE_ID): + with open(P_VDSM_NODE_ID) as f: host_UUID = f.readline().replace("\n", "") else: arch = cpuarch.real() -- To view, visit https://gerrit.ovirt.org/79715 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae0a734fa9903d978e6e6ce1a03ce86cbc898e83 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: janitorial: drop once-used P_VDSM_KEYS
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: janitorial: drop once-used P_VDSM_KEYS ...................................................................... janitorial: drop once-used P_VDSM_KEYS We have another name for the same constant, PKI_DIR. Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/tool/configurators/passwd.py 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/77468/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 7c0d209..1891a49 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -82,7 +82,6 @@ P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) P_VDSM_STORAGE = os.path.join(P_VDSM_RUN, 'storage/') P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_KEYS = '/etc/pki/vdsm/keys/' P_VDSM_CLIENT_LOG = '@VDSMRUNDIR@/client.log' # NOQA: E501 (potentially long line) P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/tool/configurators/passwd.py b/lib/vdsm/tool/configurators/passwd.py index 9a3b793..fe62860 100644 --- a/lib/vdsm/tool/configurators/passwd.py +++ b/lib/vdsm/tool/configurators/passwd.py @@ -35,7 +35,7 @@ "/usr/sbin/saslpasswd2", ) SASL_USERNAME = "vdsm@ovirt" -LIBVIRT_PASSWORD_PATH = constants.P_VDSM_KEYS + 'libvirt_password' +LIBVIRT_PASSWORD_PATH = constants.PKI_DIR + 'libvirt_password' def isconfigured(): -- To view, visit https://gerrit.ovirt.org/77468 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 7

Change in vdsm[master]: tool: clear networks configured by VDSM
by Code Review 23 Jul '17

23 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: tool: clear networks configured by VDSM ...................................................................... Patch Set 4: (2 comments) https://gerrit.ovirt.org/#/c/79495/4//COMMIT_MSG Commit Message: PS4, Line 10: but default route > So if the management is not really with the default route, then we loose th ack for a compulsory argument. When it is not supplied by the user, the error message prints the default route network as a suggestion. https://gerrit.ovirt.org/#/c/79495/4/lib/vdsm/tool/network.py File lib/vdsm/tool/network.py: PS4, Line 104: net_api.network_caps() > Why can't you use just the caps? This will reduce the need to depend on the we'd like to keep the management network, but remove its bridge in case it exists; if we do not use KernelConfig, we'd have to reimplement some of it here. -- To view, visit https://gerrit.ovirt.org/79495 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63702da4dd1c5a0328797f524734813ef251bdb6 Gerrit-PatchSet: 4 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: password: Move to vdsm.common
by Code Review 23 Jul '17

23 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: password: Move to vdsm.common ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79700 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If3e996c02acc76e3bd15c3aa656f7341c82c1e6f Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: hooking: move to lib
by Code Review 23 Jul '17

23 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: hooking: move to lib ...................................................................... Patch Set 7: (2 comments) https://gerrit.ovirt.org/#/c/79638/7/tests/run_tests_local.sh.in File tests/run_tests_local.sh.in: Line 23 Line 24 Line 25 Line 26 Line 27 why is `client` related and removed? https://gerrit.ovirt.org/#/c/79638/7/vdsm.spec.in File vdsm.spec.in: PS7, Line 732: PYLIBDIR > I do not like it but if we want to have this module in lib/vdsm I do not se I'd keep it completely out of the constants.py junkyard. Howe about taking os.path.dirname(vdsm.hook.__file__) whereever the path is needed? (frankly, I think that there's only a single user, in hooks.py) -- To view, visit https://gerrit.ovirt.org/79638 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2f1581d75cfb33868af41d1b116f56af89801a5 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 23 Jul '17

23 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/79664/2//COMMIT_MSG Commit Message: Line 9: M2crypto uses the same name scheme as openssl which differs from ssl Line 10: module. SSL_OP_NO_TLSv1_1 is not available on some of m2c versions. Line 11: Line 12: Line 13: Label: ovirt-4.1-only > m2c was removed from master i know. i would write it here Line 14: Bug-Url: https://bugzilla.redhat.com/1473344 Line 15: Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: ssl: handle handshake errors
by Code Review 23 Jul '17

23 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: handle handshake errors ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/79668/1/lib/vdsm/sslutils.py File lib/vdsm/sslutils.py: Line 187: self._handshake(dispatcher) Line 188: except socket.error: Line 189: self.log.error("Handshake failed") Line 190: dispatcher.socket.close() Line 191: return seems like _handshake itself takes care of exceptions.. if you need to handle socker.error somewhere its there and not here Line 192: else: Line 193: if config.getboolean('vars', 'verify_client_cert'): Line 194: if not self._verify_host(dispatcher.socket.getpeercert(), Line 195: dispatcher.socket.getpeername()[0]): -- To view, visit https://gerrit.ovirt.org/79668 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I99cfa35e608f429640455c35495be1783854e3da Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 23 Jul '17

23 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/79664/2//COMMIT_MSG Commit Message: Line 9: M2crypto uses the same name scheme as openssl which differs from ssl Line 10: module. SSL_OP_NO_TLSv1_1 is not available on some of m2c versions. Line 11: Line 12: Line 13: Label: ovirt-4.1-only why is it 4.1 only? Line 14: Bug-Url: https://bugzilla.redhat.com/1473344 Line 15: Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: m2c: uses different protocol constant names
by Code Review 23 Jul '17

23 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: m2c: uses different protocol constant names ...................................................................... Patch Set 2: (2 comments) https://gerrit.ovirt.org/#/c/79664/2/lib/vdsm/config.py.in File lib/vdsm/config.py.in: Line 237: ('ssl_excludes', '', Line 238: 'Comma separated protocol values as defined in ' Line 239: 'https://docs.python.org/2/library/ssl.html. ' Line 240: 'e.g. for ssl OP_NO_TLSv1, OP_NO_TLSv1_1 ' Line 241: ' for m2crypto SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1 ' funny.. just except both and do the conversion yourself based on the implementation you use. it will make the user's life easier Line 242: 'By default tlv1, tlsv1.1 and tlsv1.2 are ' Line 243: 'enabled.'), Line 244: Line 245: ('connection_stats_timeout', '3600', https://gerrit.ovirt.org/#/c/79664/2/lib/vdsm/m2cutils.py File lib/vdsm/m2cutils.py: Line 336: # not all m2crypto provide this constant Line 337: excludes |= 268435456 Line 338: else: Line 339: excludes |= getattr(m2, no_protocol.strip()) Line 340: you are calling no_protocol.strip() in the condition, so the attr probably exists.. what constant m2crypto is not provided? -- To view, visit https://gerrit.ovirt.org/79664 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: qemuimg: Move to vdsm.storage
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: qemuimg: Move to vdsm.storage ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79701 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id8391c9e7806800287454fc5a4c09ef5203e2500 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: [WIP] net.api: expose cancel_rollback()
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: [WIP] net.api: expose cancel_rollback() ...................................................................... [WIP] net.api: expose cancel_rollback() When connectivityCheck=True is passed to the setupNetworks verb, an automatically roll back is performed, unless unless cancel_rollback() command is requested by the client. Note that Vdsm does not have an explicit cancel_rollback verb. cancel_rollback is called as a side effect of the ping verb. Change-Id: If42316ac6ecd694e398534e3e87b915aeb4f1f38 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/network/api.py M lib/vdsm/network/connectivity.py M vdsm/API.py 4 files changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/79299/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 32c87d9..7ad3eb1 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -80,7 +80,6 @@ P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) P_VDSM_KEYS = '/etc/pki/vdsm/keys/' -P_VDSM_CLIENT_LOG = '@VDSMRUNDIR@/client.log' # NOQA: E501 (potentially long line) P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) P_VDSM_NODE_ID = '/etc/vdsm/vdsm.id' diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py index cb7210f..8c4113e 100644 --- a/lib/vdsm/network/api.py +++ b/lib/vdsm/network/api.py @@ -27,6 +27,7 @@ from vdsm import hooks +from vdsm.common.fileutils import touch_file from vdsm.network import netswitch from vdsm.network import sourceroute from vdsm.network.configurators.ifcfg import ConfigWriter @@ -281,3 +282,7 @@ def remove_ovs_port(bridge, port): netswitch.configurator.ovs_remove_port(bridge, port) + + +def cancel_rollback(): + touch_file(constants.P_VDSM_CLIENT_LOG) diff --git a/lib/vdsm/network/connectivity.py b/lib/vdsm/network/connectivity.py index 3b2402d..11e5601 100644 --- a/lib/vdsm/network/connectivity.py +++ b/lib/vdsm/network/connectivity.py @@ -30,6 +30,7 @@ from .errors import ConfigNetworkError CONNECTIVITY_TIMEOUT_DEFAULT = 4 +P_VDSM_CLIENT_LOG = constants.P_VDSM_RUN + 'client.log' def _get_connectivity_timeout(options): @@ -50,7 +51,7 @@ start = time.time() while timeout >= 0: try: - if os.stat(constants.P_VDSM_CLIENT_LOG).st_mtime > start: + if os.stat(P_VDSM_CLIENT_LOG).st_mtime > start: return True except OSError as e: if e.errno == errno.ENOENT: diff --git a/vdsm/API.py b/vdsm/API.py index fc928a7..056f61e 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -22,6 +22,7 @@ import os +from vdsm.network.api import cancel_rollback from vdsm.network.errors import ConfigNetworkError from vdsm import commands @@ -78,13 +79,6 @@ throttledlog.throttle('getAllVmStats', 100) - - -def updateTimestamp(): - # The setup API uses this log file to determine if this host is still - # accessible. We use a file (rather than an event) because setup is - # performed by a separate, root process. - fileutils.touch_file(constants.P_VDSM_CLIENT_LOG) class APIBase(object): @@ -1237,7 +1231,7 @@ def ping(self): "Ping the server. Useful for tests" - updateTimestamp() + cancel_rollback() return {'status': doneCode} def getCapabilities(self): -- To view, visit https://gerrit.ovirt.org/79299 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If42316ac6ecd694e398534e3e87b915aeb4f1f38 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 9

Change in vdsm[master]: net: Get iface mtu using netlink instead of sysfs
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79158 ) Change subject: net: Get iface mtu using netlink instead of sysfs ...................................................................... net: Get iface mtu using netlink instead of sysfs link.iface module mostly uses netlink to fetch iface properties. For consistency and efficiency, mtu is now collected through netlink. Change-Id: I219e226957cddde922f11a6f490d3f8b89a620c4 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/link/iface.py M lib/vdsm/network/netinfo/cache.py 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79158 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I219e226957cddde922f11a6f490d3f8b89a620c4 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: Remove getMaxMtu function and inline it in the caller
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79123 ) Change subject: net: Remove getMaxMtu function and inline it in the caller ...................................................................... net: Remove getMaxMtu function and inline it in the caller getMaxMtu implementation is trivial enough not to require a special function. This patch is contributing to the netinfo cleanup effort. Change-Id: Ibdbff5892c02bcf5fb2267704d3c32d07adbe3ee Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/configurators/__init__.py M lib/vdsm/network/netinfo/mtus.py M tests/network/config_network_test.py 3 files changed, 2 insertions(+), 18 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79123 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdbff5892c02bcf5fb2267704d3c32d07adbe3ee Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: Remove netinfo.mtus module and relocate content
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79156 ) Change subject: net: Remove netinfo.mtus module and relocate content ...................................................................... net: Remove netinfo.mtus module and relocate content The getMtu funtion has been relocated to link.iface and renamed to get_mtu. This patch is another step towards cleaning up netinfo package. Change-Id: I8a3f09c81a42e27c4055bb0f364f76fb7fa1b6ea Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/configurators/__init__.py M lib/vdsm/network/legacy_switch.py M lib/vdsm/network/link/iface.py M lib/vdsm/network/models.py M lib/vdsm/network/netinfo/Makefile.am M lib/vdsm/network/netinfo/cache.py D lib/vdsm/network/netinfo/mtus.py M lib/vdsm/network/ovs/info.py M tests/network/config_network_test.py M tests/network/models_test.py M tests/network/ovs_info_test.py 11 files changed, 27 insertions(+), 55 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79156 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a3f09c81a42e27c4055bb0f364f76fb7fa1b6ea Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: Remove netinfo.mtus module and relocate content
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Remove netinfo.mtus module and relocate content ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79156 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8a3f09c81a42e27c4055bb0f364f76fb7fa1b6ea Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Remove getMaxMtu function and inline it in the caller
by Code Review 22 Jul '17

22 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Remove getMaxMtu function and inline it in the caller ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79123 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibdbff5892c02bcf5fb2267704d3c32d07adbe3ee Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: hooking: move to static
by Code Review 20 Jul '17

20 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: hooking: move to static ...................................................................... Patch Set 4: I know that this was my stupid suggestion, but folloeing Nir's comment about another module, I think that it would be better to keep (and deploy) hooking.py in a python subsubsubpackage of vdsm. We need to add tests for this tiny module, and making it easily importable would make it simpler. -- To view, visit https://gerrit.ovirt.org/79638 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2f1581d75cfb33868af41d1b116f56af89801a5 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: tool: remove dummy bridge
by Code Review 20 Jul '17

20 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: tool: remove dummy bridge ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79596 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icd78fba239b37d2c556f37c63438ee076516560b Gerrit-PatchSet: 2 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: tool: clear networks configured by VDSM
by Code Review 20 Jul '17

20 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: tool: clear networks configured by VDSM ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/79495/4/lib/vdsm/tool/network.py File lib/vdsm/tool/network.py: Line 110: networks_request[net] = attrs Line 111: networks_request[net]['bridged'] = False Line 112: else: Line 113: networks_request[net] = {'remove': True} Line 114: net_api.setupNetworks(networks_request, {}, {'connectivityCheck': False}) I believe you need to setSafeConfig -- To view, visit https://gerrit.ovirt.org/79495 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63702da4dd1c5a0328797f524734813ef251bdb6 Gerrit-PatchSet: 4 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Refactor JSON RPC exceptions
by Code Review 20 Jul '17

20 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Refactor JSON RPC exceptions ...................................................................... Patch Set 29: (1 comment) https://gerrit.ovirt.org/#/c/78660/29//COMMIT_MSG Commit Message: Line 13: For example, new error message for JsonRpcMethodNotFoundError is: Line 14: The method does not exist or is not available: {'method': 'some_missing_method'} Line 15: Line 16: Also added a new class JsonRpcGeneralError, that can have Line 17: any code and message. > I see... I think, it would be better to put the changes of exceptions to an Nir, Seems like you have amazing design and appropriate behavior that you would like to have in all vdsm code as maintainer - it sounds amazing. but all those comments can't show me what you want to create - its too long and I can't allow follow the context. please create design document for your desire of how handling error\exception should be in vdsm - what way of using this hierarchy is valid and what is not- like may I create interfaces? can I call super? can I use same message but two different codes? whatever you love, just write it in a way that we will be able to follow your way ... if you did so already, please share it and sorry for the interruption :) Line 18: Line 19: Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958 -- To view, visit https://gerrit.ovirt.org/78660 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958 Gerrit-PatchSet: 29 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: net: Allow QoS caps to ignore nets with multiple sb nics
by Code Review 19 Jul '17

19 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Allow QoS caps to ignore nets with multiple sb nics ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79621 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf9aad74622262f841657d1687babea60623d065 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Michael Burman <mburman(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: hooks: support to read/write the raw domain XML
by Code Review 19 Jul '17

19 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: hooks: support to read/write the raw domain XML ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79489 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I009c7d03337bf267f9cf7b1b32e884d987d6adb3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Get iface mtu using netlink instead of sysfs
by Code Review 19 Jul '17

19 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Get iface mtu using netlink instead of sysfs ...................................................................... Patch Set 2: Code-Review+2 no sure about efficiency, but new code looks nicer -- To view, visit https://gerrit.ovirt.org/79158 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I219e226957cddde922f11a6f490d3f8b89a620c4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: tool: clear networks configured by oVirt
by Code Review 18 Jul '17

18 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: tool: clear networks configured by oVirt ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/79495/1/lib/vdsm/tool/network.py File lib/vdsm/tool/network.py: Line 121: networks_request[net] = {'remove': True} Line 122: net_api.setupNetworks(networks_request, {}, {'connectivityCheck': False}) Line 123: Line 124: Line 125: def _remove_dummy_network(): this monstrosity is added in lib/vdsm/tool/dummybr.py. it is not a vdsm network, only a means to persist the dummy bridge. Please add the bridge removal to dummybr.py (possibly in a separate patch) Line 126: if os.path.exists('/sys/class/net/{}'.format(net_api.DUMMY_BRIDGE)): Line 127: commands.execCmd([constants.EXT_BRCTL, 'delbr', net_api.DUMMY_BRIDGE]) Line 128: Line 129: dummy_network = _get_libvirt_network_by_name(net_api.DUMMY_BRIDGE) -- To view, visit https://gerrit.ovirt.org/79495 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I63702da4dd1c5a0328797f524734813ef251bdb6 Gerrit-PatchSet: 1 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: network: remove ip from a nic used by a removed network
by Code Review 18 Jul '17

18 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/76937 ) Change subject: network: remove ip from a nic used by a removed network ...................................................................... network: remove ip from a nic used by a removed network Change-Id: I238d573202a8cef610d61c4ff52ff740ca37bf1b Signed-off-by: Petr Horacek <phoracek(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1432386 --- M lib/vdsm/network/configurators/ifcfg.py M tests/network/func_net_basic_test.py M tests/network/func_static_ip_test.py 3 files changed, 63 insertions(+), 0 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/76937 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I238d573202a8cef610d61c4ff52ff740ca37bf1b Gerrit-PatchSet: 9 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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[ovirt-3.6]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has uploaded a new change for review. Change subject: sos: fix addCopySpecLimit call ...................................................................... sos: fix addCopySpecLimit call sosreport 3.4 replace add_copy_spec_limit with add_copy_spec. commit 2e2559d4f3dd7625e52aad3314379ef1ee2afe41 replaced this call but apperantly in prior sosreport versions, number of parameters of add_copy_spec method was different and caused a TypeError. Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Signed-off-by: Irit Goihman <igoihman(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1471663 --- M vdsm/sos/vdsm.py.in 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/79542/1 diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index 3dfe177..ec9d860 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -54,6 +54,11 @@ # Make compatible com sos version >= 3 if not hasattr(Plugin, 'addCopySpec'): addCopySpec = Plugin.add_copy_spec + # sosreport 3.4 replaced add_copy_spec_limit with add_copy_spec + if hasattr(Plugin, 'add_copy_spec_limit'): + addCopySpecLimit = Plugin.add_copy_spec_limit + else: + addCopySpecLimit = Plugin.add_copy_spec collectExtOutput = Plugin.add_cmd_output getOption = Plugin.get_option addForbiddenPath = Plugin.add_forbidden_path @@ -70,8 +75,12 @@ self.addCopySpec("/etc/vdsm/*") self.addCopySpec("/etc/vdsm-reg/*") logsize = self.getOption('logsize') - self.addCopySpec("/var/log/vdsm/*", logsize) - self.addCopySpec("/var/log/vdsm-reg/*", logsize) + if logsize is not None: + self.addCopySpecLimit("/var/log/vdsm/*", logsize) + self.addCopySpecLimit("/var/log/vdsm-reg/*", logsize) + else: + self.addCopySpec("/var/log/vdsm/*") + self.addCopySpec("/var/log/vdsm-reg/*") self._addVdsmRunDir() self.addCopySpec("@TRUSTSTORE@") self.addCopySpec("@HOOKSDIR@") -- To view, visit https://gerrit.ovirt.org/79542 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

1 4

Change in vdsm[master]: static: use tabs for indetation in Makefile
by Code Review 18 Jul '17

18 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79494 ) Change subject: static: use tabs for indetation in Makefile ...................................................................... static: use tabs for indetation in Makefile Change-Id: I6a6979a2bf1a301930d88501202fd886f6197e9b Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M static/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Verified; Looks good to me, approved Martin Polednik: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/79494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a6979a2bf1a301930d88501202fd886f6197e9b Gerrit-PatchSet: 2 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: Jenkins CI Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: static: use tabs for indetation in Makefile
by Code Review 18 Jul '17

18 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: static: use tabs for indetation in Makefile ...................................................................... Patch Set 1: Code-Review+2 Verified+1 Sorry! -- To view, visit https://gerrit.ovirt.org/79494 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a6979a2bf1a301930d88501202fd886f6197e9b Gerrit-PatchSet: 1 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: Jenkins CI Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has uploaded a new change for review. Change subject: sos: fix addCopySpecLimit call ...................................................................... sos: fix addCopySpecLimit call sosreport 3.4 replace add_copy_spec_limit with add_copy_spec. commit 2e2559d4f3dd7625e52aad3314379ef1ee2afe41 replaced this call but apperantly in prior sosreport versions, number of parameters of add_copy_spec method was different and caused a TypeError. Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Signed-off-by: Irit Goihman <igoihman(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1471663 --- M vdsm/sos/vdsm.py.in 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/79541/1 diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index b08bb6e..03ef206 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -66,6 +66,11 @@ # Make compatible com sos version >= 3 if not hasattr(Plugin, 'addCopySpec'): addCopySpec = Plugin.add_copy_spec + # sosreport 3.4 replaced add_copy_spec_limit with add_copy_spec + if hasattr(Plugin, 'add_copy_spec_limit'): + addCopySpecLimit = Plugin.add_copy_spec_limit + else: + addCopySpecLimit = Plugin.add_copy_spec collectExtOutput = Plugin.add_cmd_output getOption = Plugin.get_option addForbiddenPath = Plugin.add_forbidden_path @@ -89,7 +94,10 @@ self.addCopySpec("/tmp/vds_bootstrap*") self.addCopySpec("/etc/vdsm/*") logsize = self.getOption('logsize') - self.addCopySpec("/var/log/vdsm/*", logsize) + if logsize is not None: + self.addCopySpecLimit("/var/log/vdsm/*", logsize) + else: + self.addCopySpec("/var/log/vdsm/*") self._addVdsmRunDir() self.addCopySpec("@HOOKSDIR@") self.addCopySpec("@VDSMLIBDIR@") -- To view, visit https://gerrit.ovirt.org/79541 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

1 1

Change in vdsm[master]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79510 ) Change subject: sos: fix addCopySpecLimit call ...................................................................... sos: fix addCopySpecLimit call sosreport 3.4 replace add_copy_spec_limit with add_copy_spec. commit 2e2559d4f3dd7625e52aad3314379ef1ee2afe41 replaced this call but apperantly in prior sosreport versions, number of parameters of add_copy_spec method was different and caused a TypeError. Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Signed-off-by: Irit Goihman <igoihman(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1471663 --- M lib/sos/vdsm.py.in 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Piotr Kliczewski: Looks good to me, approved Yaniv Bronhaim: Verified; Looks good to me, but someone else must approve Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/79510 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: sos: fix addCopySpecLimit call ...................................................................... Patch Set 4: Code-Review+1 Verified+1 added REQUIRED_FOR in the comment - danken requested. didn't change code -- To view, visit https://gerrit.ovirt.org/79510 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: sos: fix addCopySpecLimit call ...................................................................... Patch Set 2: verified with sos-3.4-1 and 3.3-5 -- To view, visit https://gerrit.ovirt.org/79510 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: sos: fix addCopySpecLimit call ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/79510 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: sos: fix addCopySpecLimit call
by Code Review 18 Jul '17

18 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: sos: fix addCopySpecLimit call ...................................................................... Patch Set 2: Code-Review+1 great. thanks! -- To view, visit https://gerrit.ovirt.org/79510 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52695ec43a65367b80d7291e213790dfd98ca4af Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: spec: install libvirt-hook.sh in Makefile.am
by Code Review 16 Jul '17

16 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: install libvirt-hook.sh in Makefile.am ...................................................................... spec: install libvirt-hook.sh in Makefile.am Another step to clean %install in the spec file. Change-Id: Ib9affdae684a6a2b33a98d82759c2c05fcca880e Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/virt/Makefile.am M vdsm.spec.in 2 files changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/79435/1 diff --git a/lib/vdsm/virt/Makefile.am b/lib/vdsm/virt/Makefile.am index 7bcad61..84c97fd 100644 --- a/lib/vdsm/virt/Makefile.am +++ b/lib/vdsm/virt/Makefile.am @@ -55,6 +55,7 @@ vm_migrate_hook.py \ $(NULL) -EXTRA_DIST = \ +libvirthoookdir = /etc/libvirt/hooks/qemu +dist_libvirthoook_SCRIPTS = \ libvirt-hook.sh \ $(NULL) diff --git a/vdsm.spec.in b/vdsm.spec.in index 8ba16d8..9e28859 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -743,10 +743,6 @@ install -dDm 1777 %{buildroot}%{_localstatedir}/log/core %endif -# Install the libvirt hook for cleaning up the XML -install -Dm 0755 lib/vdsm/virt/libvirt-hook.sh \ - %{buildroot}%{_sysconfdir}/libvirt/hooks/qemu - %pre # Force standard locale behavior (English) export LC_ALL=C -- To view, visit https://gerrit.ovirt.org/79435 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9affdae684a6a2b33a98d82759c2c05fcca880e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 4

Change in vdsm[master]: stomp: fix AsyncDispatcher next_check_interval
by Code Review 16 Jul '17

16 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: stomp: fix AsyncDispatcher next_check_interval ...................................................................... Patch Set 4: Code-Review+1 Irit's comment is correct - The discussion we have is not related to this fix. The code here is just wrong and must have this patch also in 4.1 - without any relation to the following patches -- To view, visit https://gerrit.ovirt.org/79384 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e7fe82f80535ff851eaf909de194419511154ba Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: stomp: fix AsyncDispatcher next_check_interval
by Code Review 15 Jul '17

15 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: stomp: fix AsyncDispatcher next_check_interval ...................................................................... Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/79384/4/lib/yajsonrpc/stomp.py File lib/yajsonrpc/stomp.py: Line 413: self._incoming_heartbeat_in_milis == 0: Line 414: return None Line 415: Line 416: if self._incoming_heartbeat_in_milis and \ Line 417: self._incoming_heartbeat_expiration_interval() < 0: > We need timeouts, and instead of having a proper solution, we hacked this n from what I understand the complexity is redundant in this code. we have a mess of implementations that part of them Im quite sure we don't use any more. My problem is that I just can't map the dependencies between objects here each time I try to go over this code :| maybe its only be. but its exhausting I'm not sure how urgent is the heartbeat feature - if it is for 4.1, lets hack this craziness again. but we can't keep doing that.. Do we still need the protocol detector? How many kind of "Dispatchers" we need? can we have only one Dispatcher implantation? It still kills me why StompAdapterImpl and AsyncClient are not called frame handlers? why those can't be kind of dispatchers? all this hierarchy must be reconsidered and fixed. Its long run changes that we can do in those areas.. I think we can rethink and make it much nicer... depends on priorities and desire Line 418: self.handle_timeout() Line 419: return None Line 420: Line 421: if self._outgoing_heartbeat_in_milis: -- To view, visit https://gerrit.ovirt.org/79384 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e7fe82f80535ff851eaf909de194419511154ba Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: gitignore: remove needless line
by Code Review 14 Jul '17

14 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: gitignore: remove needless line ...................................................................... gitignore: remove needless line commit 930686 removed this script, but forgot to clean .gitignore of it. Change-Id: I7188a1b5ec7dc2bcb56844e3c2963708dd81cfd3 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M .gitignore 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/79427/1 diff --git a/.gitignore b/.gitignore index 9937872..e334131 100644 --- a/.gitignore +++ b/.gitignore @@ -77,5 +77,4 @@ static/usr/share/man/man8/vdsmd.8 vdsm/rpc/vdsm-api.html vdsm_hooks/openstacknet/sudoers -vdsm_hooks/persist-vdsm-hooks vdsm_hooks/checkips/vdsm-checkips.service -- To view, visit https://gerrit.ovirt.org/79427 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7188a1b5ec7dc2bcb56844e3c2963708dd81cfd3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 1

Change in vdsm[master]: RPC: JsonRpcClient supports multiple subscriptions
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: JsonRpcClient supports multiple subscriptions ...................................................................... Patch Set 31: (1 comment) https://gerrit.ovirt.org/#/c/78656/31/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 595: Set a callback which handles messages received Line 596: from the main RPC queue. Line 597: Line 598: :param handler: Callback to handle incoming messages Line 599: :type handler: function (string) -> () > The notation should mean, that the type of the 'handler' parameter is: 'fun im confused what is this handler again. you should pass here JsonRpcClient instance or just the handle_message function pointer? err so not clear. for some reason I though this function gets class that implements the handle_message function Line 600: """ Line 601: self._message_handler = handler Line 602: Line 603: def send(self, data, destination=None): -- To view, visit https://gerrit.ovirt.org/78656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 Gerrit-PatchSet: 31 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-3.6]: virt net: Interface default driver name set to 'vhost'
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: virt net: Interface default driver name set to 'vhost' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79398 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I508675f9dd40ba70803938902a1c2f8fced00504 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: net: NM acquire should ignore duplicate ifcfg files
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79378 ) Change subject: net: NM acquire should ignore duplicate ifcfg files ...................................................................... net: NM acquire should ignore duplicate ifcfg files When quering NM DBUS to translate a file path to a connection ID, an error with "is not an ifcfg base file" is raised when the file is a copy of an existing ifcfg file (a backup). This patch ignores these king of error the same way it did for non ifcfg files that are named with the ifcfg prefix. Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Bug-Url: https://bugzilla.redhat.com/1441530 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/nm/nmdbus/__init__.py 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com>

1 0

Change in vdsm[ovirt-4.1]: net: NM acquire should ignore duplicate ifcfg files
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: NM acquire should ignore duplicate ifcfg files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: net: NM acquire should ignore duplicate ifcfg files
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has removed gerrit-hooks from this change. ( https://gerrit.ovirt.org/79378 ) Change subject: net: NM acquire should ignore duplicate ifcfg files ...................................................................... Removed reviewer gerrit-hooks with the following votes: * Verified-1 by gerrit-hooks <automation(a)ovirt.org> -- To view, visit https://gerrit.ovirt.org/79378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com>

1 0

Change in vdsm[master]: net: NM acquire should ignore duplicate ifcfg files
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79349 ) Change subject: net: NM acquire should ignore duplicate ifcfg files ...................................................................... net: NM acquire should ignore duplicate ifcfg files When quering NM DBUS to translate a file path to a connection ID, an error with "is not an ifcfg base file" is raised when the file is a copy of an existing ifcfg file (a backup). This patch ignores these king of error the same way it did for non ifcfg files that are named with the ifcfg prefix. Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Bug-Url: https://bugzilla.redhat.com/1441530 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/nm/nmdbus/__init__.py 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79349 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: NM acquire should ignore duplicate ifcfg files
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: NM acquire should ignore duplicate ifcfg files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79349 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: RPC: JsonRpcClient supports multiple subscriptions
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: JsonRpcClient supports multiple subscriptions ...................................................................... Patch Set 31: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/78656/31/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 595: Set a callback which handles messages received Line 596: from the main RPC queue. Line 597: Line 598: :param handler: Callback to handle incoming messages Line 599: :type handler: function (string) -> () so again, what this notion means? sorry for my ignorance. what function this handler should have? handle_message? lets make interface for that if needed Line 600: """ Line 601: self._message_handler = handler Line 602: Line 603: def send(self, data, destination=None): -- To view, visit https://gerrit.ovirt.org/78656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 Gerrit-PatchSet: 31 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: net: move EXT_TC into vdsm.network.tc
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net: move EXT_TC into vdsm.network.tc ...................................................................... net: move EXT_TC into vdsm.network.tc The only users of EXT_TC is the tc package and its tests. There is no need to exposed it in the global constants module. Change-Id: I40238b99390e150445dfa3d38b8cddb7497045aa Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M configure.ac M lib/vdsm/constants.py.in M lib/vdsm/network/tc/__init__.py M lib/vdsm/network/tc/_wrapper.py M tests/network/nettestlib.py M tests/network/tc_test.py 6 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/79295/1 diff --git a/configure.ac b/configure.ac index ddfeb1d..b5e608b 100644 --- a/configure.ac +++ b/configure.ac @@ -364,7 +364,6 @@ AC_PATH_PROG([SYSCTL_PATH], [sysctl], [/sbin/sysctl]) AC_PATH_PROG([TAR_PATH], [tar], [/bin/tar]) AC_PATH_PROG([TASKSET_PATH], [taskset], [/usr/bin/taskset]) -AC_PATH_PROG([TC_PATH], [tc], [/sbin/tc]) AC_PATH_PROG([TEE_PATH], [tee], [/usr/bin/tee]) AC_PATH_PROG([TOUCH_PATH], [touch], [/bin/touch]) AC_PATH_PROG([TUNE2FS_PATH], [tune2fs], [/sbin/tune2fs]) diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index d35093f..32c87d9 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -110,7 +110,6 @@ EXT_IONICE = '@IONICE_PATH@' EXT_ISCSIADM = '@ISCSIADM_PATH@' -EXT_TC = '@TC_PATH@' EXT_KILL = '@KILL_PATH@' diff --git a/lib/vdsm/network/tc/__init__.py b/lib/vdsm/network/tc/__init__.py index bbdc5f7..6f73a30 100644 --- a/lib/vdsm/network/tc/__init__.py +++ b/lib/vdsm/network/tc/__init__.py @@ -32,6 +32,7 @@ from ._wrapper import TrafficControlException QDISC_INGRESS = 'ffff:' +EXT_TC = '/sbin/tc' def _addTarget(network, parent, target): diff --git a/lib/vdsm/network/tc/_wrapper.py b/lib/vdsm/network/tc/_wrapper.py index 218d5a3..dd2af65 100644 --- a/lib/vdsm/network/tc/_wrapper.py +++ b/lib/vdsm/network/tc/_wrapper.py @@ -20,7 +20,7 @@ import errno import os -from vdsm.constants import EXT_TC +from .. import EXT_TC from vdsm.network import cmd _TC_ERR_PREFIX = 'RTNETLINK answers: ' diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index b3d2927..54d9459 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -32,7 +32,6 @@ from nose.plugins.skip import SkipTest -from vdsm.constants import EXT_TC from vdsm import cpuarch from vdsm.network import cmd as cmd from vdsm.network.configurators.ifcfg import EXT_BRCTL @@ -47,6 +46,7 @@ from vdsm.network.link.iface import random_iface_name from vdsm.network.netinfo import routes from vdsm.network.netlink import monitor +from vdsm.network.tc import EXT_TC from vdsm.common.cache import memoized from vdsm.common.cmdutils import CommandPath diff --git a/tests/network/tc_test.py b/tests/network/tc_test.py index 568dae0..7fbf99f 100644 --- a/tests/network/tc_test.py +++ b/tests/network/tc_test.py @@ -43,12 +43,12 @@ from .nettestlib import running from vdsm import libvirtconnection -from vdsm.constants import EXT_TC from vdsm.network import cmd from vdsm.network import tc from vdsm.network.configurators import qos from vdsm.network.ipwrapper import addrAdd, linkSet, netns_exec, link_set_netns from vdsm.network.netinfo.qos import DEFAULT_CLASSID +from vdsm.network.tc import EXT_TC class TestQdisc(TestCaseBase): -- To view, visit https://gerrit.ovirt.org/79295 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40238b99390e150445dfa3d38b8cddb7497045aa Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 5

Change in vdsm[master]: RPC: Small refactor of ClientRpcTransportAdapter
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Small refactor of ClientRpcTransportAdapter ...................................................................... Patch Set 24: (1 comment) https://gerrit.ovirt.org/#/c/78655/24/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 595: :param handler: Callback to handle incoming messages Line 596: :type handler: function (ClientRpcTransportAdapter, string) -> () Line 597: """ Line 598: self._message_handler = handler Line 599: if you change this area again in https://gerrit.ovirt.org/#/c/78656/30/lib/yajsonrpc/stompreactor.py - just don't touch here at all - try to make this patch small as possible Line 600: def send(self, data, destination=None): Line 601: if not destination: Line 602: destination = self._request_queue Line 603: -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 24 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Small refactor of ClientRpcTransportAdapter
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Small refactor of ClientRpcTransportAdapter ...................................................................... Patch Set 24: why don't you squeeze between this patch to https://gerrit.ovirt.org/#/c/78656/30/lib/yajsonrpc/stompreactor.py ? -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 24 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: RPC: Add missing return statement when handling messages
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Add missing return statement when handling messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04ce4a5c6758e7bf0272ffac51f0cec89e3f6b8e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: RPC: Small refactor of ClientRpcTransportAdapter
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Small refactor of ClientRpcTransportAdapter ...................................................................... Patch Set 24: (1 comment) https://gerrit.ovirt.org/#/c/78655/24/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 592: """ Line 593: Set a callback which handles received messages Line 594: Line 595: :param handler: Callback to handle incoming messages Line 596: :type handler: function (ClientRpcTransportAdapter, string) -> () i don't understand this syntax. the handle gets ClientRpcTransportAdapter and a string and return nothing? do we have some kind of message handler interface ? Line 597: """ Line 598: self._message_handler = handler Line 599: Line 600: def send(self, data, destination=None): -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 24 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Add missing return statement
by Code Review 13 Jul '17

13 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Add missing return statement ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79328 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17a948211ba3aa05af2be69c2a2d366aa26a9e9b Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: move vdsmd from vdsm dir
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/69447 ) Change subject: move vdsmd from vdsm dir ...................................................................... move vdsmd from vdsm dir vdsmd.py moved to lib/vdsm and vdsmd script moved to static directory Change-Id: Ib683341bbf3e4ebdcb45c158391c21881b030633 Signed-off-by: Irit Goihman <igoihman(a)redhat.com> --- M Makefile.am M lib/vdsm/Makefile.am R lib/vdsm/vdsmd.py M static/Makefile.am R static/usr/sbin/vdsmd M vdsm.spec.in M vdsm/Makefile.am 7 files changed, 5 insertions(+), 9 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Jenkins CI: Passed CI tests Irit Goihman: Verified -- To view, visit https://gerrit.ovirt.org/69447 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib683341bbf3e4ebdcb45c158391c21881b030633 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: lib: move API
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/77571 ) Change subject: lib: move API ...................................................................... lib: move API As part of bigger effort we move modules from vdsm to lib.vdsm. This patch moves API. Change-Id: I8eeff74f4269d886d557a912070b54c1d9d642ff Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Signed-off-by: Irit Goihman <igoihman(a)redhat.com> --- M Makefile.am R lib/vdsm/API.py M lib/vdsm/Makefile.am M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/errors.py M lib/vdsm/rpc/Bridge.py M lib/vdsm/rpc/http.py M lib/vdsm/storage/volume.py M lib/vdsm/virt/vm.py M tests/API_test.py M tests/bridge_test.py M tests/check_imports.py M tests/integration/jsonRpcHelper.py M tests/schemavalidation_test.py M tests/vmapi_test.py M vdsm.spec.in M vdsm/Makefile.am 17 files changed, 17 insertions(+), 22 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Irit Goihman: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/77571 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8eeff74f4269d886d557a912070b54c1d9d642ff Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: lib: move clientIF
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/77570 ) Change subject: lib: move clientIF ...................................................................... lib: move clientIF As part of bigger effort we move modules from vdsm to lib.vdsm. This patch moves clientIF. Change-Id: If00e1a8e2f4f776315fd04444a06fe3532a2d64e Signed-off-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Signed-off-by: Irit Goihman <igoihman(a)redhat.com> --- M Makefile.am M lib/vdsm/Makefile.am R lib/vdsm/clientIF.py M lib/vdsm/virt/vm.py M tests/clientif_test.py M tests/vmapi_test.py M vdsm.spec.in M vdsm/API.py M vdsm/Makefile.am M vdsm/vdsmd.py 10 files changed, 10 insertions(+), 9 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Irit Goihman: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/77570 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If00e1a8e2f4f776315fd04444a06fe3532a2d64e Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: lib: move API
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: lib: move API ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/77571 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8eeff74f4269d886d557a912070b54c1d9d642ff Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: lib: move clientIF
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: lib: move clientIF ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/77570 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If00e1a8e2f4f776315fd04444a06fe3532a2d64e Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: API: drop needless code
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: API: drop needless code ...................................................................... API: drop needless code The code dropped in this patch was required for ancient Engine versions (pre 3.1), which are not supported for a very long time. Read more in commit 95302a1 which introduced these calls. Change-Id: I23c13501d20caff1c21cdd422a250ceee7cd7e24 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/rpc/Bridge.py M vdsm/API.py 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/79298/1 diff --git a/lib/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py index 7d3c6f6..c93423e 100644 --- a/lib/vdsm/rpc/Bridge.py +++ b/lib/vdsm/rpc/Bridge.py @@ -264,7 +264,6 @@ This call is only interested in returning the VM UUIDs so pass False for the first argument in order to suppress verbose results. """ - API.updateTimestamp() # required for setupNetworks flow vmList = args.get('vmList', []) onlyUUID = args.get('onlyUUID', True) return API.Global().getVMList(False, vmList, onlyUUID) diff --git a/vdsm/API.py b/vdsm/API.py index cf7c04e..fc928a7 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -1245,7 +1245,6 @@ Report host capabilities. """ hooks.before_get_caps() - updateTimestamp() # required for some ovirt-3.0.z Engines c = caps.get() c['netConfigDirty'] = str(self._cif._netConfigDirty) c = hooks.after_get_caps(c) -- To view, visit https://gerrit.ovirt.org/79298 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23c13501d20caff1c21cdd422a250ceee7cd7e24 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: virt.sampling: drop dead code
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: virt.sampling: drop dead code ...................................................................... virt.sampling: drop dead code recentClient was used by the connectivity log, and should have been dropped in commit f68cc2d7. This patch stops updating a field that no one reads Change-Id: Ibf858255ff91ac4fe96aecfb66f446f00e84d58f Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/virt/sampling.py 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/79296/1 diff --git a/lib/vdsm/virt/sampling.py b/lib/vdsm/virt/sampling.py index 189df9f..53eabb7 100644 --- a/lib/vdsm/virt/sampling.py +++ b/lib/vdsm/virt/sampling.py @@ -37,7 +37,7 @@ from vdsm import utils import vdsm.common.time from vdsm.config import config -from vdsm.constants import P_VDSM_RUN, P_VDSM_CLIENT_LOG +from vdsm.constants import P_VDSM_RUN from vdsm.host import api as hostapi from vdsm.network import ipwrapper from vdsm.network.netinfo import nics, bonding, vlans @@ -253,15 +253,6 @@ self.cpuCores = CpuCoreSample() self.numaNodeMem = NumaNodeMemorySample() ENGINE_DEFAULT_POLL_INTERVAL = 15 - try: - self.recentClient = ( - self.timestamp - os.stat(P_VDSM_CLIENT_LOG).st_mtime < - 2 * ENGINE_DEFAULT_POLL_INTERVAL) - except OSError as e: - if e.errno == errno.ENOENT: - self.recentClient = False - else: - raise _MINIMUM_SAMPLES = 1 -- To view, visit https://gerrit.ovirt.org/79296 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf858255ff91ac4fe96aecfb66f446f00e84d58f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: net: remove vintage ovirt-node code piece
by Code Review 13 Jul '17

13 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net: remove vintage ovirt-node code piece ...................................................................... net: remove vintage ovirt-node code piece ovirt-node vintage is not with us since ovirt 3. This patch removes a piece of dead code. Change-Id: I73820d7adc73810936571e5698e0347ebb977d95 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/network/configurators/ifcfg.py 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/79293/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index 92dbcf5..d4fcf70 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -460,10 +460,6 @@ @classmethod def _persistentBackup(cls, filename): """ Persistently backup ifcfg-* config files """ - if os.path.exists('/usr/libexec/ovirt-functions'): - cmd.exec_sync([constants.EXT_SH, '/usr/libexec/ovirt-functions', - 'unmount_config', filename]) - logging.debug("unmounted %s using ovirt", filename) (dummy, basename) = os.path.split(filename) try: -- To view, visit https://gerrit.ovirt.org/79293 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73820d7adc73810936571e5698e0347ebb977d95 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: net: NM acquire should ignore duplicate ifcfg files
by Code Review 12 Jul '17

12 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: NM acquire should ignore duplicate ifcfg files ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/79349/1/lib/vdsm/network/nm/nmdbus/__init__.py File lib/vdsm/network/nm/nmdbus/__init__.py: Line 67: """ Line 68: con_info = (None, None) Line 69: try: Line 70: con_info = self.ifcfg.GetIfcfgDetails(ifcfg_path) Line 71: except DBusException as ex: yuck, don't they have numeric exception names? Line 72: for err_base_message in NMDbusIfcfgRH1.ERROR_INV_CON: Line 73: if err_base_message.format(ifcfg_path) == ex.args[0]: Line 74: return con_info Line 75: raise -- To view, visit https://gerrit.ovirt.org/79349 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I337db762d7c6f6247894d7f75096328f5726c273 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: virt: remove vdsm/virt directory
by Code Review 12 Jul '17

12 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: virt: remove vdsm/virt directory ...................................................................... Patch Set 2: Code-Review+2 ! -- To view, visit https://gerrit.ovirt.org/79339 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I31bd6bbd28021ddf16036c129a2bb4283c7e369d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Report lldp through new getLldp command
by Code Review 12 Jul '17

12 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Report lldp through new getLldp command ...................................................................... Patch Set 5: (1 comment) https://gerrit.ovirt.org/#/c/79093/5/lib/vdsm/network/api.py File lib/vdsm/network/api.py: Line 284: def remove_ovs_port(bridge, port): Line 285: netswitch.configurator.ovs_remove_port(bridge, port) Line 286: Line 287: Line 288: def lldp_info(device): > getVMList has a "vmList" argument specifying which vmid are interesting to I do not see an easy way (or immediate need) to specify TLVs that are interesting to the client. Let us not block on this question and return them all; if a limiting filter becomes useful, we can add an additional argument. Line 289: """" Line 290: Get LLDP information of a device. Line 291: Line 292: Returns LLDP Information -- To view, visit https://gerrit.ovirt.org/79093 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1e5e81cfbfe9c714d8173ecd6ee20f8b59bd14fe Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dominik Holler <dholler(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Dominik Holler <dholler(a)redhat.com> Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: JsonRpcClient supports multiple subscriptions
by Code Review 12 Jul '17

12 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: JsonRpcClient supports multiple subscriptions ...................................................................... Patch Set 28: Code-Review-1 (4 comments) https://gerrit.ovirt.org/#/c/78656/28//COMMIT_MSG Commit Message: Line 10: responses and only from a single queue. Line 11: Line 12: Now it is possible to subscribe to multiple queues Line 13: and receive also events as well as rpc responses. Line 14: how? you need to explain here the logic you add - how the callback is being used, when we need callback when we handle_msg and how its being set Line 15: Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 https://gerrit.ovirt.org/#/c/78656/28/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 497: Line 498: def _handleMessage(self, message, callback=None): Line 499: try: Line 500: mobj = json.loads(message) Line 501: isResponse = self._isResponse(mobj) yes? events are not count as response? kill me, but I don't get the _isResponse implementation, so you'll tell me if its indeed work as expected Line 502: except: Line 503: self.log.exception("Problem parsing message from client") Line 504: return Line 505: Line 522: Line 523: req = JsonRpcRequest.fromRawObject(obj) Line 524: if not req.isNotification(): Line 525: self.log.warning("Received non notification, ignoring") Line 526: return separate patch please Line 527: Line 528: callback(req.method, req.params) Line 529: Line 530: def close(self): https://gerrit.ovirt.org/#/c/78656/28/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 606: destination, Line 607: headers, Line 608: ) Line 609: Line 610: def subscribe(self, queue_name, handler): what is handler? Line 611: sub_id = uuid4() Line 612: self._subs[sub_id] = self._client.subscribe( Line 613: queue_name, Line 614: sub_id=str(sub_id), -- To view, visit https://gerrit.ovirt.org/78656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 Gerrit-PatchSet: 28 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Small refactor of ClientRpcTransportAdapter
by Code Review 12 Jul '17

12 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Small refactor of ClientRpcTransportAdapter ...................................................................... Patch Set 22: Code-Review-1 (3 comments) https://gerrit.ovirt.org/#/c/78655/22/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 573: class ClientRpcTransportAdapter(object): Line 574: def __init__(self, request_queue, response_queue, client): Line 575: self._client = client Line 576: self._message_handler = lambda arg: None Line 577: self._request_queue = request_queue how this request queue is being used? when you send data without destination, you add it to this queue and how is it being handled? Line 578: Line 579: self._sub = self._client.subscribe( Line 580: response_queue, Line 581: sub_id=str(uuid4()), Line 587: handler which is responsible for processing jsonrpc Line 588: content of the message. Currently, the only handler Line 589: is JsonRpcClient. Line 590: """ Line 591: def set_message_handler(self, handler): so call it - set_jsonrpc_client Line 592: self._message_handler = handler Line 593: Line 594: def send(self, data, destination=None): Line 595: if not destination: Line 588: content of the message. Currently, the only handler Line 589: is JsonRpcClient. Line 590: """ Line 591: def set_message_handler(self, handler): Line 592: self._message_handler = handler also the var - self._jsonrpcclient what is message handler? Line 593: Line 594: def send(self, data, destination=None): Line 595: if not destination: Line 596: destination = self._request_queue -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 22 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Add missing return statement when handling messages
by Code Review 12 Jul '17

12 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Add missing return statement when handling messages ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/79308/1/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 482: transport, message = req Line 483: try: Line 484: mobj = json.loads(message) Line 485: isResponse = self._isResponse(mobj) Line 486: except: if you're already here - add specific catch if possible to be more explicit Line 487: self.log.exception("Problem parsing message from client") Line 488: return Line 489: Line 490: if isResponse: -- To view, visit https://gerrit.ovirt.org/79308 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04ce4a5c6758e7bf0272ffac51f0cec89e3f6b8e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC client: Add methods to subscribe, unsubscribe and notify
by Code Review 12 Jul '17

12 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC client: Add methods to subscribe, unsubscribe and notify ...................................................................... Patch Set 21: I like the tests, but it sounds odd that we don't have client_test module already ... so I grabbed for it and saw some tests in stompTests - worth to put all client tests under your new test module Thanks! -- To view, visit https://gerrit.ovirt.org/78657 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie5b1e2eace452bf663c34c721bbe3ff9fcabb095 Gerrit-PatchSet: 21 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: RPC client: Add methods to subscribe, unsubscribe and notify
by Code Review 12 Jul '17

12 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC client: Add methods to subscribe, unsubscribe and notify ...................................................................... Patch Set 21: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/78657 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie5b1e2eace452bf663c34c721bbe3ff9fcabb095 Gerrit-PatchSet: 21 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: RPC: Recieve and parse messages from multiple subscriptions
by Code Review 12 Jul '17

12 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Recieve and parse messages from multiple subscriptions ...................................................................... Patch Set 23: (1 comment) https://gerrit.ovirt.org/#/c/78656/23//COMMIT_MSG Commit Message: Line 7: RPC: Recieve and parse messages from multiple subscriptions Line 8: Line 9: JsonRpcClient parses json messages Line 10: from multiple subscriptions and calls Line 11: the registered callback. > Ok, I will rephrase it. yes, explain how, and how it was - code-wise Line 12: Line 13: Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 -- To view, visit https://gerrit.ovirt.org/78656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 Gerrit-PatchSet: 23 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: api: log only external pings
by Code Review 12 Jul '17

12 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: api: log only external pings ...................................................................... Patch Set 6: omg, we had quite the same thing in the past: http://gerrit.ovirt.org/30178 -- 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: 6 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: No

1 0

Change in vdsm[master]: net: keep our own BRCTL constant
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net: keep our own BRCTL constant ...................................................................... net: keep our own BRCTL constant BRCTL has two usages: in vdsm-tool, and in the ifcfg network configurator. It resolves to /usr/sbin/brctl on all platforms. In order to facilitate future separation of the network subpackage, this patch defines network's own copy of BRCTL. Change-Id: Id49fc16232787c905ce9bda5731c08b2f568849f Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/network/configurators/ifcfg.py M tests/functional/networkTests.py M tests/network/nettestlib.py 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/79277/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index dd35b26..92dbcf5 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -68,6 +68,7 @@ CONFFILE_HEADER_SIGNATURE = '# Generated by VDSM version' +EXT_BRCTL = '/usr/sbin/brctl' EXT_IFDOWN = '/sbin/ifdown' EXT_IFUP = '/sbin/ifup' @@ -209,7 +210,7 @@ ifacetracking.add(bridge.name) ifdown(bridge.name) self._removeSourceRoute(bridge) - cmd.exec_sync([constants.EXT_BRCTL, 'delbr', bridge.name]) + cmd.exec_sync([EXT_BRCTL, 'delbr', bridge.name]) self.configApplier.removeBridge(bridge.name) self.net_info.del_bridge(bridge.name) if bridge.port: @@ -774,7 +775,7 @@ ifdown(dev) if os.path.exists('/sys/class/net/%s/bridge' % dev): # ifdown is not enough to remove nicless bridges - cmd.exec_sync([constants.EXT_BRCTL, 'delbr', dev]) + cmd.exec_sync([EXT_BRCTL, 'delbr', dev]) if _is_bond_name(dev): if _is_running_bond(dev): with open(BONDING_MASTERS, 'w') as f: diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 7ec22ef..a47e4cd 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -29,8 +29,7 @@ import six import vdsm.config -from vdsm.constants import EXT_BRCTL -from vdsm.network.configurators.ifcfg import EXT_IFDOWN, EXT_IFUP +from vdsm.network.configurators.ifcfg import EXT_BRCTL, EXT_IFDOWN, EXT_IFUP from vdsm.network import ipwrapper from vdsm.network import netswitch from vdsm.network.ip import dhclient diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index 4122ad4..b3d2927 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -32,9 +32,10 @@ from nose.plugins.skip import SkipTest -from vdsm.constants import EXT_BRCTL, EXT_TC +from vdsm.constants import EXT_TC from vdsm import cpuarch from vdsm.network import cmd as cmd +from vdsm.network.configurators.ifcfg import EXT_BRCTL from vdsm.network.ip import address from vdsm.network.ip import dhclient from vdsm.network.ipwrapper import ( -- To view, visit https://gerrit.ovirt.org/79277 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id49fc16232787c905ce9bda5731c08b2f568849f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: net: move IFDOWN into ifcfg
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net: move IFDOWN into ifcfg ...................................................................... net: move IFDOWN into ifcfg Nobody outside the ifcfg configurator needs IFDOWN. It resolves to /sbin/ifdown on all platforms. This patch localizes the constant into the network subsystem. Change-Id: I9c7a40c0763da4e919f4b9187973c9cb0d5f0c54 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M configure.ac M lib/vdsm/constants.py.in M lib/vdsm/network/configurators/ifcfg.py M tests/functional/networkTests.py 4 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/79251/1 diff --git a/configure.ac b/configure.ac index 80a20d2..23f466c 100644 --- a/configure.ac +++ b/configure.ac @@ -336,7 +336,6 @@ AC_PATH_PROG([FUSER_PATH], [fuser], [/sbin/fuser]) AC_PATH_PROG([GREP_PATH], [grep], [/bin/grep]) AC_PATH_PROG([HWCLOCK_PATH], [hwclock], [/usr/sbin/hwclock]) -AC_PATH_PROG([IFDOWN_PATH], [ifdown], [/sbin/ifdown]) AC_PATH_PROG([IFUP_PATH], [ifup], [/sbin/ifup]) AC_PATH_PROG([IONICE_PATH], [ionice], [/usr/bin/ionice]) AC_PATH_PROG([IP_PATH], [ip], [/sbin/ip]) diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 127f553..46d2b43 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -108,7 +108,6 @@ EXT_GREP = '@GREP_PATH@' -EXT_IFDOWN = '@IFDOWN_PATH@' EXT_IFUP = '@IFUP_PATH@' EXT_IONICE = '@IONICE_PATH@' EXT_ISCSIADM = '@ISCSIADM_PATH@' diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index a53029e..3acd091 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -68,6 +68,8 @@ CONFFILE_HEADER_SIGNATURE = '# Generated by VDSM version' +EXT_IFDOWN = '/sbin/ifdown' + def is_available(): return True @@ -844,7 +846,7 @@ def ifdown(iface): "Bring down an interface" - rc, _, _ = cmd.exec_sync([constants.EXT_IFDOWN, iface]) + rc, _, _ = cmd.exec_sync([EXT_IFDOWN, iface]) return rc diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index e0ea749..ae7c79e 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -29,7 +29,8 @@ import six import vdsm.config -from vdsm.constants import EXT_BRCTL, EXT_IFUP, EXT_IFDOWN +from vdsm.constants import EXT_BRCTL, EXT_IFUP +from vdsm.network.configurators.ifcfg import EXT_IFDOWN from vdsm.network import ipwrapper from vdsm.network import netswitch from vdsm.network.ip import dhclient -- To view, visit https://gerrit.ovirt.org/79251 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c7a40c0763da4e919f4b9187973c9cb0d5f0c54 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: openstacknet hook: do not use vdsm-internal constants
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: openstacknet hook: do not use vdsm-internal constants ...................................................................... openstacknet hook: do not use vdsm-internal constants Hooks should avoid vdsm internals. Luckily, EXT_BRCTL is already defined in openstrack_utils. The hook script should use its locally-available definition. Change-Id: Iee6647bce1eba3042f00ec74742d0cadc8ab329a Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm_hooks/openstacknet/after_device_create.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/79254/1 diff --git a/vdsm_hooks/openstacknet/after_device_create.py b/vdsm_hooks/openstacknet/after_device_create.py index f98c166..9e5c8c1 100755 --- a/vdsm_hooks/openstacknet/after_device_create.py +++ b/vdsm_hooks/openstacknet/after_device_create.py @@ -34,7 +34,7 @@ from openstacknet_utils import VNIC_ID_KEY from openstacknet_utils import devName from openstacknet_utils import executeOrExit -from vdsm.constants import EXT_BRCTL +from openstacknet_utils import EXT_BRCTL def disconnectVnic(portId): -- To view, visit https://gerrit.ovirt.org/79254 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee6647bce1eba3042f00ec74742d0cadc8ab329a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: RPC client: Add methods to subscribe, unsubscribe and notify
by Code Review 11 Jul '17

11 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC client: Add methods to subscribe, unsubscribe and notify ...................................................................... Patch Set 21: (1 comment) https://gerrit.ovirt.org/#/c/78657/21/lib/vdsm/client.py File lib/vdsm/client.py: Line 214 Line 215 Line 216 Line 217 Line 218 why do you remove that? -- To view, visit https://gerrit.ovirt.org/78657 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie5b1e2eace452bf663c34c721bbe3ff9fcabb095 Gerrit-PatchSet: 21 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Recieve and parse messages from multiple subscriptions
by Code Review 11 Jul '17

11 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Recieve and parse messages from multiple subscriptions ...................................................................... Patch Set 23: (6 comments) https://gerrit.ovirt.org/#/c/78656/23//COMMIT_MSG Commit Message: Line 7: RPC: Recieve and parse messages from multiple subscriptions Line 8: Line 9: JsonRpcClient parses json messages Line 10: from multiple subscriptions and calls Line 11: the registered callback. I really don't understand what you're doing in that patch from the commit msg.. please explain - from the text here I understand that JsonRpcClient parse msgs, and call callbacks.. wasn't it like that before? do you add something new? Line 12: Line 13: Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 https://gerrit.ovirt.org/#/c/78656/23/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 363: def __init__(self, transport): Line 364: self.log = logging.getLogger("jsonrpc.JsonRpcClient") Line 365: transport.set_message_handler( Line 366: lambda msg: self._handleMessage(msg) Line 367: ) why is it needed? Line 368: Line 369: self._transport = transport Line 370: self._runningRequests = {} Line 371: self._lock = Lock() Line 417: lambda msg: self._handleMessage(msg, callback) Line 418: ) Line 419: Line 420: def unsubscribe(self, sub_id): Line 421: self._transport.unsubscribe(sub_id) renaming - separate patch you can make one patch for all renames. I'd love that Line 422: Line 423: def notify(self, event_id, dest, event_schema, params=None): Line 424: """ Line 425: JsonRpcClient notify method, sends an event on a spesific queue Line 454: if isinstance(obj, list): Line 455: map(self._processIncomingResponse, obj) Line 456: return Line 457: Line 458: resp = JsonRpcResponse.fromRawObject(obj) renaming - separate patch Line 459: with self._lock: Line 460: if resp.id is None: Line 461: self.log.warning( Line 462: "Got an error from server without an ID (%s)", Line 487: mobj = json.loads(message) Line 488: isResponse = self._isResponse(mobj) Line 489: except: Line 490: self.log.exception("Problem parsing message from client") Line 491: return this is big change\fix... you must explain. it worth separate patch Line 492: Line 493: if isResponse: Line 494: self._processIncomingResponse(mobj) Line 495: else: https://gerrit.ovirt.org/#/c/78656/23/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 610 Line 611 Line 612 Line 613 Line 614 no more _handle_message calls? -- To view, visit https://gerrit.ovirt.org/78656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4f5df1a5208281241be82f9e651788eca520be64 Gerrit-PatchSet: 23 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Refactor ClientRpcTransportAdapter
by Code Review 11 Jul '17

11 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Refactor ClientRpcTransportAdapter ...................................................................... Patch Set 18: (1 comment) https://gerrit.ovirt.org/#/c/78655/18//COMMIT_MSG Commit Message: Line 3: AuthorDate: 2017-06-26 11:22:07 +0200 Line 4: Commit: Andrej Krejcir <akrejcir(a)redhat.com> Line 5: CommitDate: 2017-07-11 15:54:35 +0200 Line 6: Line 7: RPC: Refactor ClientRpcTransportAdapter if you call it "Refactor" - why not also to move this code out of stompreactor and have all client code in one module.common code between server to client can be maybe in this module/. what do you think? Line 8: Line 9: The class now subscribes in the constructor, Line 10: instead of taking an existing subscription Line 11: as a parameter. -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 18 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Refactor ClientRpcTransportAdapter
by Code Review 11 Jul '17

11 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Refactor ClientRpcTransportAdapter ...................................................................... Patch Set 18: (1 comment) https://gerrit.ovirt.org/#/c/78655/18//COMMIT_MSG Commit Message: Line 7: RPC: Refactor ClientRpcTransportAdapter Line 8: Line 9: The class now subscribes in the constructor, Line 10: instead of taking an existing subscription Line 11: as a parameter. what about your addition of response queue.. also interesting to mention Line 12: Line 13: Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 18 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Refactor ClientRpcTransportAdapter
by Code Review 11 Jul '17

11 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Refactor ClientRpcTransportAdapter ...................................................................... Patch Set 18: Code-Review-1 (3 comments) https://gerrit.ovirt.org/#/c/78655/18/lib/yajsonrpc/__init__.py File lib/yajsonrpc/__init__.py: Line 478 Line 479 Line 480 Line 481 Line 482 please do this change in separate patch. it doesn't look related. just removal of redundant code which is awesome! https://gerrit.ovirt.org/#/c/78655/18/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 584: Line 585: """ Line 586: In order to process message we need to set message Line 587: handler which is responsible for processing jsonrpc Line 588: content of the message. now we have only 1 handler? specify what type of handle i can set here Line 589: """ Line 590: def set_message_handler(self, handler): Line 591: self._message_handler = handler Line 592: Line 610: def unsubscribe(self, sub): Line 611: self._client.unsubscribe(sub) Line 612: Line 613: def _handle_message(self, sub, frame): Line 614: self._message_handler(frame.body) please do this change in separate patch. it doesn't look related. just removal of redundant code which is awesome! Line 615: Line 616: def close(self): Line 617: self._sub.unsubscribe() Line 618: self._client.close() -- To view, visit https://gerrit.ovirt.org/78655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19cad2983a94303cdcb07a4a5aacb074851d6b6c Gerrit-PatchSet: 18 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: RPC: Refactor JSON RPC exceptions
by Code Review 11 Jul '17

11 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: RPC: Refactor JSON RPC exceptions ...................................................................... Patch Set 17: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/78660 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958 Gerrit-PatchSet: 17 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: spec: install 85-vdsm-hook-fcoe.preset in Makefile
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: install 85-vdsm-hook-fcoe.preset in Makefile ...................................................................... spec: install 85-vdsm-hook-fcoe.preset in Makefile Change-Id: I004f15bdf34c5d6f6711766867839a4140b43f6f Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm.spec.in M vdsm_hooks/fcoe/Makefile.am 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/79218/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index b2c4fe4..6adc36b 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -731,10 +731,6 @@ install -dDm 0755 %{buildroot}@VDSMLOGDIR@ touch %{buildroot}@VDSMLOGDIR@/{mom.log,supervdsm.log,vdsm.log} -%if 0%{?with_hooks} -install -Dm 0644 vdsm_hooks/fcoe/85-vdsm-hook-fcoe.preset %{buildroot}%{_presetdir} -%endif - %if 0%{?rhel} # This is not commonplace, but we want /var/log/core to be a world-writable # dropbox for core dumps diff --git a/vdsm_hooks/fcoe/Makefile.am b/vdsm_hooks/fcoe/Makefile.am index 9d756c0..20160bd 100644 --- a/vdsm_hooks/fcoe/Makefile.am +++ b/vdsm_hooks/fcoe/Makefile.am @@ -27,6 +27,9 @@ $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_network_setup $(INSTALL_SCRIPT) $(srcdir)/fcoe_before_network_setup.py \ $(DESTDIR)$(vdsmhooksdir)/before_network_setup/50_fcoe + $(INSTALL_DATA) ./85-vdsm-hook-fcoe.preset \ + $(DESTDIR)/usr/lib/systemd/system-preset/ uninstall-local: $(RM) $(DESTDIR)$(vdsmhooksdir)/before_network_setup/50_fcoe + $(RM) $(DESTDIR)/usr/lib/systemd/system-preset/85-vdsm-hook-fcoe.preset -- To view, visit https://gerrit.ovirt.org/79218 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I004f15bdf34c5d6f6711766867839a4140b43f6f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[master]: spec: install 85-vdsmd.preset in Makefile
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: install 85-vdsmd.preset in Makefile ...................................................................... spec: install 85-vdsmd.preset in Makefile Change-Id: I6b6aabe75cfc00d90fdeb1ae79c72ef7fcec0e4d Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M init/systemd/Makefile.am M vdsm.spec.in 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/79217/1 diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am index 7bd123e..20a92b7 100644 --- a/init/systemd/Makefile.am +++ b/init/systemd/Makefile.am @@ -46,7 +46,11 @@ $(MKDIR_P) $(DESTDIR)/etc/systemd/system/libvirtd.service.d $(INSTALL_DATA) ./unlimited-core.conf \ $(DESTDIR)/etc/systemd/system/libvirtd.service.d/unlimited-core.conf + $(MKDIR_P) $(DESTDIR)/usr/lib/systemd/system-preset + $(INSTALL_DATA) ./85-vdsmd.preset \ + $(DESTDIR)/usr/lib/systemd/system-preset/85-vdsmd.preset uninstall-local: $(RM) $(DESTDIR)/usr/lib/tmpfiles.d/vdsm.conf $(RM) $(DESTDIR)/etc/systemd/system/libvirtd.service.d/unlimited-core.conf + $(RM) $(DESTDIR)/usr/lib/systemd/system-preset/85-vdsmd.preset diff --git a/vdsm.spec.in b/vdsm.spec.in index fb96993..b2c4fe4 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -731,8 +731,6 @@ install -dDm 0755 %{buildroot}@VDSMLOGDIR@ touch %{buildroot}@VDSMLOGDIR@/{mom.log,supervdsm.log,vdsm.log} -install -Dm 0644 init/systemd/85-vdsmd.preset %{buildroot}%{_presetdir}/85-vdsmd.preset - %if 0%{?with_hooks} install -Dm 0644 vdsm_hooks/fcoe/85-vdsm-hook-fcoe.preset %{buildroot}%{_presetdir} %endif -- To view, visit https://gerrit.ovirt.org/79217 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b6aabe75cfc00d90fdeb1ae79c72ef7fcec0e4d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: spec: install tmpfiles.d/vdsm.conf and libvirtd.service.d/un...
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: install tmpfiles.d/vdsm.conf and libvirtd.service.d/unlimited-core.conf in Makefile ...................................................................... spec: install tmpfiles.d/vdsm.conf and libvirtd.service.d/unlimited-core.conf in Makefile Another little step in the quest to clean the spec file. Change-Id: Ieed7246abc8ab2cdaf81a3869fcc2bc9458f4813 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M init/systemd/Makefile.am M vdsm.spec.in 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/79216/1 diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am index 8f1e12b..7bd123e 100644 --- a/init/systemd/Makefile.am +++ b/init/systemd/Makefile.am @@ -38,3 +38,15 @@ all-local: \ $(nodist_noinst_DATA) \ $(NULL) + +install-data-local: vdsm-tmpfiles.d.conf + $(MKDIR_P) $(DESTDIR)/usr/lib/tmpfiles.d + $(INSTALL_DATA) ./vdsm-tmpfiles.d.conf \ + $(DESTDIR)/usr/lib/tmpfiles.d/vdsm.conf + $(MKDIR_P) $(DESTDIR)/etc/systemd/system/libvirtd.service.d + $(INSTALL_DATA) ./unlimited-core.conf \ + $(DESTDIR)/etc/systemd/system/libvirtd.service.d/unlimited-core.conf + +uninstall-local: + $(RM) $(DESTDIR)/usr/lib/tmpfiles.d/vdsm.conf + $(RM) $(DESTDIR)/etc/systemd/system/libvirtd.service.d/unlimited-core.conf diff --git a/vdsm.spec.in b/vdsm.spec.in index f0edb87..fb96993 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -733,11 +733,6 @@ install -Dm 0644 init/systemd/85-vdsmd.preset %{buildroot}%{_presetdir}/85-vdsmd.preset -install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \ - %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf -install -Dm 0644 init/systemd/unlimited-core.conf \ - %{buildroot}%{_sysconfdir}/systemd/system/libvirtd.service.d/unlimited-core.conf - %if 0%{?with_hooks} install -Dm 0644 vdsm_hooks/fcoe/85-vdsm-hook-fcoe.preset %{buildroot}%{_presetdir} %endif -- To view, visit https://gerrit.ovirt.org/79216 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieed7246abc8ab2cdaf81a3869fcc2bc9458f4813 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: vdsm: hooks: reduce scope for after_disk_prepare
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: vdsm: hooks: reduce scope for after_disk_prepare ...................................................................... Patch Set 7: (4 comments) https://gerrit.ovirt.org/#/c/78529/7//COMMIT_MSG Commit Message: Line 9: Add a whitelist of attributes passed to and updated from Line 10: the after_disk_prepare hook. Line 11: No intended change in behaviour: the whitelist is modeled Line 12: on the needs of the localdisk hook. Line 13: please state the motivation: we need to simplify the hook API so we can limit the data that needs to be extracted from and updated into the devicexml. Line 14: We are not sure we will backport this to 4.1.z, but the Line 15: patch is made ready for that. Line 16: Line 17: Change-Id: I5c39d893000ad2d4755b95d8ec9258840423f04d https://gerrit.ovirt.org/#/c/78529/7/lib/vdsm/hooks.py File lib/vdsm/hooks.py: Line 457: flags_file = _LAUNCH_FLAGS_PATH % vm_id Line 458: os.remove(flags_file) Line 459: Line 460: Line 461: _IMPORTED_KEYS = ('path', 'format') I would have hidden this inside its sole using module (vm.py) but I can live with this here. Line 462: _EXPORTED_KEYS = _IMPORTED_KEYS + ( Line 463: 'device', 'type', 'imageID', 'volumeID', 'domainID', 'poolID' Line 464: ) Line 465: https://gerrit.ovirt.org/#/c/78529/7/static/usr/share/man/man8/vdsmd.8.in File static/usr/share/man/man8/vdsmd.8.in: PS7, Line 153: those the following PS7, Line 158: modify modifies -- To view, visit https://gerrit.ovirt.org/78529 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5c39d893000ad2d4755b95d8ec9258840423f04d Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: net: eliminate LEGACY_MANAGEMENT_NETWORKS
by Code Review 11 Jul '17

11 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: net: eliminate LEGACY_MANAGEMENT_NETWORKS ...................................................................... net: eliminate LEGACY_MANAGEMENT_NETWORKS LEGACY_MANAGEMENT_NETWORKS are used only once in netupgrade. There is no need to keep this constant any more Change-Id: Ie6314e7a7bf4a0043ad8660bb8416b1742697746 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/network/netupgrade.py M tests/network/netupgrade_test.py 3 files changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/79243/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 004fbd9..127f553 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -25,9 +25,6 @@ GLUSTER_MGMT_ENABLED = bool(@GLUSTER_MGMT@) -# VDSM management networks -LEGACY_MANAGEMENT_NETWORKS = ('ovirtmgmt', 'rhevm') - # SMBIOS manufacturer SMBIOS_MANUFACTURER = '@SMBIOS_MANUFACTURER@' SMBIOS_OSNAME = '@SMBIOS_OSNAME@' diff --git a/lib/vdsm/network/netupgrade.py b/lib/vdsm/network/netupgrade.py index c57d69e..b342b77 100644 --- a/lib/vdsm/network/netupgrade.py +++ b/lib/vdsm/network/netupgrade.py @@ -23,7 +23,6 @@ import six from vdsm.config import config -from vdsm.constants import LEGACY_MANAGEMENT_NETWORKS from vdsm.virt import libvirtnetwork @@ -91,7 +90,8 @@ def _normalize_net_address(networks): for net_name, net_attr in six.viewitems(networks): if 'defaultRoute' not in net_attr: - net_attr['defaultRoute'] = net_name in LEGACY_MANAGEMENT_NETWORKS + net_attr['defaultRoute'] = net_name in ('ovirtmgmt', 'rhevm') + def _normalize_net_ifcfg_keys(networks): diff --git a/tests/network/netupgrade_test.py b/tests/network/netupgrade_test.py index a9fa744..81946f7 100644 --- a/tests/network/netupgrade_test.py +++ b/tests/network/netupgrade_test.py @@ -27,8 +27,6 @@ @attr(type='unit') -(a)mock.patch.object( - netupgrade, 'LEGACY_MANAGEMENT_NETWORKS', ('ovirtmgmt', 'rhevm')) @mock.patch.object(netupgrade.libvirtnetwork, 'networks', lambda: ()) @mock.patch.object(netupgrade, 'PersistentConfig') @mock.patch.object(netupgrade, 'RunningConfig') @@ -88,8 +86,6 @@ @attr(type='unit') -(a)mock.patch.object( - netupgrade, 'LEGACY_MANAGEMENT_NETWORKS', ('ovirtmgmt', 'rhevm')) @mock.patch.object(netupgrade, 'netinfo', lambda x: None) @mock.patch.object(netupgrade, 'NetInfo', lambda x: None) @mock.patch.object(netupgrade, 'libvirt_vdsm_nets', lambda x: None) @@ -127,8 +123,6 @@ @attr(type='integration') -(a)mock.patch.object( - netupgrade, 'LEGACY_MANAGEMENT_NETWORKS', ('ovirtmgmt', 'rhevm')) @mock.patch.object(netupgrade.libvirtnetwork, 'networks', lambda: ()) class NetUpgradeVolatileRunConfig(VdsmTestCase): -- To view, visit https://gerrit.ovirt.org/79243 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6314e7a7bf4a0043ad8660bb8416b1742697746 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: concurrent: Log BaseException when threads finish
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: concurrent: Log BaseException when threads finish ...................................................................... Patch Set 1: Code-Review+1 did someone raise a string somewhere?! -- To view, visit https://gerrit.ovirt.org/79241 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2570e083bb56a832fee978114ef6c7386e6860d6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(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: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: spec: Conditionally use gluster version
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79128 ) Change subject: spec: Conditionally use gluster version ...................................................................... spec: Conditionally use gluster version Use glusterfs >=3.8 for RHEL and use latest upstream for all other distro. Change-Id: I838d64527ff27f9403355e6aae51832a1db971ac Signed-off-by: Sahina Bose <sabose(a)redhat.com> --- M vdsm.spec.in 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Nir Soffer: Verified Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/79128 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I838d64527ff27f9403355e6aae51832a1db971ac Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: spec: Conditionally use gluster version
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: spec: Conditionally use gluster version ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79128 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I838d64527ff27f9403355e6aae51832a1db971ac Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: [WIP] iscsi: netIfaceName: expect network name
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: [WIP] iscsi: netIfaceName: expect network name ...................................................................... [WIP] iscsi: netIfaceName: expect network name This is pseudo code for letting Engine pass the network it would like to use for iscsi connection, and let Vdsm resolve it to the specific IP-bearing interface to be used by iscsiadm. Without this patch, Engine has to know too much about the implementation of networks on Vdsm. Change-Id: Ia50582ae0202e4dd058c254f3b34d8817d28fe80 Bug-Url: https://bugzilla.redhat.com/1441245 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/storage/hsm.py 1 file changed, 17 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/79236/1 diff --git a/lib/vdsm/storage/hsm.py b/lib/vdsm/storage/hsm.py index 22841f7..99c19d1 100644 --- a/lib/vdsm/storage/hsm.py +++ b/lib/vdsm/storage/hsm.py @@ -130,16 +130,21 @@ sd.GLUSTERFS_DOMAIN: 'glusterfs'} -def _updateIfaceNameIfNeeded(iface, netIfaceName): +def _updateIfaceNameIfNeeded(iface, network_name): if iface.netIfaceName is None: - iface.netIfaceName = netIfaceName + if network_name is a network name: + iface.netIfaceName = northbound iface of network_name + else: + # Engine < 4.2 may pass the intrface name instead of the network + # name. + iface.netIfaceName = network_name iface.update() return True return False -def _resolveIscsiIface(ifaceName, initiatorName, netIfaceName): +def _resolveIscsiIface(ifaceName, initiatorName, network_name): if not ifaceName: return iscsi.IscsiInterface('default') @@ -148,14 +153,16 @@ if iface.name != ifaceName: continue - if netIfaceName is not None: - if (not _updateIfaceNameIfNeeded(iface, netIfaceName) and + if network_name is not None: + if (not _updateIfaceNameIfNeeded(iface, network_name) and netIfaceName != iface.netIfaceName): - logging.error('iSCSI netIfaceName coming from engine [%s] ' - 'is different from iface.net_ifacename ' - 'present on the system [%s]. Aborting iscsi ' - 'iface [%s] configuration.' % - (netIfaceName, iface.netIfaceName, iface.name)) + logging.error( + 'network_name coming from engine [%s] was resolved to' + 'iSCSI netIfaceName [%s] which is different from ' + 'iface.net_ifacename present on the system [%s]. ' + 'Aborting iscsi iface [%s] configuration.' % + (network_name, netIfaceName, iface.netIfaceName, + iface.name)) raise se.iSCSIifaceError() -- To view, visit https://gerrit.ovirt.org/79236 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia50582ae0202e4dd058c254f3b34d8817d28fe80 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 0

Change in vdsm[master]: net: Report lldp through new getLldp command
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Report lldp through new getLldp command ...................................................................... Patch Set 5: (1 comment) https://gerrit.ovirt.org/#/c/79093/5/lib/vdsm/network/api.py File lib/vdsm/network/api.py: Line 284: def remove_ovs_port(bridge, port): Line 285: netswitch.configurator.ovs_remove_port(bridge, port) Line 286: Line 287: Line 288: def lldp_info(device): > Is such a complex filtering used in other placed in VDSM already? getVMList has a "vmList" argument specifying which vmid are interesting to the caller. (I hope I understood your question) Line 289: """" Line 290: Get LLDP information of a device. Line 291: Line 292: Returns LLDP Information -- To view, visit https://gerrit.ovirt.org/79093 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1e5e81cfbfe9c714d8173ecd6ee20f8b59bd14fe Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dominik Holler <dholler(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Dominik Holler <dholler(a)redhat.com> Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 7: Code-Review+2 I prefer that. more clear to me -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 6: (1 comment) https://gerrit.ovirt.org/#/c/79194/6/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 594: from vdsm.sslutils import CLIENT_PROTOCOL, SSLContext Line 595: sslctx = SSLContext(key_file=constants.KEY_FILE, Line 596: cert_file=constants.CERT_FILE, Line 597: ca_certs=constants.CA_FILE, Line 598: protocol=CLIENT_PROTOCOL) > just write it directly the value instead of this CLIENT_PROTCOL constant, i ssl.PROTOCOL_SSLv23 Line 599: return StandAloneRpcClient(host, port, "jms.topic.vdsm_requests", Line 600: str(uuid4()), sslctx, lazy_start=False) Line 601: Line 602: -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 6: (1 comment) https://gerrit.ovirt.org/#/c/79194/6/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 594: from vdsm.sslutils import CLIENT_PROTOCOL, SSLContext Line 595: sslctx = SSLContext(key_file=constants.KEY_FILE, Line 596: cert_file=constants.CERT_FILE, Line 597: ca_certs=constants.CA_FILE, Line 598: protocol=CLIENT_PROTOCOL) just write it directly the value instead of this CLIENT_PROTCOL constant, if its always the same value Line 599: return StandAloneRpcClient(host, port, "jms.topic.vdsm_requests", Line 600: str(uuid4()), sslctx, lazy_start=False) Line 601: Line 602: -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 5: (1 comment) https://gerrit.ovirt.org/#/c/79194/5//COMMIT_MSG Commit Message: Line 7: ssl: wrong protocol used by the client Line 8: Line 9: Line 10: No matter which ssl implementation we are using we need to pass Line 11: CLIENT_PROTOCOL from sslutils and ignore protocol config settings. protocol config settings? you mean the value that we can configure in vdsm.conf? Line 12: Line 13: This change is related to ovirt-4.1 branch since on master we are using Line 14: only one ssl implementation - native ssl. Line 15: -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 5: (2 comments) https://gerrit.ovirt.org/#/c/79194/5/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 24 Line 25 Line 26 Line 27 Line 28 this gives the config value Line 590: there is a need to customize please use StandAloneRpcClient(). Line 591: """ Line 592: sslctx = None Line 593: if ssl: Line 594: from vdsm.sslutils import CLIENT_PROTOCOL, SSLContext this gives hard-coded value? Line 595: sslctx = SSLContext(key_file=constants.KEY_FILE, Line 596: cert_file=constants.CERT_FILE, Line 597: ca_certs=constants.CA_FILE, Line 598: protocol=CLIENT_PROTOCOL) -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 4: (1 comment) https://gerrit.ovirt.org/#/c/79194/4/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 590: there is a need to customize please use StandAloneRpcClient(). Line 591: """ Line 592: sslctx = None Line 593: if ssl: Line 594: from vdsm.sslutils import CLIENT_PROTOCOL, SSLContext > No it is not, sslcompat give you value depending on config.py but here we w and both called CLIENT_PROTOCOL? this looks like a magic fix. I import the variable from different location and I get different behavior - have different name if each point to different meaning Line 595: sslctx = SSLContext(key_file=constants.KEY_FILE, Line 596: cert_file=constants.CERT_FILE, Line 597: ca_certs=constants.CA_FILE, Line 598: protocol=CLIENT_PROTOCOL) -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[ovirt-4.1]: ssl: wrong protocol used by the client
by Code Review 10 Jul '17

10 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: ssl: wrong protocol used by the client ...................................................................... Patch Set 4: (3 comments) sorry, im not sure I understand the fix. added comments https://gerrit.ovirt.org/#/c/79194/4//COMMIT_MSG Commit Message: Line 6: Line 7: ssl: wrong protocol used by the client Line 8: Line 9: When vdsm uses m2crypto we pass CLIENT_PROTOCOL to vdsm client defined Line 10: by this implementation. The client uses always ssl so we need to make this sentence is not clear to me - I guess you meant we pass XX to Y which defines its ssl implementation? Line 11: sure to pass protocol for this implementation. Line 12: Line 13: This change is related to ovirt-4.1 branch since on master we are using Line 14: only one ssl implementation - native ssl. Line 9: When vdsm uses m2crypto we pass CLIENT_PROTOCOL to vdsm client defined Line 10: by this implementation. The client uses always ssl so we need to make Line 11: sure to pass protocol for this implementation. Line 12: Line 13: This change is related to ovirt-4.1 branch since on master we are using LABEL: OVIRT-4.1 ONLY Line 14: only one ssl implementation - native ssl. Line 15: Line 16: Line 17: Bug-Url: https://bugzilla.redhat.com/1468991 https://gerrit.ovirt.org/#/c/79194/4/lib/yajsonrpc/stompreactor.py File lib/yajsonrpc/stompreactor.py: Line 590: there is a need to customize please use StandAloneRpcClient(). Line 591: """ Line 592: sslctx = None Line 593: if ssl: Line 594: from vdsm.sslutils import CLIENT_PROTOCOL, SSLContext do you have CLIENT_PROTOCOL on both sslutils and sslcompact and they are different ? this is odd Line 595: sslctx = SSLContext(key_file=constants.KEY_FILE, Line 596: cert_file=constants.CERT_FILE, Line 597: ca_certs=constants.CA_FILE, Line 598: protocol=CLIENT_PROTOCOL) -- To view, visit https://gerrit.ovirt.org/79194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I82ec945a8e6520fdda8848861ef0b7a5922bf6d4 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Nelly Credi <ncredi(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: network: make sure to pass bytes to io.BytesIO
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78862 ) Change subject: network: make sure to pass bytes to io.BytesIO ...................................................................... network: make sure to pass bytes to io.BytesIO Change-Id: I756f87a1ec34f88c1ebeeb09462127aebbfad98a Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M tests/network/netinfo_test.py 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/78862 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I756f87a1ec34f88c1ebeeb09462127aebbfad98a Gerrit-PatchSet: 5 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: network: make sure to pass bytes to io.BytesIO
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: network: make sure to pass bytes to io.BytesIO ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/78862 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I756f87a1ec34f88c1ebeeb09462127aebbfad98a Gerrit-PatchSet: 4 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: spec: install udev-rules in Makefile
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: install udev-rules in Makefile ...................................................................... spec: install udev-rules in Makefile The %install section of the spec file should be much cleaner. This is only one tiny step in that direction. Change-Id: Ib70425bb775e2c3847e165118d3890181b99df30 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/storage/Makefile.am M vdsm.spec.in 2 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/79154/1 diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am index ced29f7..32ff9aa 100644 --- a/lib/vdsm/storage/Makefile.am +++ b/lib/vdsm/storage/Makefile.am @@ -105,3 +105,10 @@ vdsm-lvm.rules: vdsm_lvm_rules.template python $< > $@ + +install-data-local: vdsm-lvm.rules + $(MKDIR_P) $(DESTDIR)/usr/lib/udev/rules.d + $(INSTALL_DATA) vdsm-lvm.rules $(DESTDIR)/usr/lib/udev/rules.d/12-vdsm-lvm.rules + +uninstall-local: + $(RM) $(DESTDIR)/usr/lib/udev/rules.d/12-vdsm-lvm.rules diff --git a/vdsm.spec.in b/vdsm.spec.in index fb899fd..f0edb87 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -731,10 +731,6 @@ install -dDm 0755 %{buildroot}@VDSMLOGDIR@ touch %{buildroot}@VDSMLOGDIR@/{mom.log,supervdsm.log,vdsm.log} -# Install the lvm rules -install -Dm 0644 lib/vdsm/storage/vdsm-lvm.rules \ - %{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules - install -Dm 0644 init/systemd/85-vdsmd.preset %{buildroot}%{_presetdir}/85-vdsmd.preset install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \ -- To view, visit https://gerrit.ovirt.org/79154 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib70425bb775e2c3847e165118d3890181b99df30 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 5

Change in vdsm[ovirt-3.6]: net: Generate dump bonding options on boot and upgrade
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78780 ) Change subject: net: Generate dump bonding options on boot and upgrade ...................................................................... net: Generate dump bonding options on boot and upgrade Compatible bonding options aren't guaranteed across different kernel version, so a scenario where the kernel is upgraded and incompatible default options are lingering will cause problems. Instead of shipping with default options, dump bonding defaults on boot via network service and installation/upgrade via a new dedicated configurator. Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698 Bug-Id: https://bugzilla.redhat.com/1468240 Signed-off-by: Leon Goldberg <lgoldber(a)redhat.com> --- M init/systemd/vdsm-network.service.in M lib/vdsm/tool/configurators/Makefile.am A lib/vdsm/tool/configurators/bond_defaults.py M tests/Makefile.am R tests/bonding-defaults.json M tests/netinfoTests.py M tests/netmodelsTests.py M vdsm.spec.in M vdsm/Makefile.am 9 files changed, 60 insertions(+), 15 deletions(-) Approvals: Michael Burman: 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/78780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Michael Burman <mburman(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[ovirt-3.6]: net: Generate dump bonding options on boot and upgrade
by Code Review 10 Jul '17

10 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Generate dump bonding options on boot and upgrade ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/78780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Michael Burman <mburman(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-3.6]: ifcfg: ad_actor_system can not be reset to its default value
by Code Review 09 Jul '17

09 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: ifcfg: ad_actor_system can not be reset to its default value ...................................................................... ifcfg: ad_actor_system can not be reset to its default value _restore_default_bond_options tried to reset this option to 00:00:00:00:00:00, which (on Fedora 23) causes "IOError: [Errno 22] Invalid argument", during testSetupNetworksActiveSlave. Linux documentation (bonding.txt) says that "The value can not be either NULL or Multicast". Let's add ad_actor_system to EXCLUDED_BONDING_ENTRIES for now and assume that if a user set ad_actor_system explicitly, she knows the way to reset it, and that is by setting it to the bond's own MAC address: In an AD system, this specifies the mac-address for the actor in protocol packet exchanges (LACPDUs). The value cannot be NULL or multicast. It is preferred to have the local-admin bit set for this mac but driver does not enforce it. If the value is not given then system defaults to using the masters' mac address as actors' system address. Change-Id: I3f307b64546c3efa73ca202e97ced49eeb9670e9 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> Reviewed-on: https://gerrit.ovirt.org/57490 Reviewed-by: Dan Kenigsberg <danken(a)redhat.com> Continuous-Integration: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/netinfo.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/78898/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index bfd7546..d93a3c9 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -72,7 +72,8 @@ _BONDING_LOADBALANCE_MODES = frozenset(('0', '2', '4', '5', '6')) _EXCLUDED_BONDING_ENTRIES = frozenset(( 'slaves', 'active_slave', 'mii_status', 'queue_id', 'ad_aggregator', - 'ad_num_ports', 'ad_actor_key', 'ad_partner_key', 'ad_partner_mac' + 'ad_num_ports', 'ad_actor_key', 'ad_partner_key', 'ad_partner_mac', + 'ad_actor_system' )) _IFCFG_ZERO_SUFFIXED = frozenset( ('IPADDR0', 'GATEWAY0', 'PREFIX0', 'NETMASK0')) -- To view, visit https://gerrit.ovirt.org/78898 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f307b64546c3efa73ca202e97ced49eeb9670e9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 6

Change in vdsm[ovirt-3.6]: net: Generate dump bonding options on boot and upgrade
by Code Review 09 Jul '17

09 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has removed a vote on this change. Change subject: net: Generate dump bonding options on boot and upgrade ...................................................................... Removed Verified-1 by gerrit-hooks <automation(a)ovirt.org> -- To view, visit https://gerrit.ovirt.org/78780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: deleteVote Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[ovirt-4.1]: net: On MTU change to the default value update the ifcfg file
by Code Review 09 Jul '17

09 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has submitted this change and it was merged. ( https://gerrit.ovirt.org/79162 ) Change subject: net: On MTU change to the default value update the ifcfg file ...................................................................... net: On MTU change to the default value update the ifcfg file When changing only the MTU on a bridged network to the default value (1500), the new value has not been updated in the ifcfg file. The problem has been detected on RHEL 7.4, where the MTU of the bridge is automatically updated to the default when it has no ports connected. Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Bug-Url: https://bugzilla.redhat.com/1460687 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/legacy_switch.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[ovirt-4.1]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review 09 Jul '17

09 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has submitted this change and it was merged. ( https://gerrit.ovirt.org/79161 ) Change subject: net: Relocate DEFAULT_MTU costant to link.iface module ...................................................................... net: Relocate DEFAULT_MTU costant to link.iface module Users of the DEFAULT_MTU do not directly need netinfo, they just require the default mtu value. This patch is partially cleanin up netinfo package and avoids uneeded dependency on netinfo. Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Bug-Url: https://bugzilla.redhat.com/1460687 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/canonicalize.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/link/iface.py M lib/vdsm/network/netinfo/mtus.py M tests/functional/networkTests.py M tests/network/config_network_test.py 6 files changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79161 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>

1 0

Change in vdsm[master]: Move fencing code to host/fencing.py
by Code Review 09 Jul '17

09 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has uploaded a new change for review. Change subject: Move fencing code to host/fencing.py ...................................................................... Move fencing code to host/fencing.py The intention is to split the fence code to be in generic location. Later patches will pack this code in separate package and will be used in separate micro service in ovirt cluster. Change-Id: I73763a7a784b17bd2b8bd04a22c0f5a5ec4ab1b6 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- A lib/vdsm/host/fencing.py M vdsm/API.py 2 files changed, 203 insertions(+), 151 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/78927/1 diff --git a/lib/vdsm/host/fencing.py b/lib/vdsm/host/fencing.py new file mode 100644 index 0000000..2283af5 --- /dev/null +++ b/lib/vdsm/host/fencing.py @@ -0,0 +1,200 @@ +# +# Copyright 2017 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +from __future__ import absolute_import + +""" +The module is taking care of fencing command to a remote host. +agent is one of (rsa, ilo, drac5, ipmilan, etc) +action can be one of (status, on, off, reboot). +""" + +# using general logging +import logging +import os + +from vdsm import commands +from vdsm import constants +from vdsm import supervdsm +from vdsm.common import conv +from vdsm.common.define import doneCode +from vdsm.common.define import errCode +from vdsm.storage import clusterlock + +try: + import vdsm.gluster.fence as glusterFence +except ImportError: + pass + + +_log = logging.getLogger("fencing") + +# This global var will hold HSM instance or another provider that can retrieve Host Lease Status +# Therefore set_storage_monitor should be called before and set there a class that implements getHostLeaseStatus +# function. +_storageMonitor = None + + +def set_storage_monitor(monitor): + global _storageMonitor + _storageMonitor = monitor + + +def _fence(script, inp): + rc, out, err = commands.execCmd([script], data=inp) + _log.debug('rc %s inp %s out %s err %s', rc, + _hidePasswd(inp), out, err) + return rc, out, err + + +def _hidePasswd(text): + cleantext = '' + for line in text.splitlines(True): + if line.startswith('passwd='): + line = 'passwd=XXXX\n' + cleantext += line + return cleantext + + +def _should_fence(policy): + # Skip fencing if any of the condition mentioned in the fencing + # policy is met + if policy is None: + _log.debug('No policy specified') + return True + result = _check_virt_fencing_policies(policy) + if result: + result = _check_gluster_fencing_policies(policy) + return result + + +def _check_virt_fencing_policies(policy): + # skip fence execution if map of storage domains with host id is + # entered and at least one storage domain connection from host is + # alive. Also enforce the following gluster related fencing + # policies. + hostIdMap = policy.get('storageDomainHostIdMap') + if not hostIdMap: + _log.warning('No storageDomainHostIdMap provided') + return True + + result = _storageMonitor.getHostLeaseStatus(hostIdMap) + if result['status']['code'] != 0: + _log.error( + "Error getting host lease status, error code '%s'", + result['status']['code']) + return True + + # HOST_STATUS_LIVE means that host renewed its lease in last 80 + # seconds. If so, we consider the host Up and we won't execute + # fencing, even when it's unreachable from engine + for sd, status in result['domains'].iteritems(): + if status == clusterlock.HOST_STATUS_LIVE: + _log.debug("Host has live lease on '%s'", sd) + return False + + _log.debug("Host doesn't have any live lease") + return True + + +def _check_gluster_fencing_policies(policy): + # If skipFencingIfGlusterBricksUp is set to true the fencing should + # should be skipped if there is any brick up running in the host + # being fenced. + skipFencingIfGlusterBricksUp = \ + policy.get('skipFencingIfGlusterBricksUp') + # If skipFencingIfGlusterQuorumNotMet is set to true then fencing + # should be skipped if the gluster bricks are UP and fencing + # this host will bring down those bricks and quourm will be + # lost for any replicated volume in the gluster. + skipFencingIfGlusterQuorumNotMet = \ + policy.get('skipFencingIfGlusterQuorumNotMet') + hostUuid = policy.get('glusterServerUuid') + if skipFencingIfGlusterBricksUp \ + or skipFencingIfGlusterQuorumNotMet: + if not glusterFence: + _log.error("Required vdsm-gluster package is " + "missing on this host. Note that " + "gluster related fencing will not be" + "enforced!. Please install the missing " + "package in order to enforce gluster " + "related fencing polices") + return True + result, msg = glusterFence. \ + can_fence_host(supervdsm.getProxy(), hostUuid, + skipFencingIfGlusterBricksUp, + skipFencingIfGlusterQuorumNotMet) + + _log.debug(msg) + return result + + return True + + +def fence_node(addr, port, agent, username, password, action, secure=False, options='', policy=None): + _log.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,passwd=%s,' + 'action=%s,secure=%s,options=%s,policy=%s)', + addr, port, agent, username, password, action, secure, + options, policy) + + if action not in ('status', 'on', 'off', 'reboot'): + raise ValueError('illegal action ' + action) + + if action != 'status' and not _should_fence(policy): + _log.debug("Skipping execution of action '%s'", action) + return {'status': doneCode, 'operationStatus': 'skipped'} + + script = constants.EXT_FENCE_PREFIX + agent + + inp = ('agent=fence_%s\nipaddr=%s\nlogin=%s\naction=%s\n' + 'passwd=%s\n') % (agent, addr, username, action, password.value) + if port != '': + inp += 'port=%s\n' % (port,) + if conv.tobool(secure): + inp += 'secure=yes\n' + inp += options + + try: + rc, out, err = _fence(script, inp) + except OSError as e: + if e.errno == os.errno.ENOENT: + return errCode['fenceAgent'] + raise + _log.debug('rc %s in %s out %s err %s', rc, + _hidePasswd(inp), out, err) + if not 0 <= rc <= 2: + return {'status': {'code': 1, + 'message': out + err}} + message = doneCode['message'] + ret = 0 + if action == 'status': + if rc == 0: + power = 'on' + elif rc == 2: + power = 'off' + else: + power = 'unknown' + message = out + err + ret = rc + return {'status': {'code': ret, 'message': message}, + 'power': power} + if rc != 0: + message = out + err + return {'status': {'code': rc, 'message': message}, + 'power': 'unknown', 'operationStatus': 'initiated'} \ No newline at end of file diff --git a/vdsm/API.py b/vdsm/API.py index cf7c04e..e301f51 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -20,11 +20,8 @@ # # pylint: disable=R0904 -import os - from vdsm.network.errors import ConfigNetworkError -from vdsm import commands from vdsm import utils from clientIF import clientIF from vdsm import constants @@ -40,9 +37,9 @@ from vdsm.common import logutils from vdsm.common import response from vdsm.common import validate -from vdsm.common import conv from vdsm.host import api as hostapi from vdsm.host import caps +from vdsm.host import fencing # TODO fix name conflict and use from vdsm.storage import sd import vdsm.storage.sd from vdsm.storage import clusterlock @@ -64,11 +61,6 @@ haClient = None # Define here to work around pyflakes issue #13 try: import ovirt_hosted_engine_ha.client.client as haClient -except ImportError: - pass - -try: - import vdsm.gluster.fence as glusterFence except ImportError: pass @@ -1092,148 +1084,8 @@ # General Host functions def fenceNode(self, addr, port, agent, username, password, action, secure=False, options='', policy=None): - """Send a fencing command to a remote node. - - agent is one of (rsa, ilo, drac5, ipmilan, etc) - action can be one of (status, on, off, reboot).""" - - def fence(script, inp): - rc, out, err = commands.execCmd([script], data=inp) - self.log.debug('rc %s inp %s out %s err %s', rc, - hidePasswd(inp), out, err) - return rc, out, err - - def hidePasswd(text): - cleantext = '' - for line in text.splitlines(True): - if line.startswith('passwd='): - line = 'passwd=XXXX\n' - cleantext += line - return cleantext - - def should_fence(policy): - # Skip fencing if any of the condition mentioned in the fencing - # policy is met - result = False - if policy is None: - self.log.debug('No policy specified') - return True - result = check_virt_fencing_policies(policy) - if result: - result = check_gluster_fencing_policies(policy) - return result - - def check_virt_fencing_policies(policy): - # skip fence execution if map of storage domains with host id is - # entered and at least one storage domain connection from host is - # alive. Also enforce the following gluster related fencing - # policies. - hostIdMap = policy.get('storageDomainHostIdMap') - if not hostIdMap: - self.log.warning('No storageDomainHostIdMap provided') - return True - - result = self._irs.getHostLeaseStatus(hostIdMap) - if result['status']['code'] != 0: - self.log.error( - "Error getting host lease status, error code '%s'", - result['status']['code']) - return True - - # HOST_STATUS_LIVE means that host renewed its lease in last 80 - # seconds. If so, we consider the host Up and we won't execute - # fencing, even when it's unreachable from engine - for sd, status in result['domains'].iteritems(): - if status == clusterlock.HOST_STATUS_LIVE: - self.log.debug("Host has live lease on '%s'", sd) - return False - - self.log.debug("Host doesn't have any live lease") - return True - - def check_gluster_fencing_policies(policy): - # If skipFencingIfGlusterBricksUp is set to true the fencing should - # should be skipped if there is any brick up running in the host - # being fenced. - skipFencingIfGlusterBricksUp = \ - policy.get('skipFencingIfGlusterBricksUp') - # If skipFencingIfGlusterQuorumNotMet is set to true then fencing - # should be skipped if the gluster bricks are UP and fencing - # this host will bring down those bricks and quourm will be - # lost for any replicated volume in the gluster. - skipFencingIfGlusterQuorumNotMet = \ - policy.get('skipFencingIfGlusterQuorumNotMet') - hostUuid = policy.get('glusterServerUuid') - if skipFencingIfGlusterBricksUp \ - or skipFencingIfGlusterQuorumNotMet: - if not glusterFence: - self.log.error("Required vdsm-gluster package is " - "missing on this host. Note that " - "gluster related fencing will not be" - "enforced!. Please install the missing " - "package in order to enforce gluster " - "related fencing polices") - return True - result, msg = glusterFence. \ - can_fence_host(supervdsm.getProxy(), hostUuid, - skipFencingIfGlusterBricksUp, - skipFencingIfGlusterQuorumNotMet) - - self.log.debug(msg) - return result - - return True - - self.log.debug('fenceNode(addr=%s,port=%s,agent=%s,user=%s,passwd=%s,' - 'action=%s,secure=%s,options=%s,policy=%s)', - addr, port, agent, username, password, action, secure, - options, policy) - - if action not in ('status', 'on', 'off', 'reboot'): - raise ValueError('illegal action ' + action) - - if action != 'status' and not should_fence(policy): - self.log.debug("Skipping execution of action '%s'", action) - return {'status': doneCode, 'operationStatus': 'skipped'} - - script = constants.EXT_FENCE_PREFIX + agent - - inp = ('agent=fence_%s\nipaddr=%s\nlogin=%s\naction=%s\n' - 'passwd=%s\n') % (agent, addr, username, action, password.value) - if port != '': - inp += 'port=%s\n' % (port,) - if conv.tobool(secure): - inp += 'secure=yes\n' - inp += options - - try: - rc, out, err = fence(script, inp) - except OSError as e: - if e.errno == os.errno.ENOENT: - return errCode['fenceAgent'] - raise - self.log.debug('rc %s in %s out %s err %s', rc, - hidePasswd(inp), out, err) - if not 0 <= rc <= 2: - return {'status': {'code': 1, - 'message': out + err}} - message = doneCode['message'] - ret = 0 - if action == 'status': - if rc == 0: - power = 'on' - elif rc == 2: - power = 'off' - else: - power = 'unknown' - message = out + err - ret = rc - return {'status': {'code': ret, 'message': message}, - 'power': power} - if rc != 0: - message = out + err - return {'status': {'code': rc, 'message': message}, - 'power': 'unknown', 'operationStatus': 'initiated'} + fencing.set_storage_monitor(self._irs) + return fencing.fence_node(addr, port, agent, username, password, action, secure, options, policy) def ping(self): "Ping the server. Useful for tests" -- To view, visit https://gerrit.ovirt.org/78927 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73763a7a784b17bd2b8bd04a22c0f5a5ec4ab1b6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

1 2

Change in vdsm[ovirt-4.1]: net: On MTU change to the default value update the ifcfg file
by Code Review 08 Jul '17

08 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: On MTU change to the default value update the ifcfg file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: net: On MTU change to the default value update the ifcfg file
by Code Review 08 Jul '17

08 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has removed a vote on this change. Change subject: net: On MTU change to the default value update the ifcfg file ...................................................................... Removed Verified-1 by gerrit-hooks <automation(a)ovirt.org> -- To view, visit https://gerrit.ovirt.org/79162 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: deleteVote Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[ovirt-4.1]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review 08 Jul '17

08 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has removed gerrit-hooks from this change. ( https://gerrit.ovirt.org/79161 ) Change subject: net: Relocate DEFAULT_MTU costant to link.iface module ...................................................................... Removed reviewer gerrit-hooks with the following votes: * Verified-1 by gerrit-hooks <automation(a)ovirt.org> -- To view, visit https://gerrit.ovirt.org/79161 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: deleteReviewer Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com>

1 0

Change in vdsm[ovirt-4.1]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review 08 Jul '17

08 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Relocate DEFAULT_MTU costant to link.iface module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79161 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: packaging: eliminate /usr/lib/systemd/systemd-vdsmd
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: packaging: eliminate /usr/lib/systemd/systemd-vdsmd ...................................................................... packaging: eliminate /usr/lib/systemd/systemd-vdsmd This script was introduced many years ago (commit c01a733c) as a helper to the makeshift systemd service. Mistakenly, it was not removed by commit ad15e459 that introduced a proper systemd service. This patch drops the long-dead code. Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M .gitignore M init/systemd/Makefile.am D init/systemd/systemd-vdsmd.in M vdsm.spec.in 4 files changed, 0 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/79153/1 diff --git a/.gitignore b/.gitignore index 0f8849c..9937872 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ configure cscope.out doc/build -init/systemd/systemd-vdsmd init/systemd/vdsm-tmpfiles.d.conf init/vdsmd_init_common.sh lib/vdsm/api/vdsm-api.html diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am index 2ff6be8..8f1e12b 100644 --- a/init/systemd/Makefile.am +++ b/init/systemd/Makefile.am @@ -21,7 +21,6 @@ include $(top_srcdir)/build-aux/Makefile.subs nodist_noinst_DATA = \ - systemd-vdsmd \ vdsm-tmpfiles.d.conf \ $(NULL) @@ -32,7 +31,6 @@ EXTRA_DIST = \ 85-vdsmd.preset \ - systemd-vdsmd.in \ vdsm-tmpfiles.d.conf.in \ unlimited-core.conf \ $(NULL) diff --git a/init/systemd/systemd-vdsmd.in b/init/systemd/systemd-vdsmd.in deleted file mode 100644 index a502b62..0000000 --- a/init/systemd/systemd-vdsmd.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Copyright 2013 IBM, 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -usage_exit(){ - echo 'Usage: systemd-vdsmd reconfigure [force]' >&2 - exit 1 -} - -[ "$1" != "reconfigure" ] && usage_exit -[ -n "$2" -a "$2" != "force" ] && usage_exit - -if [ "$2" = "force" ] || ! "@BINDIR@/vdsm-tool" is-configured; then - "@BINDIR@/vdsm-tool" configure --force -fi diff --git a/vdsm.spec.in b/vdsm.spec.in index 4dc79f7..fb899fd 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -735,7 +735,6 @@ install -Dm 0644 lib/vdsm/storage/vdsm-lvm.rules \ %{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules -install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}%{_libdir}/systemd/systemd-vdsmd install -Dm 0644 init/systemd/85-vdsmd.preset %{buildroot}%{_presetdir}/85-vdsmd.preset install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \ @@ -858,7 +857,6 @@ %doc lib/vdsm/vdsm.conf.sample %doc README.logging %license COPYING -%{_libdir}/systemd/systemd-vdsmd %{_presetdir}/85-vdsmd.preset %{_unitdir}/dev-hugepages1G.mount %{_unitdir}/vdsmd.service -- To view, visit https://gerrit.ovirt.org/79153 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 1

Change in vdsm[master]: network: todo py3 nettestlib Tap
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: network: todo py3 nettestlib Tap ...................................................................... Patch Set 3: (1 comment) https://gerrit.ovirt.org/#/c/78863/3/tests/network/nettestlib.py File tests/network/nettestlib.py: Line 186: Line 187: _deviceListener = None Line 188: Line 189: def addDevice(self): Line 190: self._cloneDevice = open('/dev/net/tun', 'r+b', buffering=0) use io.open to have better control on file encoding Line 191: ifr = struct.pack('16sH', conv.to_binary(self.devName), self._IFF_TAP | Line 192: self._IFF_NO_PI) Line 193: fcntl.ioctl(self._cloneDevice, self._TUNSETIFF, ifr) Line 194: self.up() -- To view, visit https://gerrit.ovirt.org/78863 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9d899d6e8bfe332174b722362136cc79de982c28 Gerrit-PatchSet: 3 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: Jenkins CI Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: spec: drop VDSMRPCPYLIBDIR
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: drop VDSMRPCPYLIBDIR ...................................................................... spec: drop VDSMRPCPYLIBDIR The spec file always replaces @VDSMRPCPYLIBDIR@ with the path of vdsm.rpc package. This can be done much simpler in python code. The original complexity was introduced, most probably, because of the former separation between lib/vdsm/ and vdsm/ trees. Change-Id: Ia44205ba4b844d666d6a328c19b137f9ef47bb40 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/api/vdsmapi.py M lib/vdsm/constants.py.in M vdsm.spec.in 3 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/78910/1 diff --git a/lib/vdsm/api/vdsmapi.py b/lib/vdsm/api/vdsmapi.py index 148309e..985b122 100755 --- a/lib/vdsm/api/vdsmapi.py +++ b/lib/vdsm/api/vdsmapi.py @@ -72,7 +72,7 @@ from vdsm import constants localpath = os.path.dirname(__file__) - installedpath = constants.P_VDSM_RPC + installedpath = os.path.join(localpath, '..', 'rpc') for directory in (localpath, installedpath): path = os.path.join(directory, schema_name + '.yml') # we use source tree and deployment directory diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 18d71b2..004fbd9 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -76,7 +76,6 @@ P_LIBVIRT_VMCHANNELS = '/var/lib/libvirt/qemu/channels/' P_OVIRT_VMCONSOLES = '/var/run/ovirt-vmconsole-console/' P_VDSM = '@VDSMDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_RPC = '@VDSMRPCPYLIBDIR@/' P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line) P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line) P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) diff --git a/vdsm.spec.in b/vdsm.spec.in index 7084d91..3cc1ec3 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -723,8 +723,6 @@ -e 's/^raw_version_revision =.*/raw_version_revision = "'"${rawversion}"'"/' \ -e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' lib/vdsm/dsaversion.py -sed -i -e 's\@VDSMRPCPYLIBDIR@\%{python_sitelib}/%{vdsm_name}/rpc\g' lib/vdsm/constants.py - %install make DESTDIR=%{buildroot} install -- To view, visit https://gerrit.ovirt.org/78910 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia44205ba4b844d666d6a328c19b137f9ef47bb40 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 11

Change in vdsm[ovirt-3.6]: net: Generate dump bonding options on boot and upgrade
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Generate dump bonding options on boot and upgrade ...................................................................... Patch Set 8: Code-Review-1 -1 for visibility -- To view, visit https://gerrit.ovirt.org/78780 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com> Gerrit-Reviewer: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: On MTU change to the default value update the ifcfg file
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79110 ) Change subject: net: On MTU change to the default value update the ifcfg file ...................................................................... net: On MTU change to the default value update the ifcfg file When changing only the MTU on a bridged network to the default value (1500), the new value has not been updated in the ifcfg file. The problem has been detected on RHEL 7.4, where the MTU of the bridge is automatically updated to the default when it has no ports connected. Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Bug-Url: https://bugzilla.redhat.com/1460687 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/legacy_switch.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Meni Yakove: Verified Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79110 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79109 ) Change subject: net: Relocate DEFAULT_MTU costant to link.iface module ...................................................................... net: Relocate DEFAULT_MTU costant to link.iface module Users of the DEFAULT_MTU do not directly need netinfo, they just require the default mtu value. This patch is partially cleanin up netinfo package and avoids uneeded dependency on netinfo. Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Bug-Url: https://bugzilla.redhat.com/1460687 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/canonicalize.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/link/iface.py M lib/vdsm/network/netinfo/mtus.py M tests/functional/networkTests.py M tests/network/config_network_test.py 6 files changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/79109 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: On MTU change to the default value update the ifcfg file
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: On MTU change to the default value update the ifcfg file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79110 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Meni Yakove <myakove(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review 07 Jul '17

07 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Relocate DEFAULT_MTU costant to link.iface module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79109 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review 06 Jul '17

06 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Relocate DEFAULT_MTU costant to link.iface module ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/79109 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Increase netlink socket buffer size to 512KB
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Increase netlink socket buffer size to 512KB ...................................................................... Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/78928/2//COMMIT_MSG Commit Message: PS2, Line 7: 512KB where does this big number come from? -- To view, visit https://gerrit.ovirt.org/78928 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic8c9c03ff86a843021655945c1ece38abe0c738d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: virt: move the libvirt migration hook under lib/
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: virt: move the libvirt migration hook under lib/ ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/78569 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I066748a070d1779552c02361e617b1d418fcb668 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(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: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik <mpolednik(a)redhat.com> Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: network: make sure to pass bytes to io.BytesIO
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: network: make sure to pass bytes to io.BytesIO ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/78862/4/tests/network/netinfo_test.py File tests/network/netinfo_test.py: Line 105: @mock.patch.object(nics.io, 'open') Line 106: def test_valid_nic_speed(self, mock_io_open, mock_operstate): Line 107: values = ((b'0', nics.OPERSTATE_UP, 0), Line 108: (b'-10', nics.OPERSTATE_UP, 0), Line 109: (six.b(str(2 ** 16 - 1)), nics.OPERSTATE_UP, 0), > What a mess... but the kernel reports these numbers in ascii-coded decimals, not hexadecimals. the test should mimic that. Line 110: (six.b(str(2 ** 32 - 1)), nics.OPERSTATE_UP, 0), Line 111: (b'123', nics.OPERSTATE_UP, 123), Line 112: (b'', nics.OPERSTATE_UP, 0), Line 113: (b'', 'unknown', 0), -- To view, visit https://gerrit.ovirt.org/78862 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I756f87a1ec34f88c1ebeeb09462127aebbfad98a Gerrit-PatchSet: 4 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: mimicking and error, please ingnore
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: mimicking and error, please ingnore ...................................................................... mimicking and error, please ingnore Change-Id: I25597b866e25f3d74f1fa96f549b6f86a4bde831 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/vdsmd.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/79021/1 diff --git a/vdsm/vdsmd.py b/vdsm/vdsmd.py index ddfea54..b3c7566 100755 --- a/vdsm/vdsmd.py +++ b/vdsm/vdsmd.py @@ -6,6 +6,8 @@ # (at your option) any later version. See the files README and # LICENSE_GPL_v2 which accompany this distribution. # +GGGG + from __future__ import absolute_import from __future__ import print_function import sys -- To view, visit https://gerrit.ovirt.org/79021 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25597b866e25f3d74f1fa96f549b6f86a4bde831 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 3

Change in vdsm[master]: network: use bytes explicitly in netinfo.IPv4toMapped
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78861 ) Change subject: network: use bytes explicitly in netinfo.IPv4toMapped ...................................................................... network: use bytes explicitly in netinfo.IPv4toMapped Change-Id: I64518a0247baa91969b80c2204ee73e594ef5a72 Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M lib/vdsm/network/netinfo/addresses.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/78861 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64518a0247baa91969b80c2204ee73e594ef5a72 Gerrit-PatchSet: 4 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: network: replace Popen calls with exec_sync
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/77946 ) Change subject: network: replace Popen calls with exec_sync ...................................................................... network: replace Popen calls with exec_sync In order to do required decoding of command output with Python 3, use network.cmd.exec_sync to run commands that used to be executed explicitly via Popen. Change-Id: Ia28b23f41348a61331622cb362d7a3de5843f0e7 Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M lib/vdsm/network/ip/dhclient.py M tests/network/tc_test.py 2 files changed, 6 insertions(+), 10 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/77946 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia28b23f41348a61331622cb362d7a3de5843f0e7 Gerrit-PatchSet: 9 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: network: make ipwrapper.drv_name Python 3 compatible
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/77940 ) Change subject: network: make ipwrapper.drv_name Python 3 compatible ...................................................................... network: make ipwrapper.drv_name Python 3 compatible In Python 3 array.array does not support 'c' (Python char) type anymore. We need to ask for C chars (Python ints) instead and then decode returned data if needed. Change-Id: I2dee4fd4a1ac5470e739594704da5781589af1d3 Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M lib/vdsm/network/ipwrapper.py M tests/network/ipwrapper_test.py 2 files changed, 14 insertions(+), 8 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Dan Kenigsberg: Looks good to me, but someone else must approve Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/77940 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2dee4fd4a1ac5470e739594704da5781589af1d3 Gerrit-PatchSet: 18 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: network: to_str and to_binary
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78389 ) Change subject: network: to_str and to_binary ...................................................................... network: to_str and to_binary Move to_str and to_binary functions under network py2to3.py module as they were needed and duplicated in multiple places. Change-Id: I0f4853e48086c577a7b1ff3232eb567a62674e60 Signed-off-by: Petr Horacek <phoracek(a)redhat.com> --- M lib/vdsm/network/Makefile.am M lib/vdsm/network/cmd.py M lib/vdsm/network/netlink/libnl.py A lib/vdsm/network/py2to3.py M vdsm.spec.in 5 files changed, 60 insertions(+), 53 deletions(-) Approvals: Jenkins CI: Passed CI tests Petr Horáček: Verified Francesco Romani: Looks good to me, but someone else must approve Edward Haas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/78389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f4853e48086c577a7b1ff3232eb567a62674e60 Gerrit-PatchSet: 6 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: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(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: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: Revert stomp client reconect patches
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79006 ) Change subject: Revert stomp client reconect patches ...................................................................... Revert stomp client reconect patches This reverts all client reconnect commits Change-Id: Id8cdea5f1c17da931e44b5bcf436db5d2ac5c018 Signed-off-by: eyal edri <eedri(a)redhat.com> --- M lib/vdsm/client.py M lib/yajsonrpc/betterAsyncore.py M lib/yajsonrpc/stomp.py M lib/yajsonrpc/stompreactor.py M tests/integration/jsonRpcTests.py M tests/stompasyncclient_test.py 6 files changed, 20 insertions(+), 119 deletions(-) Approvals: Jenkins CI: Passed CI tests Irit Goihman: Verified; Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/79006 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8cdea5f1c17da931e44b5bcf436db5d2ac5c018 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: Revert stomp client reconect patches
by Code Review 05 Jul '17

05 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: Revert stomp client reconect patches ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/79006 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id8cdea5f1c17da931e44b5bcf436db5d2ac5c018 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: network: make ipwrapper.drv_name Python 3 compatible
by Code Review 04 Jul '17

04 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: network: make ipwrapper.drv_name Python 3 compatible ...................................................................... Patch Set 17: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/77940 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2dee4fd4a1ac5470e739594704da5781589af1d3 Gerrit-PatchSet: 17 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: Petr Horacek <phoracek(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: stomp: add integration tests for client reconnect
by Code Review 04 Jul '17

04 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78713 ) Change subject: stomp: add integration tests for client reconnect ...................................................................... stomp: add integration tests for client reconnect Signed-off-by: Irit Goihman <igoihman(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1376843 Change-Id: I9c827477ca7c8e482e16c847039e59066d72021f --- M tests/integration/jsonRpcTests.py 1 file changed, 38 insertions(+), 1 deletion(-) Approvals: Piotr Kliczewski: Looks good to me, approved Jenkins CI: Passed CI tests Irit Goihman: Verified -- To view, visit https://gerrit.ovirt.org/78713 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c827477ca7c8e482e16c847039e59066d72021f Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: stomp: set default heartbeat values and add grace period
by Code Review 04 Jul '17

04 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78925 ) Change subject: stomp: set default heartbeat values and add grace period ...................................................................... stomp: set default heartbeat values and add grace period default incoming heartbeat used to be 5 seconds but was never checked. In an actual system the heartbeat should be greater, since CPU and network spikes affect the server communication and don't indicate there is a real communication problem. Also, in order to make sure incoming heartbeats are received and we won't close the socket before getting them, we add grace period for incoming heartbeats and reduce the outgoing heartbeats interval in order to make sure the outgoing heartbeats are received in server side. By default, number of retries after timeout is 1 to ensure fast recovery. Change-Id: I0e8c4f2fef9083521dcf2da12cf1f9db84b75492 Signed-off-by: Irit Goihman <igoihman(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1376843 --- M lib/vdsm/client.py M lib/yajsonrpc/stomp.py M lib/yajsonrpc/stompreactor.py M tests/stompasyncclient_test.py 4 files changed, 39 insertions(+), 14 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, approved Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Irit Goihman: Verified -- To view, visit https://gerrit.ovirt.org/78925 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e8c4f2fef9083521dcf2da12cf1f9db84b75492 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: stomp: set default heartbeat values and add grace period
by Code Review 03 Jul '17

03 Jul '17

From Yaniv Bronhaim <ybronhei(a)redhat.com>: Yaniv Bronhaim has posted comments on this change. Change subject: stomp: set default heartbeat values and add grace period ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/78925 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0e8c4f2fef9083521dcf2da12cf1f9db84b75492 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[ovirt-4.1]: net: Unneeded newline is added when updating only the mtu
by Code Review 03 Jul '17

03 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Unneeded newline is added when updating only the mtu ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/78900 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I98659616218d65dc4126f3bb1df92bc0b9b06a8d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.1 Gerrit-Owner: Edward Haas <edwardh(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: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Unneeded newline is added when updating only the mtu
by Code Review 03 Jul '17

03 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78890 ) Change subject: net: Unneeded newline is added when updating only the mtu ...................................................................... net: Unneeded newline is added when updating only the mtu When the MTU is updated on a bridged network, a special handling is conducted and a nasty newline may be added where not needed. This patch also makes sure a newline is always added at the end. Change-Id: I98659616218d65dc4126f3bb1df92bc0b9b06a8d Bug-Url: https://bugzilla.redhat.com/1460619 Signed-off-by: Edward Haas <edwardh(a)redhat.com> --- M lib/vdsm/network/configurators/ifcfg.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/78890 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98659616218d65dc4126f3bb1df92bc0b9b06a8d Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Michael Burman <mburman(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: net: Unneeded newline is added when updating only the mtu
by Code Review 03 Jul '17

03 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Unneeded newline is added when updating only the mtu ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/78890 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I98659616218d65dc4126f3bb1df92bc0b9b06a8d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Michael Burman <mburman(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: python3: Fix UUID packing/unpacking on python 3
by Code Review 02 Jul '17

02 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: python3: Fix UUID packing/unpacking on python 3 ...................................................................... Patch Set 14: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/78632 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I41cfa5e54e76dfcad267792daebc54e80bf2a022 Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: move vm.py to lib/vdsm/virt
by Code Review 02 Jul '17

02 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: move vm.py to lib/vdsm/virt ...................................................................... Patch Set 4: ci please build -- To view, visit https://gerrit.ovirt.org/78797 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I158a7739ef171d6c88d7516d92abea632fb03df5 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: net: Unneeded newline is added when updating only the mtu
by Code Review 02 Jul '17

02 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: net: Unneeded newline is added when updating only the mtu ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/78890 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I98659616218d65dc4126f3bb1df92bc0b9b06a8d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas <edwardh(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: Michael Burman <mburman(a)redhat.com> Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches July 2017