diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-04-08 13:38:45 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-04-11 14:23:21 +0200 |
commit | 96bacd7d8ffb9c05672c0a1fc6e68d19e4a6793a (patch) | |
tree | 7e0fa1d220628aa0ea3f6b0d36702224e2891628 /functest/opnfv_tests/features | |
parent | ccc675b3095271d59dba3a49c0b116d0ff6c6bfb (diff) |
Modify TestCase constructor attributes
Every feature/testcase now allows receiving the data defined in
testcases.yaml as args (name is renamed to case_name).
From the time being, only project and case names are handled. Next
pending patches will add criteria, cmd and repo to this list.
It keeps the default values for case names except for features which
will be aggregated into Feature.
Change-Id: Id742d100b8183d7f10894c24ae6879d1b2b60ac9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/features')
-rw-r--r-- | functest/opnfv_tests/features/barometer.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/copper.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/doctor.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/domino.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/netready.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/odl_sfc.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/promise.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/sdnvpn.py | 7 | ||||
-rw-r--r-- | functest/opnfv_tests/features/security_scan.py | 7 |
9 files changed, 27 insertions, 36 deletions
diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py index 6207f581..cd3062cc 100644 --- a/functest/opnfv_tests/features/barometer.py +++ b/functest/opnfv_tests/features/barometer.py @@ -16,10 +16,9 @@ class BarometerCollectd(base.Feature): Class for executing barometercollectd testcase. ''' - def __init__(self, case_name='barometercollectd'): - super(BarometerCollectd, self).__init__(project='barometer', - case_name=case_name, - repo='dir_repo_barometer') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_barometer' + super(BarometerCollectd, self).__init__(**kwargs) def execute(self): return collectd.main(self.logger) diff --git a/functest/opnfv_tests/features/copper.py b/functest/opnfv_tests/features/copper.py index 5b88a499..e5c3f8bd 100644 --- a/functest/opnfv_tests/features/copper.py +++ b/functest/opnfv_tests/features/copper.py @@ -18,8 +18,7 @@ import functest.core.feature as base class Copper(base.Feature): - def __init__(self, case_name='copper-notification'): - super(Copper, self).__init__(project='copper', - case_name=case_name, - repo='dir_repo_copper') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_copper' + super(Copper, self).__init__(**kwargs) self.cmd = 'cd %s/tests && bash run.sh && cd -' % self.repo diff --git a/functest/opnfv_tests/features/doctor.py b/functest/opnfv_tests/features/doctor.py index fd181a04..3a2cc7df 100644 --- a/functest/opnfv_tests/features/doctor.py +++ b/functest/opnfv_tests/features/doctor.py @@ -17,8 +17,7 @@ import functest.core.feature as base class Doctor(base.Feature): - def __init__(self, case_name='doctor-notification'): - super(Doctor, self).__init__(project='doctor', - case_name=case_name, - repo='dir_repo_doctor') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_doctor' + super(Doctor, self).__init__(**kwargs) self.cmd = 'cd %s/tests && ./run.sh' % self.repo diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py index 1c620235..629c8d54 100644 --- a/functest/opnfv_tests/features/domino.py +++ b/functest/opnfv_tests/features/domino.py @@ -18,8 +18,7 @@ import functest.core.feature as base class Domino(base.Feature): - def __init__(self, case_name='domino-multinode'): - super(Domino, self).__init__(project='domino', - case_name=case_name, - repo='dir_repo_domino') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_domino' + super(Domino, self).__init__(**kwargs) self.cmd = 'cd %s && ./tests/run_multinode.sh' % self.repo diff --git a/functest/opnfv_tests/features/netready.py b/functest/opnfv_tests/features/netready.py index ada322c1..f7bab08b 100644 --- a/functest/opnfv_tests/features/netready.py +++ b/functest/opnfv_tests/features/netready.py @@ -13,10 +13,9 @@ import functest.core.feature as base class GluonVping(base.Feature): - def __init__(self, case_name='gluon_vping'): - super(GluonVping, self).__init__(project='netready', - case_name=case_name, - repo='dir_repo_netready') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_netready' + super(GluonVping, self).__init__(**kwargs) dir_netready_functest = '{}/test/functest'.format(self.repo) self.cmd = ('cd %s && python ./gluon-test-suite.py' % dir_netready_functest) diff --git a/functest/opnfv_tests/features/odl_sfc.py b/functest/opnfv_tests/features/odl_sfc.py index f96683e3..d4f4eb67 100644 --- a/functest/opnfv_tests/features/odl_sfc.py +++ b/functest/opnfv_tests/features/odl_sfc.py @@ -12,9 +12,8 @@ import functest.core.feature as base class OpenDaylightSFC(base.Feature): - def __init__(self, case_name='functest-odl-sfc'): - super(OpenDaylightSFC, self).__init__(project='sfc', - case_name=case_name, - repo='dir_repo_sfc') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_sfc' + super(OpenDaylightSFC, self).__init__(**kwargs) dir_sfc_functest = '{}/sfc/tests/functest'.format(self.repo) self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest diff --git a/functest/opnfv_tests/features/promise.py b/functest/opnfv_tests/features/promise.py index e3dc7fdf..49eb8a08 100644 --- a/functest/opnfv_tests/features/promise.py +++ b/functest/opnfv_tests/features/promise.py @@ -16,9 +16,8 @@ import functest.core.feature as base class Promise(base.Feature): - def __init__(self, case_name='promise'): - super(Promise, self).__init__(project='promise', - case_name=case_name, - repo='dir_repo_promise') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_promise' + super(Promise, self).__init__(**kwargs) dir_promise_functest = '{}/promise/test/functest'.format(self.repo) self.cmd = 'cd %s && python ./run_tests.py' % dir_promise_functest diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py index 5e9254a0..6a1071ff 100644 --- a/functest/opnfv_tests/features/sdnvpn.py +++ b/functest/opnfv_tests/features/sdnvpn.py @@ -12,9 +12,8 @@ import functest.core.feature as base class SdnVpnTests(base.Feature): - def __init__(self, case_name='bgpvpn'): - super(SdnVpnTests, self).__init__(project='sdnvpn', - case_name=case_name, - repo='dir_repo_sdnvpn') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_sdnvpn' + super(SdnVpnTests, self).__init__(**kwargs) dir_sfc_functest = '{}/sdnvpn/test/functest'.format(self.repo) self.cmd = 'cd %s && python ./run_tests.py' % dir_sfc_functest diff --git a/functest/opnfv_tests/features/security_scan.py b/functest/opnfv_tests/features/security_scan.py index e7256380..2ed9a823 100644 --- a/functest/opnfv_tests/features/security_scan.py +++ b/functest/opnfv_tests/features/security_scan.py @@ -13,10 +13,9 @@ from functest.utils.constants import CONST class SecurityScan(base.Feature): - def __init__(self, case_name='security_scan'): - super(SecurityScan, self).__init__(project='securityscanning', - case_name=case_name, - repo='dir_repo_securityscan') + def __init__(self, **kwargs): + kwargs["repo"] = 'dir_repo_securityscan' + super(SecurityScan, self).__init__(**kwargs) self.cmd = ('. {0}/stackrc && ' 'cd {1} && ' 'python security_scan.py --config config.ini && ' |