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:01:27 UTC
[1/3] git commit: updated refs/heads/master to 97f9ef5
Repository: cloudstack
Updated Branches:
refs/heads/master 35803805c -> 97f9ef52a
CLOUDSTACK-9498: VR CsFile search utility methods fail when search string has
're' meta chars, and causing VPN user add/deelte to fail
-there is no real use of python 're' in CsFile.py utility methods searchString, deleteLine
Replacing with regular string search instead.
-modifying the smoke test for VPN user add/delete to have all permissable chars
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9cc06a8f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9cc06a8f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9cc06a8f
Branch: refs/heads/master
Commit: 9cc06a8fc8d0854cd3a3665e0bc4428b1c234688
Parents: fcee71f
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Oct 28 17:45:15 2016 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Oct 28 17:45:15 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cc06a8f/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py
index 78ad859..334e631 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py
@@ -66,7 +66,7 @@ class CsFile:
logging.info("Wrote edited file %s" % self.filename)
self.config = list(self.new_config)
logging.info("Updated file in-cache configuration")
-
+
def dump(self):
for line in self.new_config:
@@ -143,7 +143,7 @@ class CsFile:
print ' line = ' +line
if line.lstrip().startswith(ignoreLinesStartWith):
continue
- if re.search(search, line):
+ if search in line:
found = True
break
@@ -157,7 +157,7 @@ class CsFile:
for index, line in enumerate(self.new_config):
if line.lstrip().startswith("#"):
continue
- if not re.search(search, line):
+ if search not in line:
temp_config.append(line)
self.new_config = list(temp_config)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9cc06a8f/test/integration/component/test_vpn_users.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py
index 72e10a4..f5bad7e 100644
--- a/test/integration/component/test_vpn_users.py
+++ b/test/integration/component/test_vpn_users.py
@@ -77,7 +77,7 @@ class Services:
},
"vpn_user": {
"username": "test",
- "password": "test",
+ "password": "p@a#s=s.w_o-r+d",
},
"natrule": {
"privateport": 1701,
[2/3] git commit: updated refs/heads/master to 97f9ef5
Posted by bh...@apache.org.
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/master
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(-)
----------------------------------------------------------------------
[3/3] git commit: updated refs/heads/master to 97f9ef5
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97f9ef52
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97f9ef52
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97f9ef52
Branch: refs/heads/master
Commit: 97f9ef52a49b8ffd8fec50ab2cfa43e7cda7a36d
Parents: 3580380 1e88ad4
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 23 14:31:09 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 23 14:31:09 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(-)
----------------------------------------------------------------------