← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/virt/xenapi/vmops.py

  • Committer: Tarmac
  • Author(s): Vishvananda Ishaya, Eric Day
  • Date: 2010-12-22 22:04:30 UTC
  • mfrom: (469.2.16 move-ip-allocation)
  • Revision ID: tarmac-20101222220430-qqrsojvamfp6s3ef
Moves the ip allocation requests to the from the api host into calls to the network host made from the compute host.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/xenapi/vmops.py
59
59
            raise Exception('Attempted to create non-unique name %s' %
60
60
                            instance.name)
61
61
 
62
 
        bridge = db.project_get_network(context.get_admin_context(),
63
 
                                      instance.project_id).bridge
 
62
        bridge = db.network_get_by_instance(context.get_admin_context(),
 
63
                                            instance['id'])['bridge']
64
64
        network_ref = \
65
65
            NetworkHelper.find_network_with_bridge(self._session, bridge)
66
66