From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 17 Nov 2015 18:30:10 +0000 (+0000)
Subject: Merge "Avoid race condition for reserved DHCP ports"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f3d99f5928054954cbc326094f7458422c4ec36c;p=openstack-build%2Fneutron-build.git

Merge "Avoid race condition for reserved DHCP ports"
---

f3d99f5928054954cbc326094f7458422c4ec36c
diff --cc neutron/common/exceptions.py
index 69acf4e36,cb8829753..54800e246
--- a/neutron/common/exceptions.py
+++ b/neutron/common/exceptions.py
@@@ -179,9 -169,13 +179,13 @@@ class PortInUse(InUse)
  
  class ServicePortInUse(InUse):
      message = _("Port %(port_id)s cannot be deleted directly via the "
 -                "port API: %(reason)s")
 +                "port API: %(reason)s.")
  
  
+ class DhcpPortInUse(InUse):
+     message = _("Port %(port_id)s is already acquired by another DHCP agent")
+ 
+ 
  class PortBound(InUse):
      message = _("Unable to complete operation on port %(port_id)s, "
                  "port is already bound, port type: %(vif_type)s, "