[Xen-changelog] [xen-3.0.5-testing] Translate network uuid to bridge name and store it in XendConfig when createing a new vif.

["Xen patchbot-3.0.5-testing" <patchbot-3.0.5-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tom Wilkie <tom.wilkie@xxxxxxxxx>
# Date 1177505077 -3600
# Node ID 0b4375cd7e16c3a73d92300e1f9783e5cede0046
# Parent  33e22185002a37bfe1d4a23bbc20951372516a3b
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@xxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -r 33e22185002a -r 0b4375cd7e16 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Wed Apr 25 13:50:20 2007 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Wed Apr 25 13:44:37 2007 +0100
@@ -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:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog