ia64/xen-unstable

changeset 14935:2fe1f293e52d

Use new instance store to resolve network uuid to bridge name

signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
author Tom Wilkie <tom.wilkie@gmail.com>
date Wed Apr 25 15:42:34 2007 +0100 (2007-04-25)
parents 26b80f4523e5
children 1786112d2430
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Wed Apr 25 15:39:48 2007 +0100
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Wed Apr 25 15:42:34 2007 +0100
     1.3 @@ -22,6 +22,7 @@ import types
     1.4  
     1.5  from xen.xend import sxp
     1.6  from xen.xend import uuid
     1.7 +from xen.xend import XendAPIStore
     1.8  from xen.xend.XendError import VmError
     1.9  from xen.xend.XendDevices import XendDevices
    1.10  from xen.xend.PrettyPrint import prettyprintstring
    1.11 @@ -1050,8 +1051,7 @@ class XendConfig(dict):
    1.12                  if cfg_xenapi.get('name'):
    1.13                      dev_info['name'] = cfg_xenapi.get('name')
    1.14                  if cfg_xenapi.get('network'):
    1.15 -                    from xen.xend.XendNode import XendAPIInstanceStore
    1.16 -                    network = XendAPIInstanceStore.get(
    1.17 +                    network = XendAPIStore.get(
    1.18                          cfg_xenapi.get('network'), 'network')
    1.19                      dev_info['bridge'] = network.get_name_label()
    1.20