You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/23 09:03:04 UTC
[2/2] git commit: updated refs/heads/4.9 to 1e88ad4
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 <ro...@shapeblue.com>
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/4.9
Commit: 1e88ad45a714cb2f234b4721bbe3f6c09a51923c
Parents: 1f21848 9cc06a8
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 23 14:30:45 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
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(-)
----------------------------------------------------------------------