openstack/neutron-vpnaas-dashboard
Code Issues Proposed changes

Merge "Allow peer_id and peer_address input formats other than IP address"

Browse Source
This commit is contained in:
Zuul 2017-11-11 14:09:26 +00:00 committed by Gerrit Code Review
commit 9fff000dfe
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron_vpnaas_dashboard/dashboards/project/vpn/forms.py
View File

@ -243,18 +243,14 @@ class UpdateIPsecSiteConnection(forms.SelfHandlingForm):
name = forms.CharField(max_length=80, label=_("Name"), required=False)
description = forms.CharField(
required=False, max_length=80, label=_("Description"))
peer_address = forms.IPField(
peer_address = forms.CharField(
label=_("Peer gateway public IPv4/IPv6 Address or FQDN"),
help_text=_("Peer gateway public IPv4/IPv6 address or FQDN for "
"the VPN Connection"),
version=forms.IPv4 | forms.IPv6,
mask=False)
peer_id = forms.IPField(
"the VPN Connection"),)
peer_id = forms.CharField(
label=_("Peer router identity for authentication (Peer ID)"),
help_text=_("Peer router identity for authentication. "
"Can be IPv4/IPv6 address, e-mail, key ID, or FQDN"),
version=forms.IPv4 | forms.IPv6,
mask=False)
"Can be IPv4/IPv6 address, e-mail, key ID, or FQDN"),)
peer_cidrs = forms.MultiIPField(
required=False,
label=_("Remote peer subnet(s)"),

12
neutron_vpnaas_dashboard/dashboards/project/vpn/workflows.py
View File

@ -432,18 +432,14 @@ class AddIPsecSiteConnectionAction(workflows.Action):
label=_("IKE policy associated with this connection"))
ipsecpolicy_id = forms.ChoiceField(
label=_("IPsec policy associated with this connection"))
peer_address = forms.IPField(
peer_address = forms.CharField(
label=_("Peer gateway public IPv4/IPv6 Address or FQDN"),
help_text=_("Peer gateway public IPv4/IPv6 address or FQDN for "
"the VPN Connection"),
version=forms.IPv4 | forms.IPv6,
mask=False)
peer_id = forms.IPField(
"the VPN Connection"),)
peer_id = forms.CharField(
label=_("Peer router identity for authentication (Peer ID)"),
help_text=_("Peer router identity for authentication. "
"Can be IPv4/IPv6 address, e-mail, key ID, or FQDN"),
version=forms.IPv4 | forms.IPv6,
mask=False)
"Can be IPv4/IPv6 address, e-mail, key ID, or FQDN"),)
peer_ep_group_id = forms.ChoiceField(
required=False,
label=_("Endpoint Group for remote peer CIDR(s)"),

6
releasenotes/notes/add-more-formats-to-ipsec-site-connection-e105363b9125b1ed.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Add support the attributes of IPsec site connection to be able to get
more formats like FQDN other than IP format. For more information, see
bug `1261127 <https://launchpad.net/bugs/1261127>`_.