Revision cad9202c snf-cyclades-app/synnefo/logic/ips.py

b/snf-cyclades-app/synnefo/logic/ips.py
201 201 
    if floating_ip.nic:
202 202 
        # This is safe, you also need for_update to attach floating IP to
203 203 
        # instance.
204 
        msg = "Floating IP '%s' is attached to instance." % floating_ip.id
204 
        server = floating_ip.nic.machine
205 
        if server is None:
206 
            msg = ("Floating IP '%s' is used by port '%s'" %
207 
                   (floating_ip.id, floating_ip.nic_id))
208 
        else:
209 
            msg = ("Floating IP '%s' is used by server '%s'" %
210 
                   (floating_ip.id, floating_ip.nic.machine_id))
205 211 
        raise faults.Conflict(msg)
206 212 

  		





  207
  213
  
    
    # Lock network to prevent deadlock


  		












Also available in:
  Unified diff