[NEW PATCH] vdsm.spec.in: report upstream URL (via gerrit-bot)
by Dan Kenigsberg
New patch submitted by Dan Kenigsberg (danken(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/901
commit 39b84964e72d4869993d723e210d0864971cc9fc
Author: Dan Kenigsberg <danken(a)redhat.com>
Date: Tue Sep 6 16:19:53 2011 +0300
vdsm.spec.in: report upstream URL
Change-Id: I7fbf9ac5f429d9ad942c76295b48f1eddb32061f
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7e1b43a..24ebf0f 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -6,9 +6,7 @@
Summary: Virtual Desktop Server Manager
Name: vdsm
Source: %{vdsm_name}-%{version}.tar.gz
-# Url: no upstream project exists
-# tarball built from internal git repo with
-# make tarball rpmversion=<version> rpmrelease=<release>
+Url: http://git.fedorahosted.org/git/?p=vdsm.git
Version: @PACKAGE_VERSION@
Release: @PACKAGE_RELEASE@%{?dist}%{?extra_release}
License: GPLv2+
12 years, 6 months
[NEW PATCH] Check certificate purpose in vdsClient (via gerrit-bot)
by Federico Simoncelli
New patch submitted by Federico Simoncelli (fsimonce(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/851
commit 449cfc4f89403d2d348fbeed68e76bd7f63397c6
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Wed Aug 24 12:45:07 2011 +0000
Check certificate purpose in vdsClient
Change-Id: I3ad83ee57df1a3b3a52ea47c529ef3e4af57e2fb
diff --git a/vdsm_cli/vdscli.py.in b/vdsm_cli/vdscli.py.in
index 5644a50..dfb97cf 100644
--- a/vdsm_cli/vdscli.py.in
+++ b/vdsm_cli/vdscli.py.in
@@ -19,9 +19,10 @@
# Refer to the README and COPYING files for full details of the license
#
+import os
import xmlrpclib
import subprocess
-import os
+import M2Crypto
d_useSSL = False
d_tsPath = '@TRUSTSTORE@'
@@ -86,9 +87,6 @@ def connect(addrport=None, useSSL=None, tsPath=None):
if useSSL is None: useSSL = d_useSSL
if tsPath is None: tsPath = d_tsPath
if useSSL:
- from M2Crypto.m2xmlrpclib import SSL_Transport
- from M2Crypto import SSL
-
if os.name == 'nt':
KEYFILE = tsPath + '\\keys\\rhevm.pem'
CERTFILE = tsPath + '\\certs\\rhevm.cer'
@@ -98,14 +96,20 @@ def connect(addrport=None, useSSL=None, tsPath=None):
CERTFILE = tsPath + '/certs/vdsmcert.pem'
CACERT = tsPath + '/certs/cacert.pem'
- ctx = SSL.Context ('sslv3')
+ ctx = M2Crypto.SSL.Context ('sslv3')
+
+ crt = M2Crypto.X509.load_cert(CERTFILE)
+ if not crt.check_purpose(M2Crypto.m2.X509_PURPOSE_SSL_CLIENT, 0):
+ raise RuntimeError, \
+ "Certificate is not suitable to be used as client"
- ctx.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 16)
+ ctx.set_verify(M2Crypto.SSL.verify_peer |
+ M2Crypto.SSL.verify_fail_if_no_peer_cert, 16)
ctx.load_verify_locations(CACERT)
ctx.load_cert(CERTFILE, KEYFILE, lambda v: "mypass")
server = xmlrpclib.Server('https://%s' % addrport,
- SSL_Transport(ctx))
+ M2Crypto.m2xmlrpclib.SSL_Transport(ctx))
else:
server = xmlrpclib.Server('http://%s' % addrport)
return server
12 years, 6 months
[NEW PATCH] BZ#735068 - Pass volumeUUID to Exceptions instead of the class instance (via gerrit-bot)
by David Naori
New patch submitted by David Naori (dnaori(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/889
commit aa6e8357d9f2bcf1db3cc8e7d5d75c21434c7f65
Author: David Naori <dnaori(a)redhat.com>
Date: Thu Sep 1 15:42:55 2011 +0300
BZ#735068 - Pass volumeUUID to Exceptions instead of the class instance
Change-Id: Icd1f1cba77c40d4062b0a424dd154ca356e31a0f
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index 272c997..2fec286 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -251,9 +251,9 @@ class Volume:
"""
self.log.debug("Volume.share)share %s to %s hard %s" % (self.volUUID, dst_image_dir, hard))
if not self.isShared():
- raise se.VolumeNonShareable(self)
+ raise se.VolumeNonShareable(self.volUUID)
if os.path.basename(dst_image_dir) == os.path.basename(self.imagePath):
- raise se.VolumeOwnershipError(self)
+ raise se.VolumeOwnershipError(self.volUUID)
try:
src = self.getDevPath()
dst = os.path.join(dst_image_dir, self.volUUID)
@@ -374,7 +374,7 @@ class Volume:
raise se.CannotDeleteSharedVolume("img %s vol %s" % (self.imgUUID, self.volUUID))
children = self.getChildrenList()
if len(children) > 0:
- raise se.VolumeImageHasChildren(self)
+ raise se.VolumeImageHasChildren(self.volUUID)
except se.MetaDataKeyNotFoundError, e:
# In case of metadata key error, we have corrupted
# volume (One of metadata corruptions may be
@@ -536,10 +536,10 @@ class Volume:
if chainrw:
rw = False # Shared cannot be set RW
else:
- raise se.SharedVolumeNonWritable(self)
+ raise se.SharedVolumeNonWritable(self.volUUID)
if not chainrw and rw and self.isInternal() and setrw and not self.recheckIfLeaf():
- raise se.InternalVolumeNonWritable(self)
+ raise se.InternalVolumeNonWritable(self.volUUID)
self.llPrepare(rw=rw, setrw=setrw)
try:
12 years, 6 months
[NEW PATCH] Remove log collector as it's no longer needed (via gerrit-bot)
by smizrahi@redhat.com
New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/885
commit a3bc54a492ac8821c8927a9c6f6afcad2dd3b52e
Author: Saggi Mizrahi <smizrahi(a)redhat.com>
Date: Wed Aug 31 17:24:05 2011 +0300
Remove log collector as it's no longer needed
Change-Id: I942d7c5dc3bb8858518884a4cfd061415e67af3b
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7e1b43a..2c12206 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -261,7 +261,6 @@ machines without running real guests.
%{_datadir}/%{vdsm_name}/dsaversion.py*
%{_datadir}/%{vdsm_name}/pthread.py*
%{_datadir}/%{vdsm_name}/betterThreading.py*
-%{_datadir}/%{vdsm_name}/logCollector.sh
%{_libexecdir}/%{vdsm_name}/persist-vdsm-hooks
%{_libexecdir}/%{vdsm_name}/unpersist-vdsm-hook
%{_datadir}/%{vdsm_name}/storage/__init__.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 8fd4bd2..98d4b81 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -41,7 +41,6 @@ dist_vdsm_SCRIPTS = \
delNetwork \
get-conf-item \
get-vm-pid \
- logCollector.sh \
mk_sysprep_floppy \
prepare-vmchannel \
respawn \
diff --git a/vdsm/logCollector.sh b/vdsm/logCollector.sh
deleted file mode 100755
index 7b75f1e..0000000
--- a/vdsm/logCollector.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2009-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
-# 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
-#
-# Description: Logs collector for RHEV
-# Input:
-# uuid: added to output file for uniquness.
-#
-BASEDIR=/var/log
-TMPDIR=$BASEDIR/qlogs
-ERR=$TMPDIR/collectErrors.log
-DESTINATION=$BASEDIR/qlogs-${1}.tar.xz
-
-if [ -x $TMPDIR ]; then
- rm -rf $TMPDIR
-fi
-
-rm -f $BASEDIR/qlogs-*.tar.xz
-
-touch $DESTINATION
-mkdir -p $TMPDIR
-echo `date` >> $ERR
-
-/usr/sbin/sosreport --batch --tmp-dir="$TMPDIR" \
- -o libvirt,vdsm,general,networking,hardware,process,yum,filesys,devicemapper,selinux,kernel $@\
- >> $ERR 2>&1
-RETVAL=$?
-
-if [ "$RETVAL" -eq 0 ]; then
- mv $TMPDIR/*.tar.xz $DESTINATION
- rm -rf $TMPDIR
- exit 0
-else
- echo "Could not archive logs" | /usr/bin/tee -a >> "$ERR"
- exit 1
-fi
-
12 years, 6 months
Change in vdsm[master]: subprocess's shell parameter is evil
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: subprocess's shell parameter is evil
......................................................................
subprocess's shell parameter is evil
Change-Id: I1b9978e9acd9d848123b6b0908ede2b21e46e758
---
M vdsm/storage/fileUtils.py
M vdsm/storage/misc.py
M vdsm/storage/sp.py
3 files changed, 24 insertions(+), 8 deletions(-)
Approvals:
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/803
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b9978e9acd9d848123b6b0908ede2b21e46e758
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
12 years, 6 months
Change in vdsm[master]: subprocess's shell parameter is evil
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: subprocess's shell parameter is evil
......................................................................
Patch Set 4: Verified; Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/803
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1b9978e9acd9d848123b6b0908ede2b21e46e758
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
12 years, 6 months
Change in vdsm[master]: subprocess' shell parameter is evil
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: subprocess' shell parameter is evil
......................................................................
Patch Set 3: Verified; Looks good to me, approved
--
To view, visit http://gerrit.usersys.redhat.com/803
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1b9978e9acd9d848123b6b0908ede2b21e46e758
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
12 years, 6 months