]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Make VPNaaS 'InUse' exception more clear
authorEugene Nikanorov <enikanorov@mirantis.com>
Tue, 6 May 2014 11:35:04 +0000 (15:35 +0400)
committerenikanorov <enikanorov@mirantis.com>
Wed, 7 May 2014 13:27:50 +0000 (13:27 +0000)
In case IpSecPolicy or IKEPolicy is updated while VPN connection that uses it
is already established, IPsecPolicyInUse or IKEPolicuInUse is raised.
Need to clarify their messages to emphasize that policies can't be updated
because they are used by established connection.

Change-Id: I259f9b8bcff7f8ec13ac630285f6e881c6653309
Closes-Bug: #1315809

neutron/extensions/vpnaas.py

index 5c7cd46bfaad8798db1d266bf7100a0d3561e63b..f6bdcd761172b262ea9053259261c746762b7ea2 100644 (file)
@@ -54,7 +54,8 @@ class IPsecPolicyNotFound(qexception.NotFound):
 
 
 class IKEPolicyInUse(qexception.InUse):
-    message = _("IKEPolicy %(ikepolicy_id)s is still in use")
+    message = _("IKEPolicy %(ikepolicy_id)s is in use by existing "
+                "IPsecSiteConnection and can't be updated or deleted")
 
 
 class VPNServiceInUse(qexception.InUse):
@@ -71,7 +72,8 @@ class VPNStateInvalidToUpdate(qexception.BadRequest):
 
 
 class IPsecPolicyInUse(qexception.InUse):
-    message = _("IPsecPolicy %(ipsecpolicy_id)s is still in use")
+    message = _("IPsecPolicy %(ipsecpolicy_id)s is in use by existing "
+                "IPsecSiteConnection and can't be updated or deleted")
 
 
 class DeviceDriverImportError(qexception.NeutronException):