From a26d3e730092c9f207b5462b5cef644b64fc1560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Savignan?= Date: 2017年6月22日 15:35:25 +0200 Subject: [PATCH] dashboard: allow bgpvpns with the same name The BGPVPN API allow to use a same name for differents BGPVPNs. The dashboard should allow the same behavior. Change-Id: I749354c6f57051c6e895d97c31eb644d2af5f46b Closes-Bug: 1699514 --- .../dashboards/project/bgpvpn/forms.py | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py b/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py index 48a5337b..f15279c7 100755 --- a/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py +++ b/bgpvpn_dashboard/dashboards/project/bgpvpn/forms.py @@ -47,7 +47,6 @@ class CommonData(forms.SelfHandlingForm): def clean(self): cleaned_data = super(CommonData, self).clean() name = cleaned_data.get('name') - bgpvpn_id = cleaned_data.get('bgpvpn_id') try: if self.request.user.is_superuser: for attribute in bgpvpn_common.RT_FORMAT_ATTRIBUTES: @@ -59,27 +58,14 @@ class CommonData(forms.SelfHandlingForm): tenant_id = self.request.user.tenant_id else: tenant_id = cleaned_data.get('tenant_id') - bgpvpns = bgpvpn_api.bgpvpns_list(self.request, - name=name, - tenant_id=tenant_id) + bgpvpn_api.bgpvpns_list( + self.request, name=name, tenant_id=tenant_id) else: - bgpvpns = bgpvpn_api.bgpvpns_list(self.request, - name=name) + bgpvpn_api.bgpvpns_list(self.request, name=name) except Exception: msg = _('Unable to get BGPVPN with name %s') % name exceptions.check_message(["Connection", "refused"], msg) raise - if bgpvpns: - if self.action == 'update': - for bgpvpn in bgpvpns: - if bgpvpn.id != bgpvpn_id: - raise forms.ValidationError( - _('The name "%s" is already ' - 'used by another BGPVPN.') % name) - else: - raise forms.ValidationError( - _('The name "%s" is already ' - 'used by another BGPVPN.') % name) return cleaned_data @staticmethod

AltStyle によって変換されたページ (->オリジナル) /