Change in vdsm[master]: virt: move redir device to vmdevices.py

mpolednik at redhat.com mpolednik at redhat.com
Mon Sep 8 10:06:47 UTC 2014


Martin Polednik has uploaded a new change for review.

Change subject: virt: move redir device to vmdevices.py
......................................................................

virt: move redir device to vmdevices.py

No real code changes

Change-Id: I0c79e501008edeb6def6b78b1416882001276030
Signed-off-by: Martin Polednik <mpolednik at redhat.com>
---
M tests/vmTests.py
M vdsm/virt/vm.py
M vdsm/virt/vmdevices.py
3 files changed, 17 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/32608/1

diff --git a/tests/vmTests.py b/tests/vmTests.py
index a254ef2..d153291 100644
--- a/tests/vmTests.py
+++ b/tests/vmTests.py
@@ -31,6 +31,7 @@
 import libvirt
 
 from virt import vm
+from virt import vmdevices
 from virt import vmexitreason
 from virt.vmtune import io_tune_merge, io_tune_dom_to_values, io_tune_to_dom
 from virt import vmxml
@@ -717,7 +718,7 @@
 
         dev = {'device': 'spicevmc', 'address': self.PCI_ADDR_DICT}
 
-        redir = vm.RedirDevice(self.conf, self.log, **dev)
+        redir = vmdevices.RedirDevice(self.conf, self.log, **dev)
         self.assertXML(redir.getXML(), redirXML)
 
     def testDriveSharedStatus(self):
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 162d245..4ad77c6 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1341,20 +1341,6 @@
         return tpm
 
 
-class RedirDevice(vmdevices.Base):
-    __slots__ = ('address',)
-
-    def getXML(self):
-        """
-        Create domxml for a redir device.
-
-        <redirdev bus='usb' type='spicevmc'>
-          <address type='usb' bus='0' port='1'/>
-        </redirdev>
-        """
-        return self.createXmlElem('redirdev', self.device, ['bus', 'address'])
-
-
 class RngDevice(vmdevices.Base):
     def getXML(self):
         """
@@ -1433,7 +1419,7 @@
                      (BALLOON_DEVICES, BalloonDevice),
                      (WATCHDOG_DEVICES, WatchdogDevice),
                      (CONSOLE_DEVICES, ConsoleDevice),
-                     (REDIR_DEVICES, RedirDevice),
+                     (REDIR_DEVICES, vmdevices.RedirDevice),
                      (RNG_DEVICES, RngDevice),
                      (SMARTCARD_DEVICES, SmartCardDevice),
                      (TPM_DEVICES, TpmDevice))
diff --git a/vdsm/virt/vmdevices.py b/vdsm/virt/vmdevices.py
index bdb0908..d361e3a 100644
--- a/vdsm/virt/vmdevices.py
+++ b/vdsm/virt/vmdevices.py
@@ -43,3 +43,17 @@
         attrs = [':'.join((a, str(getattr(self, a, None)))) for a in dir(self)
                  if not a.startswith('__')]
         return ' '.join(attrs)
+
+
+class RedirDevice(Base):
+    __slots__ = ('address',)
+
+    def getXML(self):
+        """
+        Create domxml for a redir device.
+
+        <redirdev bus='usb' type='spicevmc'>
+          <address type='usb' bus='0' port='1'/>
+        </redirdev>
+        """
+        return self.createXmlElem('redirdev', self.device, ['bus', 'address'])


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

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


More information about the vdsm-patches mailing list