← Back to branch summary

~hudson-openstack/nova/trunk

« back to all changes in this revision

Viewing changes to nova/network/api.py

  • Committer: Brian Waldon
  • Date: 2011-09-01 15:08:41 UTC
  • mfrom: (1519 nova)
  • mto: This revision was merged to the branch mainline in revision 1521.
  • Revision ID: brian.waldon@rackspace.com-20110901150841-zrk1g11k7cw1xvrt
merging trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/api.py
111
111
                                       '(%(project)s)') %
112
112
                                        {'address': floating_ip['address'],
113
113
                                        'project': context.project_id})
 
114
 
 
115
        # If this address has been previously associated to a
 
116
        # different instance, disassociate the floating_ip
 
117
        if floating_ip['fixed_ip'] and floating_ip['fixed_ip'] is not fixed_ip:
 
118
            self.disassociate_floating_ip(context, floating_ip['address'])
 
119
 
114
120
        # NOTE(vish): if we are multi_host, send to the instances host
115
121
        if fixed_ip['network']['multi_host']:
116
122
            host = fixed_ip['instance']['host']