NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

migrate: Better attempt at generating a remote URI for localhost

Browse Source 
If doing p2p migration from a remote host to localhost, we need to
generate a remote libvirt URI for qemu:///system. Try and use the remote
auth credentials of source connection.
This commit is contained in:
Cole Robinson 2011-10-13 16:13:36 -04:00
parent 03435db779
commit bca1552306
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/virtManager/migrate.py
View File

@ -256,7 +256,7 @@ class vmmMigrateDialog(vmmGObjectUI):
return 0
return int(self.widget("migrate-port").get_value())
def build_localhost_uri(self, destconn):
def build_localhost_uri(self, destconn, srcuri):
desthost = destconn.get_qualified_hostname()
if desthost == "localhost":
# We couldn't find a host name for the destination machine
@ -267,12 +267,10 @@ class vmmMigrateDialog(vmmGObjectUI):
raise RuntimeError(_("Could not determine remotely accessible "
"hostname for destination connection."))
desturi_tuple = virtinst.util.uri_split(destconn.get_uri())
# Replace dest hostname with src hostname
desturi_tuple = list(desturi_tuple)
desturi_tuple[2] = desthost
return uri_join(desturi_tuple)
# Since the connection started as local, we have no clue about
# how to access it remotely. Assume users have a uniform access
# setup and use the same credentials as the remote source URI
return self.edit_uri(srcuri, desthost, None)
def edit_uri(self, uri, hostname, port):
split = list(virtinst.util.uri_split(uri))
@ -286,7 +284,7 @@ class vmmMigrateDialog(vmmGObjectUI):
split[2] = hostname
return uri_join(tuple(split))
def build_migrate_uri(self, destconn):
def build_migrate_uri(self, destconn, srcuri):
conn = self.conn
interface = self.get_config_interface()
@ -304,7 +302,7 @@ class vmmMigrateDialog(vmmGObjectUI):
# to the local connection, because libvirt will pull try to use
# 'qemu:///system' as the migrate URI which will deadlock
if destconn.is_local():
uri = self.build_localhost_uri(destconn)
uri = self.build_localhost_uri(destconn, srcuri)
else:
uri = destconn.get_uri()
@ -450,12 +448,13 @@ class vmmMigrateDialog(vmmGObjectUI):
return
destconn = self.get_config_destconn()
srcuri = self.vm.conn.get_uri()
srchost = self.vm.conn.get_hostname()
dsthost = destconn.get_qualified_hostname()
max_downtime = self.get_config_max_downtime()
live = not self.get_config_offline()
secure = self.get_config_secure()
uri = self.build_migrate_uri(destconn)
uri = self.build_migrate_uri(destconn, srcuri)
rate = self.get_config_rate()
if rate:
rate = int(rate)