From 9cc06a8fc8d0854cd3a3665e0bc4428b1c234688 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Fri, 28 Oct 2016 17:45:15 +0530 Subject: [PATCH] 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 --- 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(-) 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 78ad8597f8b..334e6314bbe 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) diff --git a/test/integration/component/test_vpn_users.py b/test/integration/component/test_vpn_users.py index 72e10a4d6e6..f5bad7e31c9 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,