Drop most explicit SunOS support

We haven't had a patch from Sun/Oracle in over 4 years, nor a libvirt
patch in about as long. I don't think anyone cares.

virtconv/vmcfg.py

@@ -18,9 +18,7 @@
 # MA 02110-1301 USA.
 #
 
-import platform
 from virtconv import diskcfg
-from virtinst import CapabilitiesParser
 
 VM_TYPE_UNKNOWN = 0
 VM_TYPE_PV = 1
@@ -82,21 +80,3 @@ class vm(object):
             if disk.type == diskcfg.DISK_TYPE_DISK and not disk.path:
                 raise ValueError(_("Disk %s:%s storage does not exist")
                     % (bus, inst))
-
-
-def host(conn=None):
-    """
-    Return the host, as seen in platform.system(), but possibly from a
-    hypervisor connection.  Note: use default_arch() in almost all
-    cases, unless you need to detect the OS.  In particular, this value
-    gives no indication of 32 vs 64 bitness.
-    """
-    if conn:
-        cap = CapabilitiesParser.parse(conn.getCapabilities())
-        if cap.host.arch == "i86pc":
-            return "SunOS"
-        else:
-            # or Linux-alike. Hmm.
-            return "Linux"
-
-    return platform.system()

virtinst/ImageFetcher.py

@@ -185,8 +185,6 @@ class MountedImageFetcher(LocalImageFetcher):
         self.srcdir = tempfile.mkdtemp(prefix="virtinstmnt.",
                                        dir=self.scratchdir)
         mountcmd = "/bin/mount"
-        if os.uname()[0] == "SunOS":
-            mountcmd = "/usr/sbin/mount"
 
         logging.debug("Preparing mount at " + self.srcdir)
         if self.location.startswith("nfs:"):
@@ -196,11 +194,7 @@ class MountedImageFetcher(LocalImageFetcher):
                 mountopt = "ro"
             else:
                 mountopt = "ro,loop"
-            if os.uname()[0] == 'SunOS':
-                cmd = [mountcmd, "-F", "hsfs", "-o",
-                        mountopt, self.location, self.srcdir]
-            else:
-                cmd = [mountcmd, "-o", mountopt, self.location, self.srcdir]
+            cmd = [mountcmd, "-o", mountopt, self.location, self.srcdir]
         ret = subprocess.call(cmd)
         if ret != 0:
             self.cleanupLocation()
@@ -210,10 +204,7 @@ class MountedImageFetcher(LocalImageFetcher):
 
     def cleanupLocation(self):
         logging.debug("Cleaning up mount at " + self.srcdir)
-        if os.uname()[0] == "SunOS":
-            cmd = ["/usr/sbin/umount", self.srcdir]
-        else:
-            cmd = ["/bin/umount", self.srcdir]
+        cmd = ["/bin/umount", self.srcdir]
         subprocess.call(cmd)
         try:
             os.rmdir(self.srcdir)

virtinst/OSDistro.py

@@ -1143,7 +1143,7 @@ class SolarisDistro(SunDistro):
                 iargs += ',host-ip=' + guestIP
                 if netmask:
                     iargs += ',subnet-mask=%s' % netmask
-                droute = util.default_route(guest.nics[0].bridge)
+                droute = util.default_route()
                 if droute:
                     iargs += ',router-ip=' + droute
                 if guest.nics[0].macaddr:

virtinst/util.py

@@ -20,11 +20,9 @@
 
 import logging
 import os
-import platform
 import random
 import re
 import stat
-import subprocess
 
 import libvirt
 import libxml2
@@ -278,30 +276,7 @@ def generate_name(base, collision_cb, suffix="", lib_collision=True,
     raise ValueError(_("Name generation range exceeded."))
 
 
-def default_nic():
-    """
-    Return the default NIC to use, if one is specified.
-    """
-
-    dev = ''
-
-    if platform.system() != 'SunOS':
-        return dev
-
-    proc = subprocess.Popen(['/usr/lib/xen/bin/xenstore-read',
-        'device-misc/vif/default-nic'], stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE)
-    out = proc.stdout.readlines()
-    if len(out) > 0:
-        dev = out[0].rstrip()
-
-    return dev
-
-
 def default_bridge(conn=None):
-    if platform.system() == 'SunOS':
-        return ["bridge", default_nic()]
-
     dev = default_route()
 
     if (dev is not None and
@@ -371,19 +346,7 @@ def generate_uuid(conn):
 
 
 
-def default_route(nic=None):
-    if platform.system() == 'SunOS':
-        cmd = ['/usr/bin/netstat', '-rn']
-        if nic:
-            cmd += ['-I', nic]
-        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE)
-        for line in proc.stdout.readlines():
-            vals = line.split()
-            if len(vals) > 1 and vals[0] == 'default':
-                return vals[1]
-        return None
-
+def default_route():
     route_file = "/proc/net/route"
     d = file(route_file)
 
@@ -431,9 +394,6 @@ def default_connection():
 
 
 def is_blktap_capable():
-    if platform.system() == 'SunOS':
-        return False
-
     f = open("/proc/modules")
     lines = f.readlines()
     f.close()