Change in vdsm[master]: Move libvirt username into config
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Move libvirt username into config
......................................................................
Move libvirt username into config
Removed hardcoded username string from specfile and source
Created a new 'auth' config section in config.py.in
- define a new variable 'libvirt_user'
Update configure.ac to contain a default value without 'rhev' in the name
Update libvirtconnection.py to use the configuration variable
Change-Id: Ibacef5ab3c1a6320086bf6d5c694ec060a6b7bbe
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M configure.ac
M vdsm.spec.in
M vdsm/config.py.in
M vdsm/libvirtconnection.py
4 files changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/3291/1
--
To view, visit http://gerrit.ovirt.org/3291
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibacef5ab3c1a6320086bf6d5c694ec060a6b7bbe
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 3 months
Change in vdsm[master]: More RHEV -> oVirt conversion
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: More RHEV -> oVirt conversion
......................................................................
More RHEV -> oVirt conversion
Change-Id: I5f54b4daca62f560023e8535dc578e4c62edc4a1
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M vdsm/vdsmd.init.in
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/3290/1
--
To view, visit http://gerrit.ovirt.org/3290
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f54b4daca62f560023e8535dc578e4c62edc4a1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 3 months
Change in vdsm[master]: Change RHEV to oVirt in guestIF.py
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Change RHEV to oVirt in guestIF.py
......................................................................
Change RHEV to oVirt in guestIF.py
Change-Id: I238e8451ea4a402713b6216e1231f670132742a0
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M vdsm/guestIF.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/3289/1
--
To view, visit http://gerrit.ovirt.org/3289
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I238e8451ea4a402713b6216e1231f670132742a0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 3 months
Change in vdsm[master]: Remove rhevm from vds_bootstrap/
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Remove rhevm from vds_bootstrap/
......................................................................
Remove rhevm from vds_bootstrap/
sed -e 's,RHEVM,OVIRT,g' -e 's,RHEV,oVirt,g'
Change-Id: Ib28617f0fa45ff867fcd85eeb7bd49d8d5220d4d
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M vds_bootstrap/vds_bootstrap.py
M vds_bootstrap/vds_bootstrap_complete.py
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/3287/1
--
To view, visit http://gerrit.ovirt.org/3287
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib28617f0fa45ff867fcd85eeb7bd49d8d5220d4d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 3 months
Change in vdsm[master]: Change vmchannel name to remove rhevm
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Change vmchannel name to remove rhevm
......................................................................
Change vmchannel name to remove rhevm
Change-Id: I95b44512052bdb5fed8c8c1486eafc41b85b5f13
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M vdsm/libvirtvm.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/3288/1
--
To view, visit http://gerrit.ovirt.org/3288
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95b44512052bdb5fed8c8c1486eafc41b85b5f13
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 3 months
Change in vdsm[master]: Change vdsmrepo to something non-rhev specific
by Ryan Harper
Ryan Harper has uploaded a new change for review.
Change subject: Change vdsmrepo to something non-rhev specific
......................................................................
Change vdsmrepo to something non-rhev specific
Instead of /rhevm use something more distro agnostic for storage repo path.
Model this after libvirt (/var/lib/libvirt/images).
Change-Id: I080a161f6338d341c986e0aaa2270a90be10891f
Signed-off-by: Ryan Harper <ryanh(a)us.ibm.com>
---
M configure.ac
M vdsm.spec.in
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/86/3286/1
--
To view, visit http://gerrit.ovirt.org/3286
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I080a161f6338d341c986e0aaa2270a90be10891f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ryan Harper <ryanh(a)us.ibm.com>
11 years, 3 months
Change in vdsm[ovirt-3.2]: Integrate Smartcard support
by ofrenkel＠redhat.com
Hello Tomas Jelinek, Antoni Segura Puimedon, Peter V. Saveliev,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/10547
to review the following change.
Change subject: Integrate Smartcard support
......................................................................
Integrate Smartcard support
This patch is a VDSM part of the integrating
the smartcard support to the ovirt:
This VDSM part integrates the smartcard in
a supported way, not just as an unsupported custom hook.
It also removes the smartcard hook itself.
Change-Id: I7cdaef420c8381d588f6215e66e6a80dd9d2e44b
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
Signed-off-by: Peter V. Saveliev <peet(a)redhat.com>
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
---
M configure.ac
M tests/libvirtvmTests.py
M vdsm.spec.in
M vdsm/libvirtvm.py
M vdsm/vm.py
M vdsm_api/vdsmapi-schema.json
M vdsm_hooks/Makefile.am
M vdsm_hooks/README
D vdsm_hooks/smartcard/Makefile.am
D vdsm_hooks/smartcard/README
D vdsm_hooks/smartcard/before_vm_start.py
11 files changed, 116 insertions(+), 77 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/10547/1
diff --git a/configure.ac b/configure.ac
index a6265b5..3489e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,6 @@
vdsm_hooks/qos/Makefile
vdsm_hooks/qemucmdline/Makefile
vdsm_hooks/scratchpad/Makefile
- vdsm_hooks/smartcard/Makefile
vdsm_hooks/smbios/Makefile
vdsm_hooks/sriov/Makefile
vdsm_hooks/vhostmd/Makefile
diff --git a/tests/libvirtvmTests.py b/tests/libvirtvmTests.py
index 4ed7318..bd68f2a 100644
--- a/tests/libvirtvmTests.py
+++ b/tests/libvirtvmTests.py
@@ -91,6 +91,13 @@
domxml.appendOs()
self.assertXML(domxml.dom, xml, 'os')
+ def testSmartcardXML(self):
+ smartcardXML = '<smartcard mode="passthrough" type="spicevmc"/>'
+ dev = {'device': 'smartcard',
+ 'specParams': {'mode': 'passthrough', 'type': 'spicevmc'}}
+ smartcard = libvirtvm.SmartCardDevice(self.conf, self.log, **dev)
+ self.assertXML(smartcard.getXML(), smartcardXML)
+
def testFeaturesXML(self):
featuresXML = """
<features>
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 1978fa9..f9e238b 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -353,14 +353,6 @@
the disk will be erased when the VM destroyed.
VM cannot be migrated when using scratchpad hook
-%package hook-smartcard
-Summary: Smartcard support for Spice protocol in VDSM
-BuildArch: noarch
-
-%description hook-smartcard
-Smartcard hook add support for spice in VDSM.
-Smartcard hook enable user to use its smartcard inside virtual machines.
-
%package hook-smbios
Summary: Adding custom smbios entries to libvirt domain via VDSM
BuildArch: noarch
@@ -886,10 +878,6 @@
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_scratchpad
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_scratchpad
%{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_scratchpad
-
-%files hook-smartcard
-%defattr(-, root, root, -)
-%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_smartcard
%files hook-smbios
%defattr(-, root, root, -)
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 219e382..fe140ec 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1243,6 +1243,21 @@
return m
+class SmartCardDevice(LibvirtVmDevice):
+ def getXML(self):
+ """
+ Add smartcard section to domain xml
+
+ <smartcard mode='passthrough' type='spicevmc'>
+ <address ... />
+ </smartcard>
+ """
+ card = self.createXmlElem(self.device, None, ['address'])
+ card.setAttribute('mode', self.specParams['mode'])
+ card.setAttribute('type', self.specParams['type'])
+ return card
+
+
class RedirDevice(LibvirtVmDevice):
def getXML(self):
"""
@@ -1395,6 +1410,7 @@
self._getUnderlyingControllerDeviceInfo()
self._getUnderlyingBalloonDeviceInfo()
self._getUnderlyingWatchdogDeviceInfo()
+ self._getUnderlyingSmartcardDeviceInfo()
# Obtain info of all unknown devices. Must be last!
self._getUnderlyingUnknownDeviceInfo()
@@ -1486,7 +1502,8 @@
vm.BALLOON_DEVICES: BalloonDevice,
vm.WATCHDOG_DEVICES: WatchdogDevice,
vm.REDIR_DEVICES: RedirDevice,
- vm.CONSOLE_DEVICES: ConsoleDevice}
+ vm.CONSOLE_DEVICES: ConsoleDevice,
+ vm.SMARTCARD_DEVICES: SmartCardDevice}
for devType, devClass in devMap.items():
for dev in devices[devType]:
@@ -2800,6 +2817,31 @@
dev['address'] = address
dev['alias'] = alias
+ def _getUnderlyingSmartcardDeviceInfo(self):
+ """
+ Obtain smartcard device info from libvirt.
+ """
+ smartcardxml = _domParseStr(self._lastXMLDesc).childNodes[0].\
+ getElementsByTagName('devices')[0].\
+ getElementsByTagName('smartcard')
+ for x in smartcardxml:
+ if not x.getElementsByTagName('address'):
+ continue
+
+ address = self._getUnderlyingDeviceAddress(x)
+ alias = x.getElementsByTagName('alias')[0].getAttribute('name')
+
+ for dev in self._devices[vm.SMARTCARD_DEVICES]:
+ if not hasattr(dev, 'address'):
+ dev.address = address
+ dev.alias = alias
+
+ for dev in self.conf['devices']:
+ if dev['device'] == vm.SMARTCARD_DEVICES and \
+ not dev.get('address'):
+ dev['address'] = address
+ dev['alias'] = alias
+
def _getUnderlyingWatchdogDeviceInfo(self):
"""
Obtain watchdog device info from libvirt.
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 49fcb11..9610644 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -47,6 +47,7 @@
REDIR_DEVICES = 'redir'
WATCHDOG_DEVICES = 'watchdog'
CONSOLE_DEVICES = 'console'
+SMARTCARD_DEVICES = 'smartcard'
"""
A module containing classes needed for VM communication.
@@ -364,7 +365,8 @@
SOUND_DEVICES: [], VIDEO_DEVICES: [],
CONTROLLER_DEVICES: [], GENERAL_DEVICES: [],
BALLOON_DEVICES: [], REDIR_DEVICES: [],
- WATCHDOG_DEVICES: [], CONSOLE_DEVICES: []}
+ WATCHDOG_DEVICES: [], CONSOLE_DEVICES: [],
+ SMARTCARD_DEVICES: []}
def _get_lastStatus(self):
PAUSED_STATES = ('Powering down', 'RebootInProgress', 'Up')
@@ -447,7 +449,8 @@
SOUND_DEVICES: [], VIDEO_DEVICES: [],
CONTROLLER_DEVICES: [], GENERAL_DEVICES: [],
BALLOON_DEVICES: [], REDIR_DEVICES: [],
- WATCHDOG_DEVICES: [], CONSOLE_DEVICES: []}
+ WATCHDOG_DEVICES: [], CONSOLE_DEVICES: [],
+ SMARTCARD_DEVICES: []}
for dev in self.conf.get('devices'):
try:
devices[dev['type']].append(dev)
@@ -485,6 +488,7 @@
devices[GENERAL_DEVICES] = []
devices[BALLOON_DEVICES] = []
devices[WATCHDOG_DEVICES] = []
+ devices[SMARTCARD_DEVICES] = self.getConfSmartcard()
devices[REDIR_DEVICES] = []
devices[CONSOLE_DEVICES] = []
else:
@@ -549,6 +553,17 @@
return vcards
+ def getConfSmartcard(self):
+ """
+ Normalize smartcard device (now there is only one)
+ """
+ cards = []
+ if self.conf.get('smartcard'):
+ cards.append({'device': SMARTCARD_DEVICES,
+ 'specParams': {'mode': 'passthrough',
+ 'type': 'spicevmc'}})
+ return cards
+
def getConfSound(self):
"""
Normalize sound device provided by conf.
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index c72ec4b..7c9ef22 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -1685,11 +1685,13 @@
#
# @console: A console device
#
+# @smartcard: A smartcard device
+#
# Since: 4.10.0
##
{'enum': 'VmDeviceType',
'data': ['disk', 'interface', 'video', 'sound', 'controller', 'balloon',
- 'channel', 'console']}
+ 'channel', 'console', 'smartcard']}
##
# @VmDiskDeviceType:
@@ -2356,6 +2358,48 @@
'address': 'VmDeviceAddress', 'alias': 'str', 'deviceId': 'UUID'}}
##
+# @VmSmartcardDeviceSpecParams:
+#
+# Additional VM smartcard device parameters.
+#
+# Since: 4.10.3
+##
+{'type': 'VmSmartcardDeviceSpecParams', 'data': {}}
+
+##
+# @VmSmartcardDeviceType:
+#
+# An enumeration of VM smartcard device types.
+#
+# @smartcard: A smartcard
+#
+# Since: 4.10.3
+##
+{'enum': 'VmSmartcardDeviceType', 'data': ['smartcard']}
+
+##
+# @VmSmartcardDevice:
+#
+# Properties of a VM smartcard device.
+#
+# @deviceType: The device type (always @smartcard)
+#
+# @device: The the type of smartcard device
+#
+# @address: Device hardware address
+#
+# @alias: Alias used to identify this device in commands
+#
+# @specParams: #optional Additional device parameters
+#
+# Since: 4.10.3
+##
+{'type': 'VmSmartcardDevice',
+ 'data': {'deviceType': 'VmDeviceType', 'device': 'VmSmartcardDeviceType',
+ 'address': 'VmDeviceAddress', 'alias': 'str',
+ '*specParams': 'VmSmartcardDeviceSpecParams'}}
+
+##
# @VmConsoleDevice:
#
# Properties of a VM console device.
@@ -2382,7 +2426,8 @@
'data': {'deviceType': 'VmDeviceType',},
'union': ['VmDiskDevice', 'VmInterfaceDevice', 'VmVideoDevice',
'VmSoundDevice', 'VmControllerDevice', 'VmBalloonDevice',
- 'VmChannelDevice', 'VmWatchdogDevice', 'VmConsoleDevice']}
+ 'VmChannelDevice', 'VmWatchdogDevice', 'VmConsoleDevice',
+ 'VmSmartcardDevice']}
##
# @VmShortStatus:
diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am
index 9f00d4d..0e27a98 100644
--- a/vdsm_hooks/Makefile.am
+++ b/vdsm_hooks/Makefile.am
@@ -37,7 +37,6 @@
promisc \
qos \
scratchpad \
- smartcard \
smbios \
sriov \
vmdisk \
diff --git a/vdsm_hooks/README b/vdsm_hooks/README
index b45b93e..1659610 100644
--- a/vdsm_hooks/README
+++ b/vdsm_hooks/README
@@ -24,7 +24,7 @@
If you want to enable more then one custom hook use the semicolon as
a separator:
- # rhevm-config -s UserDefinedVMProperties='pincpu=^[0-9]+$;smartcard=^(true|false)$' --cver=3.0
+ # rhevm-config -s UserDefinedVMProperties='pincpu=^[0-9]+$;sap_agent=^(true|false)$' --cver=3.0
The convention is [hook name]=[value], the value is evaluate with regular expression,
If you find regular expression too complex, you can always use the following command:
@@ -47,7 +47,7 @@
pincpu=1
if you want to use more then on hook and you did enable it with the rhevm-config
tool, you can use the semicolon as a separator:
- pincpu=1;smartcard=true
+ pincpu=1;sap_agent=true
b. Another option is to use "Run Once" dialog which mean that you add a custom property
only this time to the VM, next time that you run the VM it will run without the
custom property that you provided.
diff --git a/vdsm_hooks/smartcard/Makefile.am b/vdsm_hooks/smartcard/Makefile.am
deleted file mode 100644
index dfefff5..0000000
--- a/vdsm_hooks/smartcard/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2008 Red Hat, Inc. and/or its affiliates.
-#
-# Licensed to you under 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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
-#
-
-EXTRA_DIST = \
- before_vm_start.py
-
-install-data-local:
- $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start
- $(INSTALL_SCRIPT) $(srcdir)/before_vm_start.py \
- $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_smartcard
-
-uninstall-local:
- $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_smartcard
diff --git a/vdsm_hooks/smartcard/README b/vdsm_hooks/smartcard/README
deleted file mode 100644
index bd376bf..0000000
--- a/vdsm_hooks/smartcard/README
+++ /dev/null
@@ -1,9 +0,0 @@
-smartcard hook:
-===============
-add smartcard support for spice
-
-syntax:
-smartcard: smartcard=true
-
-libvirt xml:
-<smartcard mode='passthrough' type='spicevmc'/>
diff --git a/vdsm_hooks/smartcard/before_vm_start.py b/vdsm_hooks/smartcard/before_vm_start.py
deleted file mode 100755
index 1944978..0000000
--- a/vdsm_hooks/smartcard/before_vm_start.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import hooking
-import traceback
-
-'''
-smartcard vdsm hook
-adding to domain xml
-<smartcard mode='passthrough' type='spicevmc'/>
-'''
-
-if 'smartcard' in os.environ:
- try:
- sys.stderr.write('smartcard: adding smartcard support\n')
- domxml = hooking.read_domxml()
-
- devices = domxml.getElementsByTagName('devices')[0]
- card = domxml.createElement('smartcard')
- card.setAttribute('mode', 'passthrough')
- card.setAttribute('type', 'spicevmc')
-
- devices.appendChild(card)
-
- hooking.write_domxml(domxml)
- except:
- sys.stderr.write('smartcard: [unexpected error]: %s\n' % traceback.format_exc())
- sys.exit(2)
--
To view, visit http://gerrit.ovirt.org/10547
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cdaef420c8381d588f6215e66e6a80dd9d2e44b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.2
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com>
Gerrit-Reviewer: Peter V. Saveliev <peet(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
11 years, 3 months
Change in vdsm[master]: VDSM: Fix VDSM error message.
by Maor Lipchuk
Maor Lipchuk has uploaded a new change for review.
Change subject: VDSM: Fix VDSM error message.
......................................................................
VDSM: Fix VDSM error message.
Rephrase VDSM error message.
Change-Id: I8ee2f8c9bbeecb589267b7fdaca8442210debfbb
Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com>
---
M vdsm/storage/storage_exception.py
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/55/9355/1
diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py
index 54e64e6..8721e90 100644
--- a/vdsm/storage/storage_exception.py
+++ b/vdsm/storage/storage_exception.py
@@ -1184,8 +1184,7 @@
class StorageServerConnectionRefIdDoesNotExist(StorageException):
code = 479
- message = ("Connection Reference ID was not "
- "in the registered with this VDSM")
+ message = "Connection Reference ID was not registered"
#################################################
--
To view, visit http://gerrit.ovirt.org/9355
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ee2f8c9bbeecb589267b7fdaca8442210debfbb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com>
11 years, 3 months
Change in vdsm[master]: [RFE] Integrate Smartcard support
by tjelinek＠redhat.com
Tomas Jelinek has uploaded a new change for review.
Change subject: [RFE] Integrate Smartcard support
......................................................................
[RFE] Integrate Smartcard support
This patch is a VDSM part of the following BZs:
https://bugzilla.redhat.com/588481
https://bugzilla.redhat.com/802736
This VDSM part integrates the smartcard in
a supported way, not just as an unsupported custom hook.
It also removes the smartcard hook itself.
Change-Id: I7cdaef420c8381d588f6215e66e6a80dd9d2e44b
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M configure.ac
M vdsm.spec.in
M vdsm/libvirtvm.py
M vdsm_hooks/Makefile.am
M vdsm_hooks/README
D vdsm_hooks/smartcard/Makefile.am
D vdsm_hooks/smartcard/README
D vdsm_hooks/smartcard/before_vm_start.py
8 files changed, 15 insertions(+), 72 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/8450/1
diff --git a/configure.ac b/configure.ac
index 450f714..1136239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,6 @@
vdsm_hooks/qos/Makefile
vdsm_hooks/qemucmdline/Makefile
vdsm_hooks/scratchpad/Makefile
- vdsm_hooks/smartcard/Makefile
vdsm_hooks/smbios/Makefile
vdsm_hooks/sriov/Makefile
vdsm_hooks/vhostmd/Makefile
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 716489a..536aa4f 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -318,14 +318,6 @@
the disk will be erased when the VM destroyed.
VM cannot be migrated when using scratchpad hook
-%package hook-smartcard
-Summary: Smartcard support for Spice protocol in VDSM
-BuildArch: noarch
-
-%description hook-smartcard
-Smartcard hook add support for spice in VDSM.
-Smartcard hook enable user to use its smartcard inside virtual machines.
-
%package hook-smbios
Summary: Adding custom smbios entries to libvirt domain via VDSM
BuildArch: noarch
@@ -863,10 +855,6 @@
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_scratchpad
%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_source/50_scratchpad
%{_libexecdir}/%{vdsm_name}/hooks/after_vm_destroy/50_scratchpad
-
-%files hook-smartcard
-%defattr(-, root, root, -)
-%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_smartcard
%files hook-smbios
%defattr(-, root, root, -)
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 64a3b6b..bd1de6d 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -782,6 +782,18 @@
input.setAttribute('bus', 'ps2')
self._devices.appendChild(input)
+ def appendSmartcard(self):
+ """
+ Add smartcard section to domain xml
+
+ <smartcard mode='passthrough' type='spicevmc'/>
+ """
+ if self.conf['is_smartcard_enabled'] == 'true':
+ card = self.doc.createElement('smartcard')
+ card.setAttribute('mode', 'passthrough')
+ card.setAttribute('type', 'spicevmc')
+ self._devices.appendChild(card)
+
def appendGraphics(self):
"""
Add graphics section to domain xml.
@@ -1240,6 +1252,7 @@
_QEMU_GA_DEVICE_NAME)
domxml.appendInput()
domxml.appendGraphics()
+ domxml.appendSmartcard()
domxml.appendConsole()
for devType in self._devices:
diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am
index e6a8280..56f714f 100644
--- a/vdsm_hooks/Makefile.am
+++ b/vdsm_hooks/Makefile.am
@@ -36,7 +36,6 @@
promisc \
qos \
scratchpad \
- smartcard \
smbios \
sriov \
vmdisk
diff --git a/vdsm_hooks/README b/vdsm_hooks/README
index b45b93e..1659610 100644
--- a/vdsm_hooks/README
+++ b/vdsm_hooks/README
@@ -24,7 +24,7 @@
If you want to enable more then one custom hook use the semicolon as
a separator:
- # rhevm-config -s UserDefinedVMProperties='pincpu=^[0-9]+$;smartcard=^(true|false)$' --cver=3.0
+ # rhevm-config -s UserDefinedVMProperties='pincpu=^[0-9]+$;sap_agent=^(true|false)$' --cver=3.0
The convention is [hook name]=[value], the value is evaluate with regular expression,
If you find regular expression too complex, you can always use the following command:
@@ -47,7 +47,7 @@
pincpu=1
if you want to use more then on hook and you did enable it with the rhevm-config
tool, you can use the semicolon as a separator:
- pincpu=1;smartcard=true
+ pincpu=1;sap_agent=true
b. Another option is to use "Run Once" dialog which mean that you add a custom property
only this time to the VM, next time that you run the VM it will run without the
custom property that you provided.
diff --git a/vdsm_hooks/smartcard/Makefile.am b/vdsm_hooks/smartcard/Makefile.am
deleted file mode 100644
index dfefff5..0000000
--- a/vdsm_hooks/smartcard/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2008 Red Hat, Inc. and/or its affiliates.
-#
-# Licensed to you under 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. See the files README and
-# LICENSE_GPL_v2 which accompany this distribution.
-#
-
-EXTRA_DIST = \
- before_vm_start.py
-
-install-data-local:
- $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start
- $(INSTALL_SCRIPT) $(srcdir)/before_vm_start.py \
- $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_smartcard
-
-uninstall-local:
- $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_smartcard
diff --git a/vdsm_hooks/smartcard/README b/vdsm_hooks/smartcard/README
deleted file mode 100644
index bd376bf..0000000
--- a/vdsm_hooks/smartcard/README
+++ /dev/null
@@ -1,9 +0,0 @@
-smartcard hook:
-===============
-add smartcard support for spice
-
-syntax:
-smartcard: smartcard=true
-
-libvirt xml:
-<smartcard mode='passthrough' type='spicevmc'/>
diff --git a/vdsm_hooks/smartcard/before_vm_start.py b/vdsm_hooks/smartcard/before_vm_start.py
deleted file mode 100755
index 07e52e7..0000000
--- a/vdsm_hooks/smartcard/before_vm_start.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import hooking
-import traceback
-
-'''
-smartcard vdsm hook
-adding to domain xml
-<smartcard mode='passthrough' type='spicevmc'/>
-'''
-
-if os.environ.has_key('smartcard'):
- try:
- sys.stderr.write('smartcard: adding smartcard support\n')
- domxml = hooking.read_domxml()
-
- devices = domxml.getElementsByTagName('devices')[0]
- card = domxml.createElement('smartcard')
- card.setAttribute('mode', 'passthrough')
- card.setAttribute('type', 'spicevmc')
-
- devices.appendChild(card)
-
- hooking.write_domxml(domxml)
- except:
- sys.stderr.write('smartcard: [unexpected error]: %s\n' % traceback.format_exc())
- sys.exit(2)
--
To view, visit http://gerrit.ovirt.org/8450
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cdaef420c8381d588f6215e66e6a80dd9d2e44b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
11 years, 3 months
Change in vdsm[master]: Rename lease files on v3 file SDs when renaming data and met...
by ykaplan＠redhat.com
Yeela Kaplan has uploaded a new change for review.
Change subject: Rename lease files on v3 file SDs when renaming data and meta files
......................................................................
Rename lease files on v3 file SDs when renaming data and meta files
Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=886842
Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com>
---
M vdsm/storage/fileVolume.py
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/10208/1
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 2aab4d4..60fbcb0 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -490,6 +490,8 @@
volPath = os.path.join(self.imagePath, newUUID)
metaPath = self._getMetaVolumePath(volPath)
prevMetaPath = self._getMetaVolumePath()
+ leasePath = self._getLeaseVolumePath(volPath)
+ prevLeasePath = self._getLeaseVolumePath()
if recovery:
name = "Rename volume rollback: " + volPath
@@ -505,6 +507,11 @@
"renameVolumeRollback",
[metaPath, prevMetaPath]))
self.oop.os.rename(prevMetaPath, metaPath)
+ try:
+ self.oop.os.rename(prevLeasePath, leasePath)
+ except OSError, e:
+ if e.errno != os.errno.ENOENT:
+ raise
self.volUUID = newUUID
self.volumePath = volPath
--
To view, visit http://gerrit.ovirt.org/10208
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3b3a2cf3499cc50b35b384ca72624d7f71c041a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>
11 years, 3 months