From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80549 )
Change subject: net: tests: Remove testSetupNetworksNiclessBridgeless
......................................................................
net: tests: Remove testSetupNetworksNiclessBridgeless
The creation of a nicless and bridgeless network
is tested in the new functional tests
(test_add_bridgeless_net_missing_sb_device_fails)
Change-Id: Icb6e203406e7fcb469d71ebf32618cb7d24926f5
Signed-off-by: Leon Goldberg <lgoldber(a)redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Leon Goldberg: Verified
Edward Haas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/80549
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb6e203406e7fcb469d71ebf32618cb7d24926f5
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: Leon Goldberg <lgoldber(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Wait for vlan link creation when bond-vlan-dhcp is used
......................................................................
Patch Set 4: Code-Review+1
(2 comments)
waiting for Petr and reply about functional test.
https://gerrit.ovirt.org/#/c/80505/4//COMMIT_MSG
Commit Message:
Line 8:
Line 9: In a setup with a bridgeless network that has bond, vlan and DHCP, the
Line 10: ifup action is performed in a nonblocking manner and may cause a race
Line 11: where the vlan link is assumed to exist but the ifup has not yet
Line 12: executed.
why won't we add a functional test for this case? this should happen in a follow-up patch, since we need this backported fast.
Line 13:
Line 14: This patch introduces a wait-for-link mechanism for this specific scenario.
Line 15:
Line 16: Change-Id: I3b638ec5b3fe974be04d3e62437553262978f587
Line 10: ifup action is performed in a nonblocking manner and may cause a race
Line 11: where the vlan link is assumed to exist but the ifup has not yet
Line 12: executed.
Line 13:
Line 14: This patch introduces a wait-for-link mechanism for this specific scenario.
having a paragraph like this is usually a hist that that the patch should have been broken in two.
Line 15:
Line 16: Change-Id: I3b638ec5b3fe974be04d3e62437553262978f587
Line 17: Bug-Url: https://bugzilla.redhat.com/1479829
--
To view, visit https://gerrit.ovirt.org/80505
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3b638ec5b3fe974be04d3e62437553262978f587
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: 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: Yes
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/80372 )
Change subject: net: Hide zero-mac nics only if they are identified as vmfex
......................................................................
net: Hide zero-mac nics only if they are identified as vmfex
zero-mac interfaces which have been identified as VF have been assumed
to be vmfex interfaces.
There seem to be other VF interfaces which appear with zero-mac that are
not vmfex.
To make it more specific, the vmfex driver name is examined ('enic').
zero-mac interfaces that are not vmfex are now reported as nics by the
network caps.
Change-Id: I14bca017c9018c7ff50d9cb84311d0d5d655ec3d
Bug-Url: https://bugzilla.redhat.com/1474638
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/ipwrapper.py
1 file changed, 5 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/80372
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14bca017c9018c7ff50d9cb84311d0d5d655ec3d
Gerrit-PatchSet: 2
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>
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Hide zero-mac nics only if they are identified as vmfex
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/80372
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I14bca017c9018c7ff50d9cb84311d0d5d655ec3d
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
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Revert "hooking: move to lib"
......................................................................
Revert "hooking: move to lib"
This reverts commit 6687ba74e74fcd18d20fcce00349aca5adf38a30.
Change-Id: I383f3c747a45194949a8dca073c93afddda61674
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M Makefile.am
M configure.ac
M lib/vdsm/Makefile.am
D lib/vdsm/hook/Makefile.am
D lib/vdsm/hook/__init__.py
M lib/vdsm/hooks.py
M vdsm.spec.in
M vdsm/Makefile.am
R vdsm/hooking.py
9 files changed, 7 insertions(+), 33 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/80444/1
diff --git a/Makefile.am b/Makefile.am
index fd126c0..6277042 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,6 +89,7 @@
pylint: tox
tox -e pylint \
vdsm/sitecustomize.py \
+ vdsm/hooking.py \
lib/vdsm \
lib/vdsmclient \
lib/yajsonrpc \
diff --git a/configure.ac b/configure.ac
index ad108bb..0b9189e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,6 @@
lib/vdsm/common/Makefile
lib/vdsm/common/network/Makefile
lib/vdsm/gluster/Makefile
- lib/vdsm/hook/Makefile
lib/vdsm/host/Makefile
lib/vdsm/metrics/Makefile
lib/vdsm/network/Makefile
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 99be41b..af42de6 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -19,7 +19,7 @@
#
include $(top_srcdir)/build-aux/Makefile.subs
-SUBDIRS=api common tool profiling rpc network virt storage hook host metrics \
+SUBDIRS=api common tool profiling rpc network virt storage host metrics \
gluster supervdsm_api
dist_vdsmpylib_PYTHON = \
diff --git a/lib/vdsm/hook/Makefile.am b/lib/vdsm/hook/Makefile.am
deleted file mode 100644
index dec5bbb..0000000
--- a/lib/vdsm/hook/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-vdsmhookdir = $(vdsmpylibdir)/hook
-
-dist_vdsmhook_PYTHON = \
- __init__.py \
- hooking.py \
- $(NULL)
diff --git a/lib/vdsm/hook/__init__.py b/lib/vdsm/hook/__init__.py
deleted file mode 100644
index a592b0e..0000000
--- a/lib/vdsm/hook/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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
diff --git a/lib/vdsm/hooks.py b/lib/vdsm/hooks.py
index f7e9fdf..2baa2df 100644
--- a/lib/vdsm/hooks.py
+++ b/lib/vdsm/hooks.py
@@ -1,5 +1,5 @@
#
-# Copyright 2010-2017 Red Hat, Inc.
+# Copyright 2010-2011 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
@@ -34,7 +34,7 @@
from vdsm.common import exception
from . import commands
-from .constants import P_VDSM_HOOKS, P_VDSM_RUN
+from .constants import P_VDSM_HOOKS, P_VDSM, P_VDSM_RUN
_LAUNCH_FLAGS_FILE = 'launchflags'
_LAUNCH_FLAGS_PATH = os.path.join(
@@ -95,8 +95,7 @@
if vmconf.get('vmId'):
scriptenv['vmId'] = vmconf.get('vmId')
ppath = scriptenv.get('PYTHONPATH', '')
- hook = os.path.join(os.path.dirname(__file__), 'hook')
- scriptenv['PYTHONPATH'] = ':'.join(ppath.split(':') + [hook])
+ scriptenv['PYTHONPATH'] = ':'.join(ppath.split(':') + [P_VDSM])
if hookType == _DOMXML_HOOK:
scriptenv['_hook_domxml'] = data_filename
elif hookType == _JSON_HOOK:
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 58e7069..25af81f 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -877,6 +877,7 @@
%dir %{_sysconfdir}/%{vdsm_name}/mom.d
%dir %{_datadir}/%{vdsm_name}
%{_datadir}/%{vdsm_name}/daemonAdapter
+%{_datadir}/%{vdsm_name}/hooking.py*
%{_datadir}/%{vdsm_name}/sitecustomize.py*
%{_datadir}/%{vdsm_name}/supervdsmd
%{_datadir}/%{vdsm_name}/vdsmd
@@ -1050,7 +1051,6 @@
%{python_sitelib}/%{vdsm_name}/cmdutils.py*
%{python_sitelib}/%{vdsm_name}/commands.py*
%{python_sitelib}/%{vdsm_name}/common/*.py*
-%{python_sitelib}/%{vdsm_name}/hook/*.py*
%{python_sitelib}/%{vdsm_name}/host/*.py*
%{python_sitelib}/%{vdsm_name}/common/network/*.py*
%{python_sitelib}/%{vdsm_name}/config.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index e264029..53f6e44 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -21,6 +21,7 @@
include $(top_srcdir)/build-aux/Makefile.subs
dist_vdsm_PYTHON = \
+ hooking.py \
sitecustomize.py \
$(NULL)
diff --git a/lib/vdsm/hook/hooking.py b/vdsm/hooking.py
similarity index 98%
rename from lib/vdsm/hook/hooking.py
rename to vdsm/hooking.py
index d88439b..803231a 100644
--- a/lib/vdsm/hook/hooking.py
+++ b/vdsm/hooking.py
@@ -35,7 +35,6 @@
2 - the hook failed, no further hooks should be processed.
>2 - reserved
"""
-from __future__ import absolute_import
from vdsm import hooks
import json
--
To view, visit https://gerrit.ovirt.org/80444
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I383f3c747a45194949a8dca073c93afddda61674
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Wait for vlan link creation when bond-vlan-dhcp is used
......................................................................
Patch Set 2:
(1 comment)
https://gerrit.ovirt.org/#/c/80505/2/lib/vdsm/network/configurators/ifcfg.py
File lib/vdsm/network/configurators/ifcfg.py:
PS2, Line 939: nonb
please avoid the "non" in the name and the "not" in the conditional; they confuse me very much. positively-named functions are clearer.
--
To view, visit https://gerrit.ovirt.org/80505
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3b638ec5b3fe974be04d3e62437553262978f587
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: Yes
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: Fix error when brick is on a btrfs subvolume
......................................................................
Patch Set 3:
please add yourself to https://gerrit.ovirt.org/#/q/project:jenkins-whitelist so that CI can run on your patch.
--
To view, visit https://gerrit.ovirt.org/69668
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I55c6a36aea46e6d7c2d85bff358e84c4e797d770
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph(a)digium.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: George Joseph <gjoseph(a)digium.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Ramesh N <ramesh.mail2u(a)gmail.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: hooking: change vdsm hooks imports
......................................................................
Patch Set 3: Code-Review-1
we need to understand and fix the current breakage before fixing it only for current hooks - or else we would forget to solve the problem for old hooks.
--
To view, visit https://gerrit.ovirt.org/80341
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I5a4468c1c5acacbde2120c329b4773599f86df94
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: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com>
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
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: virt net: Avoid removing the display network when not defined
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
https://gerrit.ovirt.org/#/c/80393/1/lib/vdsm/virt/vmdevices/graphics.py
File lib/vdsm/virt/vmdevices/graphics.py:
Line 70: display_ip = '0'
Line 71: self.specParams['displayIp'] = display_ip
Line 72:
Line 73: def teardown(self):
Line 74: display_network = self.specParams['displayNetwork']
> VmGraphicsDeviceSpecParams: &VmGraphicsDeviceSpecParams
I don't really understand your worry, Francesco.
I don't believe any living Engine misses displaysNetwork; it can arrive only from ancient migrated VMs. Missing displayNetwork is handled by the compat code in Vm class. Do you suggest to move (some?) of that code to here? I don't think that would be a positive step.
Line 75: if display_network:
Line 76: libvirtnetwork.delete_network(display_network, self.vmid)
Line 77:
Line 78: def getSpiceVmcChannelsXML(self):
--
To view, visit https://gerrit.ovirt.org/80393
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ibd3faedd952a53bbd36a3e101079a65c8f6cf1ec
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: Francesco Romani <fromani(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
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: Openstacknet hooks must check provider type to run
......................................................................
Patch Set 2:
Havn't we agreed to solve this in Engine?
--
To view, visit https://gerrit.ovirt.org/80155
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie88b6793fde74d9cd3b6a308c75c10d02c05a627
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Marcin Mirecki <mmirecki(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dominik Holler <dholler(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No