X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Frally%2Frally.py;h=1fe6143e1edfdf2eee3b461f0981a282a005e280;hb=d06d840c00d4e3b58b826447e17035469e967357;hp=e7cac7afa80c1af50618ed55a11be4ecabfb77a1;hpb=1a498ce89ae559e73bc63d2ec3a31188a0d411df;p=functest.git

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index e7cac7afa..1fe6143e1 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -17,7 +17,7 @@ import time
 import iniparse
 import yaml
 
-from functest.core import testcase_base
+from functest.core import testcase
 from functest.utils.constants import CONST
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
@@ -26,7 +26,7 @@ import functest.utils.openstack_utils as os_utils
 logger = ft_logger.Logger('Rally').getLogger()
 
 
-class RallyBase(testcase_base.TestcaseBase):
+class RallyBase(testcase.TestCase):
     TESTS = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
              'neutron', 'nova', 'quotas', 'requests', 'vm', 'all']
     GLANCE_IMAGE_NAME = CONST.openstack_image_name
@@ -56,8 +56,8 @@ class RallyBase(testcase_base.TestcaseBase):
     RALLY_PRIVATE_SUBNET_CIDR = CONST.rally_subnet_cidr
     RALLY_ROUTER_NAME = CONST.rally_router_name
 
-    def __init__(self):
-        super(RallyBase, self).__init__()
+    def __init__(self, case_name=''):
+        super(RallyBase, self).__init__(case_name)
         self.mode = ''
         self.summary = []
         self.scenario_dir = ''
@@ -66,6 +66,7 @@ class RallyBase(testcase_base.TestcaseBase):
         self.cinder_client = os_utils.get_cinder_client()
         self.network_dict = {}
         self.volume_type = None
+        self.smoke = None
 
     def _build_task_args(self, test_file_name):
         task_args = {'service_list': [test_file_name]}
@@ -94,11 +95,8 @@ class RallyBase(testcase_base.TestcaseBase):
         else:
             task_args['netid'] = ''
 
-        auth_url = CONST.OS_AUTH_URL
-        if auth_url is not None:
-            task_args['request_url'] = auth_url.rsplit(":", 1)[0]
-        else:
-            task_args['request_url'] = ''
+        # get keystone auth endpoint
+        task_args['request_url'] = CONST.OS_AUTH_URL or ''
 
         return task_args
 
@@ -290,7 +288,7 @@ class RallyBase(testcase_base.TestcaseBase):
             cmd_line = ("rally task validate "
                         "--task {0} "
                         "--task-args \"{1}\""
-                        .format(task_file, self.__build_task_args(test_name)))
+                        .format(task_file, self._build_task_args(test_name)))
             logger.debug('running command line: {}'.format(cmd_line))
             p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
                                  stderr=subprocess.STDOUT, shell=True)
@@ -528,10 +526,13 @@ class RallyBase(testcase_base.TestcaseBase):
             self._run_tests()
             self._generate_report()
             self._clean_up()
+            res = testcase.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s' % e)
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase.TestCase.EX_RUN_ERROR
+
         self.stop_time = time.time()
+        return res
 
 
 class RallySanity(RallyBase):