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
This commit is contained in:
Murali Reddy 2016-10-28 17:45:15 +05:30
parent fcee71f35b
commit 9cc06a8fc8
2 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -77,7 +77,7 @@ class Services:
},
"vpn_user": {
"username": "test",
"password": "test",
"password": "p@a#s=s.w_o-r+d",
},
"natrule": {
"privateport": 1701,