From 8004480a3a893d24ceaf144b5f3460d2fe14b041 Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Tue, 6 May 2014 15:35:04 +0400 Subject: [PATCH] Make VPNaaS 'InUse' exception more clear 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neutron/extensions/vpnaas.py b/neutron/extensions/vpnaas.py index 5c7cd46bfa..f6bdcd7611 100644 --- a/neutron/extensions/vpnaas.py +++ b/neutron/extensions/vpnaas.py @@ -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):