mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Translate network uuid to bridge name and store it in XendConfig when createing a new vif.
Fixes a bug where a new vif gets added to the wrong bridge. signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
This commit is contained in:
1 parent
429a365771
commit
1f79e130d5
1 file changed
+6
-1
@@ -341,7 +341,7 @@ class XendConfig(dict):
|
||||
# try and 'fix it up' but acutually fix the cause ;-)
|
||||
#
|
||||
def _memory_sanity_check(self):
|
||||
log.debug("_memory_sanity_check memory_static_min: %s, "
|
||||
log.trace("_memory_sanity_check memory_static_min: %s, "
|
||||
"memory_static_max: %i, "
|
||||
"memory_dynamic_min: %i, "
|
||||
"memory_dynamic_max: %i",
|
||||
@@ -1049,6 +1049,11 @@ class XendConfig(dict):
|
||||
dev_info['type'] = cfg_xenapi.get('type')
|
||||
if cfg_xenapi.get('name'):
|
||||
dev_info['name'] = cfg_xenapi.get('name')
|
||||
if cfg_xenapi.get('network'):
|
||||
from xen.xend.XendNode import XendAPIInstanceStore
|
||||
network = XendAPIInstanceStore.get(
|
||||
cfg_xenapi.get('network'), 'network')
|
||||
dev_info['bridge'] = network.get_name_label()
|
||||
|
||||
dev_uuid = cfg_xenapi.get('uuid', None)
|
||||
if not dev_uuid:
|
||||
|
||||