Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 602C4200BC8 for ; Wed, 23 Nov 2016 10:01:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5ED61160B1F; Wed, 23 Nov 2016 09:01:29 +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 B1D99160AFD for ; Wed, 23 Nov 2016 10:01:28 +0100 (CET) Received: (qmail 13380 invoked by uid 500); 23 Nov 2016 09:01:27 -0000 Mailing-List: contact commits-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 commits@cloudstack.apache.org Received: (qmail 13366 invoked by uid 99); 23 Nov 2016 09:01:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Nov 2016 09:01:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F3CEE055D; Wed, 23 Nov 2016 09:01:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Wed, 23 Nov 2016 09:01:28 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: updated refs/heads/master to 97f9ef5 archived-at: Wed, 23 Nov 2016 09:01:29 -0000 Merge pull request #1680 from murali-reddy/vr_csfile_search CLOUDSTACK-9498: VR CsFile search utility methods fail when search stThere is no real use of python 're' module in CsFile.py utility methods searchString, deleteLine. Regular string search is sufficient. These methods are used only for VPN user add/delete. Since VPN user password can have python 're' module meta characters, it interfere with search functionality. Replacing re.search() with regular string search instead. Change is confined to VPN add/delete users. Have run the test/integration/component/test_vpn_users.py VPN remote access user limit tests ... === TestName: test_01_VPN_user_limit | Status : SUCCESS === ok Test create VPN when L2TP port in use ... === TestName: test_02_use_vpn_port | Status : SUCCESS === ok Test create NAT rule when VPN when L2TP enabled ... === TestName: test_03_enable_vpn_use_port | Status : SUCCESS === ok Test add new users to existing VPN ... === TestName: test_04_add_new_users | Status : SUCCESS === ok Test add duplicate user to existing VPN ... === TestName: test_05_add_duplicate_user | Status : SUCCESS === ok Test as global admin, add a new VPN user to an existing VPN entry ... === TestName: test_06_add_VPN_user_global_admin | Status : SUCCESS === ok Test as domain admin, add a new VPN user to an existing VPN entry ... === TestName: test_07_add_VPN_user_domain_admin | Status : SUCCESS === ok * pr/1680: CLOUDSTACK-9498: VR CsFile search utility methods fail when search string has 're' meta chars, and causing VPN user add/deelte to fail Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e88ad45 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e88ad45 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e88ad45 Branch: refs/heads/master Commit: 1e88ad45a714cb2f234b4721bbe3f6c09a51923c Parents: 1f21848 9cc06a8 Author: Rohit Yadav Authored: Wed Nov 23 14:30:45 2016 +0530 Committer: Rohit Yadav Committed: Wed Nov 23 14:31:00 2016 +0530 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py | 6 +++--- test/integration/component/test_vpn_users.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------