openstack/nova
Code Issues Proposed changes

Merge "fixes bug lp914962"

Browse Source
This commit is contained in:
Jenkins
2012-01-18 19:26:55 +00:00
committed by Gerrit Code Review
parent 1e318af4d5 22470ebea0
commit 7f3ddead04
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/network/quantum/manager.py
View File

@@ -306,6 +306,7 @@ class QuantumManager(manager.FlatManager):
self.enable_dhcp(context, quantum_net_id, network_ref, self.enable_dhcp(context, quantum_net_id, network_ref,
vif_rec, project_id) vif_rec, project_id)
return self.get_instance_nw_info(context, instance_id, return self.get_instance_nw_info(context, instance_id,
instance['uuid'],
instance_type_id, host) instance_type_id, host)
def enable_dhcp(self, context, quantum_net_id, network_ref, vif_rec, def enable_dhcp(self, context, quantum_net_id, network_ref, vif_rec,
@@ -390,8 +391,8 @@ class QuantumManager(manager.FlatManager):
return self.db.virtual_interface_create(context, vif) return self.db.virtual_interface_create(context, vif)
def get_instance_nw_info(self, context, instance_id, def get_instance_nw_info(self, context, instance_id, instance_uuid,
instance_type_id, host): instance_type_id, host):
"""This method is used by compute to fetch all network data """This method is used by compute to fetch all network data
that should be used when creating the VM. that should be used when creating the VM.