diff options
| -rw-r--r-- | testcases/Controllers/ODL/odlreport2db.py | 7 | ||||
| -rw-r--r-- | testcases/security_scan/connect.py | 1 | ||||
| -rw-r--r-- | testcases/security_scan/security_scan.py | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py index 02880841..3eff4006 100644 --- a/testcases/Controllers/ODL/odlreport2db.py +++ b/testcases/Controllers/ODL/odlreport2db.py @@ -24,11 +24,9 @@ import getopt import json -import os import sys import time import xmltodict -import yaml import functest.utils.functest_utils as functest_utils @@ -122,11 +120,6 @@ def main(argv): json.dumps(data, indent=4, separators=(',', ': ')) - # Only used from container, we can set up absolute path - with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) - f.close() - try: # example: # python odlreport2db.py -x ~/Pictures/Perso/odl/output3.xml diff --git a/testcases/security_scan/connect.py b/testcases/security_scan/connect.py index d0ef02d5..cee83ddc 100644 --- a/testcases/security_scan/connect.py +++ b/testcases/security_scan/connect.py @@ -23,6 +23,7 @@ INSTALLER_IP = os.getenv('INSTALLER_IP') logger = ft_logger.Logger("security_scan").getLogger() paramiko.util.log_to_file("/var/log/paramiko.log") + class setup: def __init__(self, *args): self.args = args diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py index 9803dd3c..797b564d 100644 --- a/testcases/security_scan/security_scan.py +++ b/testcases/security_scan/security_scan.py @@ -62,7 +62,8 @@ nova = client.Client(2, session=sess) def run_tests(host, nodetype): user = cfgparse.get(nodetype, 'user') port = cfgparse.get(nodetype, 'port') - connect.logger.info("Host: {0} Selected Profile: {1}".format(host, nodetype)) + connect.logger.info("Host: {0} Selected Profile: {1}".format(host, + nodetype)) connect.logger.info("Creating temp file structure..") createfiles(host, port, user, localkey) connect.logger.info("Installing OpenSCAP...") |