Make sure to default to virtual networking if installing remotely.

Author: crobinso

virt-image

@@ -60,7 +60,8 @@ def get_vcpus(vcpus, image_vcpus, check_cpu, guest, conn):
 
 def get_networks(domain, macs, bridges, networks, guest):
     nnics = domain.interface
-    (macs, networks) = cli.digest_networks(macs, bridges, networks, nnics)
+    (macs, networks) = cli.digest_networks(guest.conn, macs, bridges,
+                                           networks, nnics)
 
     if len(networks) > nnics:
         print >> sys.stderr, (_("Warning: more networks were provided [%i] then nics required [%i]. All extras are ignored") % (len(networks),  nnics))

virt-install

@@ -242,7 +242,8 @@ def get_disks(file_paths, disk_paths, size, sparse, nodisks, guest, hvm, conn):
         get_disk(disk, size, sparse, guest, hvm, conn, is_file_path)
 
 def get_networks(macs, bridges, networks, guest):
-    (macs, networks) = cli.digest_networks(macs, bridges, networks, nics=1)
+    (macs, networks) = cli.digest_networks(guest.conn, macs, bridges,
+                                           networks, nics=1)
     map(lambda m, n: cli.get_network(m, n, guest), macs, networks)
 
 

virtinst/cli.py

@@ -270,7 +270,7 @@ def get_network(mac, network, guest):
         fail(_("Unknown network type ") + network)
     guest.nics.append(n)
 
-def digest_networks(macs, bridges, networks, nics = 0):
+def digest_networks(conn, macs, bridges, networks, nics = 0):
     if type(bridges) != list and bridges != None:
         bridges = [ bridges ]
 
@@ -304,7 +304,7 @@ def digest_networks(macs, bridges, networks, nics = 0):
     if len(macs) < nics:
         for cnt in range(len(macs),nics):
             if os.getuid() == 0:
-                net = util.default_network()
+                net = util.default_network(conn)
                 networks.append(net[0] + ":" + net[1])
             else:
                 networks.append("user")

virtinst/util.py

@@ -66,10 +66,10 @@ def default_bridge():
     else:
         return "xenbr%d"%(defn)
 
-def default_network():
+def default_network(conn):
     dev = default_route()
 
-    if dev is not None:
+    if dev is not None and not is_uri_remote(conn.getURI()):
         # New style peth0 == phys dev, eth0 == bridge, eth0 == default route
         if os.path.exists("/sys/class/net/%s/bridge" % dev):
             return ["bridge", dev]