Change in vdsm[master]: Added support for before and after device create. - vdsm-patches - Fedora mailing-lists

28 Mar 2013

Assaf Muller has uploaded a new change for review.
Change subject: Added support for before and after device create.
......................................................................
Added support for before and after device create.
before_device_create is called for each device, right before
before_vm_create. Each such hook is supplied the device's
dom xml and any custom properties. after_device_create is
called right after after_vm_start.
Change-Id: I3291032ff85254d5c3a4260bffb7003ca3502d22
Signed-off-by: Muller amuller@redhat.com
---
M vdsm.spec.in
M vdsm/hooks.py
M vdsm/libvirtvm.py
M vdsm/vm.py
M vdsm_hooks/Makefile.am
5 files changed, 39 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/13396/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 3f7397a..32eb97d 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -792,6 +792,8 @@
 %{_libexecdir}/%{vdsm_name}/safelease
 %{_libexecdir}/%{vdsm_name}/spmprotect.sh
 %{_libexecdir}/%{vdsm_name}/spmstop.sh
+%dir %{_libexecdir}/%{vdsm_name}/hooks/before_device_create
+%dir %{_libexecdir}/%{vdsm_name}/hooks/after_device_create
 %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start
 %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vm_start
 %dir %{_libexecdir}/%{vdsm_name}/hooks/before_vm_cont
diff --git a/vdsm/hooks.py b/vdsm/hooks.py
index 33faa6e..a2cb932 100644
--- a/vdsm/hooks.py
+++ b/vdsm/hooks.py
@@ -91,6 +91,16 @@
     return finalxml
+def before_device_create(devicexml, vmconf={}, customProperties={}):
+    return _runHooksDir(devicexml, 'before_device_create', vmconf=vmconf,
+                        params=customProperties)
+
+
+def after_device_create(devicexml, vmconf={}, customProperties={}):
+    return _runHooksDir(devicexml, 'after_device_create', vmconf=vmconf,
+                        params=customProperties)
+
+
 def before_vm_start(domxml, vmconf={}):
     return _runHooksDir(domxml, 'before_vm_start', vmconf=vmconf)
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 3855e56..25b0208 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1318,10 +1318,26 @@
         domxml.appendInput()
         domxml.appendGraphics()
+        # Temp injection of custom properties for testing purposes
         for devType in self._devices:
             for dev in self._devices[devType]:
-                devElem = dev.getXML()
-                domxml._devices.appendChild(devElem)
+                if devType == vm.NIC_DEVICES:
+                    dev.custom = {'qos': True, 'color': 'red'}
+
+        '''
+            For each device
+                Get its XML, run a before_device_create hook
+                Append the XML to the VM's DOM XML
+                Save the XML for future use
+        '''
+        for devType in self._devices:
+            for dev in self._devices[devType]:
+                devxmlString = dev.getXML().toxml(encoding='utf-8')
+                devxmlString = hooks.before_device_create(
+                    devxmlString, self.conf, getattr(dev, 'custom', {}))
+                dev._deviceXML = devxmlString
+                devxml = xml.dom.minidom.parseString(devxmlString).firstChild
+                domxml._devices.appendChild(devxml)
for drive in self._devices[vm.DISK_DEVICES][:]:
             if not hasattr(drive, 'volumeChain'):
@@ -1503,6 +1519,12 @@
             if self._dom.UUIDString() != self.id:
                 raise Exception('libvirt bug 603494')
             hooks.after_vm_start(self._dom.XMLDesc(0), self.conf)
+
+            for devType in self._devices:
+                for dev in self._devices[devType]:
+                    hooks.after_device_create(dev._deviceXML, self.conf,
+                                              getattr(dev, 'custom', {}))
+
         if not self._dom:
             self.setDownStatus(ERROR, 'failed to start libvirt vm')
             return
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 98f04fd..66ffeb2 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -69,6 +69,7 @@
                 pass
         self.conf = conf
         self.log = log
+        self._deviceXML = None
def __str__(self):
         attrs = [":".join((a, str(getattr(self, a)))) for a in dir(self)
diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am
index fa5a795..3f890f6 100644
--- a/vdsm_hooks/Makefile.am
+++ b/vdsm_hooks/Makefile.am
@@ -59,6 +59,8 @@
    persist-vdsm-hooks.in
VDSMHOOKS = \
+	before_device_create \
+	after_device_create \
    before_vm_start \
    after_vm_start \
    before_vm_cont \
--
To view, visit http://gerrit.ovirt.org/13396
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3291032ff85254d5c3a4260bffb7003ca3502d22
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Assaf Muller amuller@redhat.com

    