From c4ca420f66674fc0be42aa8075b6b9194ea2355c Mon Sep 17 00:00:00 2001 From: SudharmaJain Date: Wed, 13 Sep 2017 10:29:08 +0530 Subject: [PATCH] CLOUDSTACK-8969: VPN customer gateway can't be registered with hostname (#955) When we have VPN customer gateway which is resolved by a hostname , we should be able to register the VPN customer gateway with its hostname instead of the IP address, this would be useful in case where the remote device IP is dynamically assigned , where customers use DDNS to resolve it. --- .../com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index e465bfb3529..ba8c1d1ade0 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -177,8 +177,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn String name = cmd.getName(); String gatewayIp = cmd.getGatewayIp(); - if (!NetUtils.isValidIp(gatewayIp)) { - throw new InvalidParameterValueException("The customer gateway ip " + gatewayIp + " is invalid!"); + if (!NetUtils.isValidIp(gatewayIp) && !NetUtils.verifyDomainName(gatewayIp)) { + throw new InvalidParameterValueException("The customer gateway ip/Domain " + gatewayIp + " is invalid!"); } if (name == null) { name = "VPN-" + gatewayIp; @@ -431,8 +431,8 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn } String name = cmd.getName(); String gatewayIp = cmd.getGatewayIp(); - if (!NetUtils.isValidIp(gatewayIp)) { - throw new InvalidParameterValueException("The customer gateway ip " + gatewayIp + " is invalid!"); + if (!NetUtils.isValidIp(gatewayIp) && !NetUtils.verifyDomainName(gatewayIp)) { + throw new InvalidParameterValueException("The customer gateway ip/Domain " + gatewayIp + " is invalid!"); } if (name == null) { name = "VPN-" + gatewayIp;