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 <[email protected]>
Authored: Fri Oct 28 17:45:15 2016 +0530
Committer: Murali Reddy <[email protected]>
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,
