X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fsnaps_test_runner.py;h=4de443718a1e6f827c3f9a211967dfcafadd0caf;hb=58dd7174657c66254ae4c511850ac7d49b1dd98f;hp=94b97551a02b6034986051069ad96a1e0c397833;hpb=794493f95dc235ada697f9fd7f6d983b48521b4d;p=functest.git

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 94b97551a..4de443718 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -1,40 +1,58 @@
-# Copyright (c) 2015 All rights reserved
+#!/usr/bin/env python
+
+# Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
+#
 # This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 
+"""configuration params to run snaps tests"""
+
 import logging
 
-from functest.core.pytest_suite_runner import PyTestSuiteRunner
+from functest.core import unit
 from functest.opnfv_tests.openstack.snaps import snaps_utils
-from functest.utils import functest_utils
-from functest.utils.constants import CONST
+from functest.utils import config
+from functest.utils import env
 
 from snaps.openstack import create_flavor
-from snaps.openstack.tests import openstack_tests
 
 
-class SnapsTestRunner(PyTestSuiteRunner):
+class SnapsTestRunner(unit.Suite):
+    # pylint: disable=too-many-instance-attributes
     """
     This test executes the SNAPS Python Tests
     """
+
     def __init__(self, **kwargs):
         super(SnapsTestRunner, self).__init__(**kwargs)
         self.logger = logging.getLogger(__name__)
+        self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
+
+        if 'ext_net_name' in kwargs:
+            self.ext_net_name = kwargs['ext_net_name']
+        else:
+            self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds)
 
-        self.os_creds = openstack_tests.get_credentials(
-            os_env_file=CONST.__getattribute__('openstack_creds'),
-            proxy_settings_str=None, ssh_proxy_cmd=None)
+        self.netconf_override = None
+        if hasattr(config.CONF, 'snaps_network_config'):
+            self.netconf_override = getattr(
+                config.CONF, 'snaps_network_config')
 
-        self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds)
-        self.use_fip = CONST.__getattribute__('snaps_use_floating_ips')
-        self.use_keystone = CONST.__getattribute__('snaps_use_keystone')
-        scenario = functest_utils.get_scenario()
+        self.use_fip = (
+            getattr(config.CONF, 'snaps_use_floating_ips') == 'True')
+        self.use_keystone = (
+            getattr(config.CONF, 'snaps_use_keystone') == 'True')
+        scenario = env.get('DEPLOY_SCENARIO')
 
-        self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_ANY
+        self.flavor_metadata = None
         if 'ovs' in scenario or 'fdio' in scenario:
             self.flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE
 
         self.logger.info("Using flavor metadata '%s'", self.flavor_metadata)
+
+        self.image_metadata = None
+        if hasattr(config.CONF, 'snaps_images'):
+            self.image_metadata = getattr(config.CONF, 'snaps_images')