summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-10-12 20:16:23 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-10-12 20:16:23 -0700
commit36cb0de8905917b0d6789e49eaecd722319458f8 (patch)
tree67f8479ee4b293b4ff825387707dd6ca4a6a82bb /nova/virt
parent7ba0ab1e22b0453024b0b85be80d4e4544f95943 (diff)
parentd533d6414041437e642f2bbfbc7a86daa2527a65 (diff)
merged upstream
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt_conn.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 6ef5aa472..94a36a530 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -320,7 +320,8 @@ class LibvirtConnection(object):
def to_xml(self, instance):
# TODO(termie): cache?
logging.debug('instance %s: starting toXML method', instance['name'])
- network = db.instance_get_fixed_by_instance(None, inst['id'])
+ network = db.project_get_network(None,
+ instance['project_id'])
# FIXME(vish): stick this in db
instance_type = instance_types.INSTANCE_TYPES[instance['instance_type']]
ip_address = db.instance_get_fixed_address({}, instance['id'])