[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16447679#comment-16447679
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
resmo closed pull request #2377: CLOUDSTACK-10207: updateVpnCustomerGateway:
fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index aebc8717485..8717a6a38f8 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -192,7 +192,7 @@ public Site2SiteCustomerGateway
createCustomerGateway(CreateVpnCustomerGatewayCm
String ikePolicy = cmd.getIkePolicy();
String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy " + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while creating a
customer gateway. The IKE policy " + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy " + espPolicy + " is invalid!");
@@ -427,73 +427,103 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
-
-if (!NetUtils.isValidIp4(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
-throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
-}
-if (name == null) {
-name = "VPN-" + gatewayIp;
+if (gatewayIp != null) {
+if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
+throw new InvalidParameterValueException("The customer gateway
IP/domain " + gatewayIp + " is invalid!");
+}
+gw.setGatewayIp(gatewayIp);
+} else {
+// TODO: Change API to make this param optional on update
+throw new InvalidParameterValueException("The customer gateway
IP/domain param is required");
}
+
String guestCidrList = cmd.getGuestCidrList();
-if (!NetUtils.isValidCidrList(guestCidrList)) {
-throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
+if (guestCidrList != null) {
+if (!NetUtils.isValidCidrList(guestCidrList)) {
+throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
+}
+checkCustomerGatewayCidrList(guestCidrList);
+gw.setGuestCidrList(guestCidrList);
+} else {
+// TODO: Change API to make this param optional on update
+throw new InvalidParameterValueException("The customer gateway
peer cidr list param is required");
}
-String ipsecPsk = cmd.getIpsecPsk();
+
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
-if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
-}
-if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
-throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
+if (ikePolicy != null) {
+if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
+throw new InvalidParameterValueException("Error while updating
a customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
+}
+gw.setIkePolicy(ikePolicy);
+} else {
+// TODO: Change API to make this param optional on update
+throw new InvalidParameterValueException("The customer gateway IKE
policy param is required");
}
+
+String espPolicy = cmd.getEspPolicy();
+if (espPolicy != null) {
+
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16447678#comment-16447678 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - resmo commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-383483564 closing for the moment for a cleaner PR This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445731#comment-16445731
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
resmo commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183051578
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
-encap = false;
-}
-
checkCustomerGatewayCidrList(guestCidrList);
-long accountId = gw.getAccountId();
-Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
-if (existedGw != null && existedGw.getId() != gw.getId()) {
-throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+String name = cmd.getName();
+if (name != null) {
+long accountId = gw.getAccountId();
+Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
+if (existedGw != null && existedGw.getId() != gw.getId()) {
+throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+}
}
gw.setName(name);
gw.setGatewayIp(gatewayIp);
gw.setGuestCidrList(guestCidrList);
gw.setIkePolicy(ikePolicy);
gw.setEspPolicy(espPolicy);
-gw.setIpsecPsk(ipsecPsk);
+gw.setIpsecPsk(cmd.getIpsecPsk());
Review comment:
@rhtyd so, I have to move these into the conditions otherwise they may be
null right?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
>
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445729#comment-16445729
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
resmo commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183051200
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
-encap = false;
-}
-
checkCustomerGatewayCidrList(guestCidrList);
-long accountId = gw.getAccountId();
-Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
-if (existedGw != null && existedGw.getId() != gw.getId()) {
-throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+String name = cmd.getName();
+if (name != null) {
+long accountId = gw.getAccountId();
+Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
+if (existedGw != null && existedGw.getId() != gw.getId()) {
+throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+}
}
gw.setName(name);
Review comment:
good catch!
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445728#comment-16445728
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
resmo commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183051161
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
Review comment:
same here, no need to "default" an existing record
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445727#comment-16445727
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
resmo commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183051063
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
Review comment:
if null, we should keep what we already have
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445712#comment-16445712
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
rhtyd commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183048444
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
-encap = false;
-}
-
checkCustomerGatewayCidrList(guestCidrList);
-long accountId = gw.getAccountId();
-Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
-if (existedGw != null && existedGw.getId() != gw.getId()) {
-throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+String name = cmd.getName();
+if (name != null) {
Review comment:
I see you've a null check here, but what is name is not provided, the code
will fallthrough?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445703#comment-16445703 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-383093482 @resmo manual testing is fine, given your comment I'm okay to merge. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445705#comment-16445705 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on a change in pull request #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183048107 ## File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java ## @@ -426,72 +426,52 @@ public Site2SiteCustomerGateway updateCustomerGateway(UpdateVpnCustomerGatewayCm } } } -String name = cmd.getName(); Review comment: should we throw an exception instead when name is null or empty? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445718#comment-16445718
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
resmo commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183049938
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
-encap = false;
-}
-
checkCustomerGatewayCidrList(guestCidrList);
-long accountId = gw.getAccountId();
-Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
-if (existedGw != null && existedGw.getId() != gw.getId()) {
-throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+String name = cmd.getName();
+if (name != null) {
Review comment:
this is "updateCustomerGateway" so we already have a valid name. if no name
is provided, we should just keep the name as is.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445714#comment-16445714 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - resmo commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-383094901 I discovered the flow while developing ansible modules. https://github.com/ansible/ansible/blob/devel/lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py. In my integration tests I had to always add all arguments (https://github.com/ansible/ansible/blob/devel/test/integration/targets/cs_vpn_customer_gateway/tasks/main.yml#L105) to have the idempotent result. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445706#comment-16445706
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
rhtyd commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183048203
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
Review comment:
Here, should we throw an exception or keep the default when ikeLifetime is
null?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445710#comment-16445710
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
rhtyd commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183048263
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
Review comment:
Same for above two Boolean options?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445713#comment-16445713
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
rhtyd commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r183048519
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("Error while updating a
customer gateway. The IKE policy" + ikePolicy + " is invalid! Verify whether
the required Diffie Hellman (DH) group is specified.");
}
+String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("esp", espPolicy)) {
throw new InvalidParameterValueException("The customer gateway ESP
policy" + espPolicy + " is invalid!");
}
Long ikeLifetime = cmd.getIkeLifetime();
-if (ikeLifetime == null) {
-// Default value of lifetime is 1 day
-ikeLifetime = (long)86400;
-}
-if (ikeLifetime > 86400) {
+if (ikeLifetime != null && ikeLifetime > 86400) {
throw new InvalidParameterValueException("The IKE lifetime " +
ikeLifetime + " of vpn connection is invalid!");
}
Long espLifetime = cmd.getEspLifetime();
-if (espLifetime == null) {
-// Default value of lifetime is 1 hour
-espLifetime = (long)3600;
-}
-if (espLifetime > 86400) {
+if (espLifetime != null && espLifetime > 86400) {
throw new InvalidParameterValueException("The ESP lifetime " +
espLifetime + " of vpn connection is invalid!");
}
-Boolean dpd = cmd.getDpd();
-if (dpd == null) {
-dpd = false;
-}
-
-Boolean encap = cmd.getEncap();
-if (encap == null) {
-encap = false;
-}
-
checkCustomerGatewayCidrList(guestCidrList);
-long accountId = gw.getAccountId();
-Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
-if (existedGw != null && existedGw.getId() != gw.getId()) {
-throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+String name = cmd.getName();
+if (name != null) {
+long accountId = gw.getAccountId();
+Site2SiteCustomerGatewayVO existedGw =
_customerGatewayDao.findByNameAndAccountId(name, accountId);
+if (existedGw != null && existedGw.getId() != gw.getId()) {
+throw new InvalidParameterValueException("The customer gateway
with name " + name + " already existed!");
+}
}
gw.setName(name);
Review comment:
here a null name could be set.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445702#comment-16445702 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-383093396 Tests LGTM. Let me review it. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16445694#comment-16445694 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - borisstoyanov commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-383091103 @resmo can you just give a brief overview how you've covered the manual testing? @rhtyd @DaanHoogland I think this could be merged as well? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16359524#comment-16359524 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-364673791 Ping @resmo, can you comment on outstanding questions? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16314818#comment-16314818 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - DaanHoogland commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355766533 Yes, i am alright with this code but I am wondering if we are somehow validating this. @resmo ? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16314773#comment-16314773 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355762783 Test LGTM, the failure is not related to this PR. @DaanHoogland are you lgtm on it? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16313806#comment-16313806 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355654335 Trillian test result (tid-2021) Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7 Total time taken: 45299 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2377-t2021-vmware-55u3.zip Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py Smoke tests completed. 66 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_02_cancel_host_maintenace_with_migration_jobs | `Error` | 156.91 | test_host_maintenance.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312629#comment-16312629 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355491508 @blueorangutan test centos7 vmware-55u3 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312630#comment-16312630 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355491530 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-55u3) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312624#comment-16312624 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355491102 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1585 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312557#comment-16312557 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355482484 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312558#comment-16312558 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355482496 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16311407#comment-16311407 ] Daan Hoogland commented on CLOUDSTACK-10207: [~resmo] I reviewed the PR and it looks fine but a regression test would be very welcome for this. Do you see a change of making one? > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16311221#comment-16311221
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
DaanHoogland commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r159629699
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -191,7 +191,7 @@ public Site2SiteCustomerGateway
createCustomerGateway(CreateVpnCustomerGatewayCm
String ikePolicy = cmd.getIkePolicy();
String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy " + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("The customer gateway IKE
policy " + ikePolicy + " is invalid! Verify if the required Diffie Hellman (DH)
group is specified.");
Review comment:
'whether' instead of 'if'?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
> Fix For: 4.11.0.0
>
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[
https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16311222#comment-16311222
]
ASF GitHub Bot commented on CLOUDSTACK-10207:
-
DaanHoogland commented on a change in pull request #2377: CLOUDSTACK-10207:
updateVpnCustomerGateway: fix defaulting for option…
URL: https://github.com/apache/cloudstack/pull/2377#discussion_r159630403
##
File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
##
@@ -426,72 +426,52 @@ public Site2SiteCustomerGateway
updateCustomerGateway(UpdateVpnCustomerGatewayCm
}
}
}
-String name = cmd.getName();
String gatewayIp = cmd.getGatewayIp();
if (!NetUtils.isValidIp(gatewayIp) &&
!NetUtils.verifyDomainName(gatewayIp)) {
throw new InvalidParameterValueException("The customer gateway
ip/Domain " + gatewayIp + " is invalid!");
}
-if (name == null) {
-name = "VPN-" + gatewayIp;
-}
String guestCidrList = cmd.getGuestCidrList();
if (!NetUtils.isValidCidrList(guestCidrList)) {
throw new InvalidParameterValueException("The customer gateway
peer cidr list " + guestCidrList + " contains an invalid cidr!");
}
-String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
-String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) {
-throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify the required Diffie Hellman (DH)
group is specified.");
+throw new InvalidParameterValueException("The customer gateway IKE
policy" + ikePolicy + " is invalid! Verify if the required Diffie Hellman (DH)
group is specified.");
Review comment:
can we make this text slightly different then the one above so it will be
easier to search when one of them occur? How about adding a reason/context of
the use of the invalid policy?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> updateVpnCustomerGateway: unexpected changes on optional keys
> -
>
> Key: CLOUDSTACK-10207
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: API
>Reporter: René Moser
>Assignee: René Moser
>Priority: Minor
> Fix For: 4.11.0.0
>
>
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16310758#comment-16310758 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-355203300 Additional review requested This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16309264#comment-16309264 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354955440 Test LGTM. The one failure is an env caused issue. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16308795#comment-16308795 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354887256 Trillian test result (tid-1974) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 27861 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2377-t1974-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 65 look OK, 1 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_hostha_enable_ha_when_host_in_maintenance | `Error` | 1.16 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307635#comment-16307635 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354697912 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307636#comment-16307636 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354697914 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307540#comment-16307540 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354674171 Trillian test result (tid-1962) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 37086 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2377-t1962-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 64 look OK, 2 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- test_01_cancel_host_maintenace_with_no_migration_jobs | `Failure` | 11.41 | test_host_maintenance.py test_02_cancel_host_maintenace_with_migration_jobs | `Failure` | 132.95 | test_host_maintenance.py test_hostha_kvm_host_fencing | `Failure` | 697.95 | test_hostha_kvm.py test_hostha_kvm_host_recovering | `Failure` | 642.55 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307127#comment-16307127 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354588748 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307126#comment-16307126 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354588723 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307124#comment-16307124 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354588540 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1531 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307105#comment-16307105 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354587792 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16307104#comment-16307104 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354587767 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16305362#comment-16305362 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354275570 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1515 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16305280#comment-16305280 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354263462 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16305278#comment-16305278 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354263441 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16305273#comment-16305273 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - resmo commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354262749 @rhtyd yes, please :) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16305202#comment-16305202 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354256746 @resmo is this ready for review/testing? Thanks. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16304356#comment-16304356 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354075059 Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1507 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16304317#comment-16304317 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - blueorangutan commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354071057 @rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16304316#comment-16304316 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - rhtyd commented on issue #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377#issuecomment-354070973 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys
[ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16303871#comment-16303871 ] ASF GitHub Bot commented on CLOUDSTACK-10207: - resmo opened a new pull request #2377: CLOUDSTACK-10207: updateVpnCustomerGateway: fix defaulting for option… URL: https://github.com/apache/cloudstack/pull/2377 …al keys Defaulting optional values in cacse of null is not expected. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > - > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10207 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: API >Reporter: René Moser >Assignee: René Moser >Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)
