Change in vdsm[master]: pep8: make pep8-1.5 happy with E265
by mtayer＠redhat.com
mooli tayer has posted comments on this change.
Change subject: pep8: make pep8-1.5 happy with E265
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/26248
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I91c49e1c0f36590b8052462b9e066c110eacd67b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Ohad Basan <obasan(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9 years
Change in vdsm[master]: pep8: make pep8-1.5 happy with E265
by obasan＠redhat.com
Ohad Basan has posted comments on this change.
Change subject: pep8: make pep8-1.5 happy with E265
......................................................................
Patch Set 1:
can this be merged please?
it is causing problems on ci
--
To view, visit http://gerrit.ovirt.org/26248
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I91c49e1c0f36590b8052462b9e066c110eacd67b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dkuznets(a)redhat.com>
Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com>
Gerrit-Reviewer: Ohad Basan <obasan(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9 years
Change in vdsm[master]: network: Introduce the network package
by Jenkins CI RO
oVirt Jenkins CI Server has posted comments on this change.
Change subject: network: Introduce the network package
......................................................................
Patch Set 5:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_install_rpm_sanity_gerrit/443/ : SUCCESS
--
To view, visit http://gerrit.ovirt.org/25908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9 years
Change in vdsm[master]: network: Introduce the network package
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: network: Introduce the network package
......................................................................
network: Introduce the network package
This is the first patch of the topic branch that wants to end up with
the vdsm directory having all networking code properly sorted into
the network package and network scripts.
Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
Reviewed-on: http://gerrit.ovirt.org/25908
Reviewed-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Tested-by: Dan Kenigsberg <danken(a)redhat.com>
---
M configure.ac
M debian/vdsm.install
M lib/vdsm/tool/upgrade_300_networks.py
M tests/configNetworkTests.py
M tests/functional/networkTests.py
M tests/netconfTests.py
M tests/netmodelsTests.py
M tests/tcTests.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
M vdsm/addNetwork
M vdsm/delNetwork
C vdsm/network/Makefile.am
C vdsm/network/__init__.py
R vdsm/network/api.py
R vdsm/network/configurators/Makefile.am
R vdsm/network/configurators/__init__.py
R vdsm/network/configurators/dhclient.py
R vdsm/network/configurators/ifcfg.py
R vdsm/network/configurators/iproute2.py
R vdsm/network/configurators/libvirt.py
R vdsm/network/errors.py
R vdsm/network/models.py
R vdsm/network/sourceroute.py
R vdsm/network/sourceroutethread.py
R vdsm/network/tc.py
M vdsm/supervdsmServer
M vdsm/vdsm-restore-net-config
29 files changed, 244 insertions(+), 250 deletions(-)
Approvals:
Vinzenz Feenstra: Looks good to me, but someone else must approve
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/25908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
9 years
Change in vdsm[master]: network: Introduce the network package
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: network: Introduce the network package
......................................................................
Patch Set 5: Verified+1 Code-Review+2
Copying V+1 due to the minuscule change.
--
To view, visit http://gerrit.ovirt.org/25908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9 years
Change in vdsm[master]: tests: make virtTests run on RHEL/CentOS
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: tests: make virtTests run on RHEL/CentOS
......................................................................
tests: make virtTests run on RHEL/CentOS
This patch includes fixes to let the virt functional test run
on RHEL/CentOS 6.x:
* add /sbin to mkinitrd search path
* fix usage of format() on strings to be python 2.6 friendly.
Change-Id: I248acbf03fa86585b74e3c6e8c76afe31561663d
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M tests/functional/virtTests.py
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/26198/1
diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index 54a137f..0c5a232 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -39,7 +39,9 @@
from virt import vmstatus
-_mkinitrd = CommandPath("mkinitrd", "/usr/bin/mkinitrd")
+_mkinitrd = CommandPath("mkinitrd",
+ "/usr/bin/mkinitrd", # Fedora
+ "/sbin/mkinitrd") # RHEL 6.x, Centos 6.x
_modprobe = CommandPath("modprobe",
"/usr/sbin/modprobe", # Fedora, Ubuntu
"/sbin/modprobe") # RHEL6
@@ -281,11 +283,11 @@
customization = {'vmId': '77777777-ffff-3333-bbbb-222222222222',
'devices': [],
'vmName':
- ('testVmWithCdrom_{}').format(pathLocation)}
+ ('testVmWithCdrom_{0}').format(pathLocation)}
# echo -n testPayload | md5sum
# d37e46c24c78b1aed33496107afdb44b
- vmPayloadName = ('/var/run/vdsm/payload/{}.'
+ vmPayloadName = ('/var/run/vdsm/payload/{0}.'
'd37e46c24c78b1aed33496107afdb44b'
'.img').format(customization['vmId'])
--
To view, visit http://gerrit.ovirt.org/26198
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I248acbf03fa86585b74e3c6e8c76afe31561663d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
9 years
Change in vdsm[master]: virt: Remove all guest sockets on cleanup
by Vinzenz Feenstra
Vinzenz Feenstra has uploaded a new change for review.
Change subject: virt: Remove all guest sockets on cleanup
......................................................................
virt: Remove all guest sockets on cleanup
Previously vdsm was cleaning up the guest socket files, but when
introducing the symlinks we started leaving behind the real sockets
and just removed the symlinks.
This patch fixes this by first removing the file the symlink points
to and then removes the symlink.
Change-Id: Iaf3bfbd0eedcb6486cbde685d7b6ee64e8dc8d8c
Bug-Url: https://bugzilla.redhat.com/1052097
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/26278/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 224bf51..944558e 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2786,7 +2786,7 @@
except Exception:
pass
- utils.rmFile(self._guestSocketFile)
+ self._guestSockCleanup(self._guestSocketFile)
def setDownStatus(self, code, exitReasonCode, exitMessage=''):
if not exitMessage:
@@ -3061,6 +3061,12 @@
self._vmStats.start()
self._guestEventTime = self._startTime
+ @staticmethod
+ def _guestSockCleanup(sock):
+ if os.path.islink(sock):
+ utils.rmFile(os.path.realpath(sock))
+ utils.rmFile(sock)
+
def _cleanup(self):
"""
General clean up routine
@@ -3069,7 +3075,7 @@
self._cleanupFloppy()
self._cleanupGuestAgent()
utils.rmFile(self._recoveryFile)
- utils.rmFile(self._qemuguestSocketFile)
+ self._guestSockCleanup(self._qemuguestSocketFile)
def updateGuestCpuRunning(self):
self._guestCpuRunning = (self._dom.info()[0] ==
--
To view, visit http://gerrit.ovirt.org/26278
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf3bfbd0eedcb6486cbde685d7b6ee64e8dc8d8c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
9 years
Change in vdsm[master]: network: Introduce the network package
by Vinzenz Feenstra
Vinzenz Feenstra has posted comments on this change.
Change subject: network: Introduce the network package
......................................................................
Patch Set 5: Code-Review+1
--
To view, visit http://gerrit.ovirt.org/25908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
9 years
Change in vdsm[master]: network: Introduce the network package
by Vinzenz Feenstra
Vinzenz Feenstra has posted comments on this change.
Change subject: network: Introduce the network package
......................................................................
Patch Set 4: Code-Review+1
(2 comments)
Please fix the copyrights at least in a follow up patch. If there's no new revision needed here now.
http://gerrit.ovirt.org/#/c/25908/4/vdsm/network/Makefile.am
File vdsm/network/Makefile.am:
Line 1: #
Line 2: # Copyright 2014 Red Hat, Inc.
Well this should have been 2013-2014 right?
Line 3: #
Line 4: # This program is free software; you can redistribute it and/or modify
Line 5: # it under the terms of the GNU General Public License as published by
Line 6: # the Free Software Foundation; either version 2 of the License, or
http://gerrit.ovirt.org/#/c/25908/4/vdsm/network/configurators/Makefile.am
File vdsm/network/configurators/Makefile.am:
Line 1: # Copyright 20013-2014 Red Hat, Inc.
20013? :-)
Line 2: #
Line 3: # This program is free software; you can redistribute it and/or modify
Line 4: # it under the terms of the GNU General Public License as published by
Line 5: # the Free Software Foundation; either version 2 of the License, or
--
To view, visit http://gerrit.ovirt.org/25908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I532c179d4002ed1e8e5445d02297c8d5a6248647
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Assaf Muller <amuller(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
9 years