virtinst: Move all devices to virtinst/devices/

tests/xmlconfig.py

@@ -133,7 +133,7 @@ class TestXMLMisc(unittest.TestCase):
 
     def testDefaultBridge(self):
         # Test our handling of the default bridge routines
-        from virtinst import deviceinterface
+        from virtinst.devices import interface as deviceinterface
         origfunc = getattr(deviceinterface, "_default_bridge")
         try:
             def newbridge(ignore_conn):
@@ -334,7 +334,7 @@ class TestXMLMisc(unittest.TestCase):
     def test_dir_searchable(self):
         # Normally the dir searchable test is skipped in the unittest,
         # but let's contrive an example that should trigger all the code
-        from virtinst.devicedisk import _is_dir_searchable
+        from virtinst.devices.disk import _is_dir_searchable
         oldtest = os.environ.pop("VIRTINST_TEST_SUITE")
         try:
             uid = -1

virtinst/__init__.py

@@ -62,27 +62,7 @@ from virtinst.network import Network
 from virtinst.nodedev import NodeDevice
 from virtinst.storage import StoragePool, StorageVolume
 
-from virtinst.device import Device
+from virtinst.devices import *  # pylint: disable=wildcard-import
-from virtinst.deviceinterface import DeviceInterface
-from virtinst.devicegraphics import DeviceGraphics
-from virtinst.deviceaudio import DeviceSound
-from virtinst.deviceinput import DeviceInput
-from virtinst.devicedisk import DeviceDisk
-from virtinst.devicehostdev import DeviceHostdev
-from virtinst.devicechar import (DeviceChannel,
-                                 DeviceConsole,
-                                 DeviceParallel,
-                                 DeviceSerial)
-from virtinst.devicevideo import DeviceVideo
-from virtinst.devicecontroller import DeviceController
-from virtinst.devicewatchdog import DeviceWatchdog
-from virtinst.devicefilesystem import DeviceFilesystem
-from virtinst.devicesmartcard import DeviceSmartcard
-from virtinst.deviceredirdev import DeviceRedirdev
-from virtinst.devicememballoon import DeviceMemballoon
-from virtinst.devicetpm import DeviceTpm
-from virtinst.devicerng import DeviceRng
-from virtinst.devicepanic import DevicePanic
 
 from virtinst.installer import (ContainerInstaller, ImportInstaller,
                                 PXEInstaller, Installer)

virtinst/cli.py

@@ -38,25 +38,7 @@ from . import util
 from .clock import Clock
 from .cpu import CPU
 from .cputune import CPUTune
-from .deviceaudio import DeviceSound
+from .devices import *  # pylint: disable=wildcard-import
-from .devicechar import (DeviceChannel, DeviceConsole,
-                         DeviceSerial, DeviceParallel)
-from .devicecontroller import DeviceController
-from .devicedisk import DeviceDisk
-from .devicefilesystem import DeviceFilesystem
-from .devicegraphics import DeviceGraphics
-from .devicehostdev import DeviceHostdev
-from .deviceinput import DeviceInput
-from .deviceinterface import DeviceInterface
-from .devicememballoon import DeviceMemballoon
-from .devicememory import DeviceMemory
-from .devicepanic import DevicePanic
-from .deviceredirdev import DeviceRedirdev
-from .devicerng import DeviceRng
-from .devicesmartcard import DeviceSmartcard
-from .devicetpm import DeviceTpm
-from .devicevideo import DeviceVideo
-from .devicewatchdog import DeviceWatchdog
 from .domainblkiotune import DomainBlkiotune
 from .domainfeatures import DomainFeatures
 from .domainmemorybacking import DomainMemorybacking
@@ -72,6 +54,8 @@ from .storage import StoragePool, StorageVolume
 from .sysinfo import SYSInfo
 from .xmlnsqemu import XMLNSQemu
 
+_ignore = Device
+
 
 ##########################
 # Global option handling #

virtinst/cloner.py

@@ -27,10 +27,10 @@ import libvirt
 
 from . import util
 from .guest import Guest
-from .deviceinterface import DeviceInterface
+from .devices import DeviceInterface
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .storage import StorageVolume
-from .devicechar import DeviceChannel
+from .devices import DeviceChannel
 
 
 class Cloner(object):

virtinst/devices/__init__.py

@@ -0,0 +1,40 @@
+# Copyright (C) 2018 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.
+
+
+from .char import DeviceChannel, DeviceConsole, DeviceParallel, DeviceSerial
+from .controller import DeviceController
+from .device import Device
+from .disk import DeviceDisk
+from .filesystem import DeviceFilesystem
+from .graphics import DeviceGraphics
+from .hostdev import DeviceHostdev
+from .input import DeviceInput
+from .interface import DeviceInterface
+from .memballoon import DeviceMemballoon
+from .memory import DeviceMemory
+from .panic import DevicePanic
+from .smartcard import DeviceSmartcard
+from .sound import DeviceSound
+from .redirdev import DeviceRedirdev
+from .rng import DeviceRng
+from .tpm import DeviceTpm
+from .video import DeviceVideo
+from .watchdog import DeviceWatchdog
+
+
+__all__ = [l for l in locals() if l.startswith("Device")]

virtinst/devices/char.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class _DeviceChar(Device):

virtinst/devices/controller.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceController(Device):

virtinst/devices/device.py

@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301 USA.
 
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 class DeviceAlias(XMLBuilder):

virtinst/devices/disk.py

@@ -26,10 +26,10 @@ import subprocess
 import logging
 import re
 
-from . import diskbackend
+from .. import diskbackend
-from . import util
+from .. import util
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 def _qemu_sanitize_drvtype(phystype, fmt, manual_format=False):
@@ -392,7 +392,7 @@ class DeviceDisk(Device):
         :param volname: name of the volume to be created
         :param size: size in bytes
         """
-        from .storage import StorageVolume
+        from ..storage import StorageVolume
 
         if size is None:
             raise ValueError(_("Size must be specified for non "
@@ -610,7 +610,7 @@ class DeviceDisk(Device):
     source_host_socket = XMLProperty("./source/host/@socket")
 
     def _set_source_network_from_url(self, uri):
-        from .uri import URI
+        from ..uri import URI
         uriobj = URI(uri)
 
         if uriobj.scheme:

virtinst/devices/filesystem.py

@@ -20,7 +20,7 @@
 import os
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceFilesystem(Device):

virtinst/devices/graphics.py

@@ -20,7 +20,7 @@
 import os
 
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 def _get_mode_prop(channel_type):
@@ -82,7 +82,7 @@ class DeviceGraphics(Device):
         """
         Return a list of valid keymap values.
         """
-        from . import hostkeymap
+        from .. import hostkeymap
 
         orig_list = list(hostkeymap.keytable.values())
         sort_list = []
@@ -123,7 +123,7 @@ class DeviceGraphics(Device):
             return None
 
         if self._local_keymap == -1:
-            from . import hostkeymap
+            from .. import hostkeymap
             self._local_keymap = hostkeymap.default_keymap()
         return self._local_keymap
 

virtinst/devices/hostdev.py

@@ -18,8 +18,8 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .nodedev import NodeDevice
+from ..nodedev import NodeDevice
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceHostdev(Device):

virtinst/devices/input.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceInput(Device):

virtinst/devices/interface.py

@@ -21,9 +21,9 @@ import logging
 import os
 import random
 
-from . import util
+from .. import util
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 def _random_mac(conn):

virtinst/devices/memballoon.py

@@ -19,7 +19,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceMemballoon(Device):

virtinst/devices/memory.py

@@ -18,7 +18,7 @@
 
 
 from .device import Device
-from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
+from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
 
 
 class _DeviceMemoryTarget(XMLBuilder):

virtinst/devices/panic.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DevicePanic(Device):

virtinst/devices/redirdev.py

@@ -19,7 +19,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceRedirdev(Device):

virtinst/devices/rng.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceRng(Device):

virtinst/devices/smartcard.py

@@ -19,7 +19,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceSmartcard(Device):

virtinst/devices/sound.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceSound(Device):

virtinst/devices/tpm.py

@@ -22,7 +22,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceTpm(Device):

virtinst/devices/video.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceVideo(Device):

virtinst/devices/watchdog.py

@@ -18,7 +18,7 @@
 # MA 02110-1301 USA.
 
 from .device import Device
-from .xmlbuilder import XMLProperty
+from ..xmlbuilder import XMLProperty
 
 
 class DeviceWatchdog(Device):

virtinst/distroinstaller.py

@@ -22,7 +22,7 @@ import os
 
 from . import urlfetcher
 from . import util
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .initrdinject import perform_initrd_injections
 from .kernelupload import upload_kernel_initrd
 from .installer import Installer

virtinst/guest.py

@@ -32,17 +32,9 @@ from .osdict import OSDB
 from .clock import Clock
 from .cpu import CPU
 from .cputune import CPUTune
-from .device import Device
+from .devices import (Device, DeviceChannel, DeviceConsole, DeviceController,
-from .deviceaudio import DeviceSound
+        DeviceDisk, DeviceInput, DeviceGraphics, DevicePanic, DeviceRedirdev,
-from .devicechar import DeviceChannel, DeviceConsole
+        DeviceRng, DeviceSound, DeviceVideo)
-from .devicecontroller import DeviceController
-from .devicedisk import DeviceDisk
-from .devicegraphics import DeviceGraphics
-from .deviceinput import DeviceInput
-from .devicepanic import DevicePanic
-from .deviceredirdev import DeviceRedirdev
-from .devicerng import DeviceRng
-from .devicevideo import DeviceVideo
 from .distroinstaller import DistroInstaller
 from .domainblkiotune import DomainBlkiotune
 from .domainfeatures import DomainFeatures

virtinst/installer.py

@@ -22,7 +22,7 @@
 import os
 import logging
 
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .osxml import OSXML
 
 

virtinst/kernelupload.py

@@ -21,7 +21,7 @@ import logging
 import os
 
 from . import util
-from .devicedisk import DeviceDisk
+from .devices import DeviceDisk
 from .storage import StoragePool, StorageVolume
 
 

virtinst/nodedev.py

@@ -339,7 +339,7 @@ class DRMDevice(NodeDevice):
 
 
 def _AddressStringToHostdev(conn, addrstr):
-    from .devicehostdev import DeviceHostdev
+    from .devices import DeviceHostdev
     hostdev = DeviceHostdev(conn)
 
     try: