From issues-return-88083-archive-asf-public=cust-asf.ponee.io@cloudstack.apache.org Thu Jan 4 12:33:07 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id B51E9180657 for ; Thu, 4 Jan 2018 12:33:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A4EB0160C28; Thu, 4 Jan 2018 11:33:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EB3C9160C2B for ; Thu, 4 Jan 2018 12:33:06 +0100 (CET) Received: (qmail 2174 invoked by uid 500); 4 Jan 2018 11:33:06 -0000 Mailing-List: contact issues-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list issues@cloudstack.apache.org Received: (qmail 2165 invoked by uid 500); 4 Jan 2018 11:33:06 -0000 Delivered-To: apmail-incubator-cloudstack-issues@incubator.apache.org Received: (qmail 2162 invoked by uid 99); 4 Jan 2018 11:33:06 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2018 11:33:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id E2BA1C1DB7 for ; Thu, 4 Jan 2018 11:33:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -99.211 X-Spam-Level: X-Spam-Status: No, score=-99.211 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id g3Qt49I8qmR1 for ; Thu, 4 Jan 2018 11:33:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id F033A5F635 for ; Thu, 4 Jan 2018 11:33:03 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 59A4CE12AB for ; Thu, 4 Jan 2018 11:33:02 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 4179D240F2 for ; Thu, 4 Jan 2018 11:33:00 +0000 (UTC) Date: Thu, 4 Jan 2018 11:33:00 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: cloudstack-issues@incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CLOUDSTACK-10207) updateVpnCustomerGateway: unexpected changes on optional keys MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/CLOUDSTACK-10207?page=3Dcom.atl= assian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId= =3D16311222#comment-16311222 ]=20 ASF GitHub Bot commented on CLOUDSTACK-10207: --------------------------------------------- DaanHoogland commented on a change in pull request #2377: CLOUDSTACK-10207:= updateVpnCustomerGateway: fix defaulting for option=E2=80=A6 URL: https://github.com/apache/cloudstack/pull/2377#discussion_r159630403 =20 =20 ########## File path: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java ########## @@ -426,72 +426,52 @@ public Site2SiteCustomerGateway updateCustomerGatewa= y(UpdateVpnCustomerGatewayCm } } } - String name =3D cmd.getName(); String gatewayIp =3D cmd.getGatewayIp(); if (!NetUtils.isValidIp(gatewayIp) && !NetUtils.verifyDomainName(g= atewayIp)) { throw new InvalidParameterValueException("The customer gateway= ip/Domain " + gatewayIp + " is invalid!"); } - if (name =3D=3D null) { - name =3D "VPN-" + gatewayIp; - } String guestCidrList =3D cmd.getGuestCidrList(); if (!NetUtils.isValidCidrList(guestCidrList)) { throw new InvalidParameterValueException("The customer gateway= peer cidr list " + guestCidrList + " contains an invalid cidr!"); } - String ipsecPsk =3D cmd.getIpsecPsk(); String ikePolicy =3D cmd.getIkePolicy(); - String espPolicy =3D cmd.getEspPolicy(); if (!NetUtils.isValidS2SVpnPolicy("ike", ikePolicy)) { - throw new InvalidParameterValueException("The customer gateway= IKE policy" + ikePolicy + " is invalid! Verify the required Diffie Hellma= n (DH) group is specified."); + throw new InvalidParameterValueException("The customer gateway= IKE policy" + ikePolicy + " is invalid! Verify if the required Diffie Hell= man (DH) group is specified."); =20 Review comment: can we make this text slightly different then the one above so it will b= e easier to search when one of them occur? How about adding a reason/contex= t 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. =20 For queries about this service, please contact Infrastructure at: users@infra.apache.org > updateVpnCustomerGateway: unexpected changes on optional keys > ------------------------------------------------------------- > > Key: CLOUDSTACK-10207 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-102= 07 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the defa= ult.)=20 > Components: API > Reporter: Ren=C3=A9 Moser > Assignee: Ren=C3=A9 Moser > Priority: Minor > Fix For: 4.11.0.0 > > -- This message was sent by Atlassian JIRA (v6.4.14#64029)