Merge "Remove all logers as utils method args." into stable/colorado

diff --git a/docker/requirements.pip b/docker/requirements.pip
index 25ec795..7ba1a35 100644 (file)
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -11,6 +11,7 @@ pyyaml==3.10
 gitpython==1.0.1
 python-openstackclient==2.3.0
 python-ceilometerclient==1.5.1
+python-keystoneclient==2.3.1
 virtualenv==1.11.4
 pexpect==4.0
 requests==2.8.0

diff --git a/testcases/vnf/vRNC/parser.py b/testcases/vnf/vRNC/parser.py
index 37e84d8..5ff207c 100755 (executable)
--- a/testcases/vnf/vRNC/parser.py
+++ b/testcases/vnf/vRNC/parser.py
@@ -14,22 +14,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+import argparse
 import time
 
-import argparse
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as functest_utils
 
+
 parser = argparse.ArgumentParser()
 parser.add_argument("-r", "--report",
                     help="Create json result file",
                     action="store_true")
 args = parser.parse_args()
 
-functest_yaml = functest_utils.get_functest_yaml()
-
-dirs = functest_yaml.get('general').get('directories')
-PARSER_REPO = dirs.get('dir_repo_parser')
+PARSER_REPO = functest_utils.get_parameter_from_yaml(
+    'general.directories.dir_repo_parser')
+RESULTS_DIR = functest_utils.get_parameter_from_yaml(
+    'general.directories.dir_results')
 
 logger = ft_logger.Logger("parser").getLogger()
 
@@ -40,9 +41,11 @@ def main():
     cmd = 'cd %s/tests && ./functest_run.sh' % PARSER_REPO
 
     start_time = time.time()
+    log_file = RESULTS_DIR + "/parser.log"
     ret = functest_utils.execute_command(cmd,
                                          info=True,
-                                         exit_on_error=False)
+                                         exit_on_error=False,
+                                         output_file=log_file)
     stop_time = time.time()
 
     status, details = functest_utils.check_test_result(project,