shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

migrate: Remove localhost hostname warning

Browse Source 
Latest libvirt actually checks against UUID so this isn't accurate
anymore

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2020-08-26 09:49:09 -04:00
parent 25d23b1d8b
commit 3425d514be
2 changed files with 7 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ui/migrate.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
@ -17,9 +17,6 @@
<property name="default_height">300</property>
<property name="type_hint">dialog</property>
<signal name="delete-event" handler="on_vmm_migrate_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
@ -245,7 +242,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
@ -273,7 +270,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
@ -310,7 +307,7 @@
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
@ -348,52 +345,6 @@
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="migrate-address-warning-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="stock">gtk-dialog-warning</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="migrate-address-warning-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label">&lt;span size="small"&gt;foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz fo&lt;/span&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="max_width_chars">40</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -704,5 +655,8 @@ If 'temporary' is selected, the migration is considered only a temporary move: t
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>

15
virtManager/migrate.py
View File

@ -217,7 +217,6 @@ class vmmMigrateDialog(vmmGObjectUI):
self.widget("migrate-finish").set_tooltip_text(tooltip)
address = ""
address_warning = ""
tunnel_warning = ""
tunnel_uri = ""
@ -235,18 +234,7 @@ class vmmMigrateDialog(vmmGObjectUI):
address = destconn.libvirt_gethostname()
if self._is_localhost(address):
address_warning = _("The destination's hostname is "
"'localhost', which will be rejected by libvirt. "
"You must configure the destination to have a valid "
"publicly accessible hostname.")
address_warning = ("<span size='small'>%s</span>" %
address_warning)
self.widget("migrate-address").set_text(address)
uiutil.set_grid_row_visible(
self.widget("migrate-address-warning-box"), bool(address_warning))
self.widget("migrate-address-warning-label").set_markup(address_warning)
self.widget("migrate-tunnel-uri").set_text(tunnel_uri)
uiutil.set_grid_row_visible(
@ -282,9 +270,6 @@ class vmmMigrateDialog(vmmGObjectUI):
# destconn combo handling #
###########################
def _is_localhost(self, addr):
return not addr or addr.startswith("localhost")
def _build_dest_row(self, destconn):
driver = self.conn.get_driver()
origuri = self.conn.get_uri()