Change in vdsm[master]: vdsm: move video device to devices.py

mpoledni at redhat.com mpoledni at redhat.com
Thu Jun 26 11:40:29 UTC 2014


Martin Polednik has uploaded a new change for review.

Change subject: vdsm: move video device to devices.py
......................................................................

vdsm: move video device to devices.py

No real code changes

Change-Id: I40ba700e6223490251af86189196f189ae4bad39
Signed-off-by: Martin Polednik <mpoledni at redhat.com>
---
M tests/vmTests.py
M vdsm/virt/devices.py
M vdsm/virt/vm.py
3 files changed, 20 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/29263/1

diff --git a/tests/vmTests.py b/tests/vmTests.py
index 2b6e82c..e31f691 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -31,6 +31,7 @@
 from virt import vm
 from virt import vmexitreason
 from virt import xmldom
+from virt import devices
 from vdsm import constants
 from vdsm import define
 from testrunner import VdsmTestCase as TestCaseBase
@@ -550,7 +551,7 @@
 
         dev = {'device': 'vga', 'specParams': {'vram': '32768',
                'heads': '2'}}
-        video = vm.VideoDevice(self.conf, self.log, **dev)
+        video = devices.VideoDevice(self.conf, self.log, **dev)
         self.assertXML(video.getXML(), videoXML)
 
     def testInterfaceXML(self):
diff --git a/vdsm/virt/devices.py b/vdsm/virt/devices.py
index d484136..4d7fbee 100644
--- a/vdsm/virt/devices.py
+++ b/vdsm/virt/devices.py
@@ -32,3 +32,20 @@
         Create domxml for general device
         """
         return self.createXmlElem(self.type, self.device, ['address'])
+
+
+class VideoDevice(VmDevice):
+    __slots__ = ('address',)
+
+    def getXML(self):
+        """
+        Create domxml for video device
+        """
+        video = self.createXmlElem('video', None, ['address'])
+        sourceAttrs = {'vram': self.specParams.get('vram', '32768'),
+                       'heads': self.specParams.get('heads', '1')}
+        if 'ram' in self.specParams:
+            sourceAttrs['ram'] = self.specParams['ram']
+
+        video.appendChildWithArgs('model', type=self.device, **sourceAttrs)
+        return video
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index a0f4edf..bf7653c 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -628,23 +628,6 @@
         return ctrl
 
 
-class VideoDevice(devices.VmDevice):
-    __slots__ = ('address',)
-
-    def getXML(self):
-        """
-        Create domxml for video device
-        """
-        video = self.createXmlElem('video', None, ['address'])
-        sourceAttrs = {'vram': self.specParams.get('vram', '32768'),
-                       'heads': self.specParams.get('heads', '1')}
-        if 'ram' in self.specParams:
-            sourceAttrs['ram'] = self.specParams['ram']
-
-        video.appendChildWithArgs('model', type=self.device, **sourceAttrs)
-        return video
-
-
 class SoundDevice(devices.VmDevice):
     __slots__ = ('address', 'alias')
 
@@ -1345,7 +1328,7 @@
     DeviceMapping = ((DISK_DEVICES, Drive),
                      (NIC_DEVICES, NetworkInterfaceDevice),
                      (SOUND_DEVICES, SoundDevice),
-                     (VIDEO_DEVICES, VideoDevice),
+                     (VIDEO_DEVICES, devices.VideoDevice),
                      (GRAPHICS_DEVICES, GraphicsDevice),
                      (CONTROLLER_DEVICES, ControllerDevice),
                      (GENERAL_DEVICES, devices.GeneralDevice),


-- 
To view, visit http://gerrit.ovirt.org/29263
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40ba700e6223490251af86189196f189ae4bad39
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni at redhat.com>


More information about the vdsm-patches mailing list