diff options
| -rw-r--r--[-rwxr-xr-x] | functest/core/pytest_suite_runner.py | 0 | ||||
| -rw-r--r-- | functest/core/vnf_base.py | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | functest/opnfv_tests/openstack/vping/vping_base.py | 0 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/aaa/aaa.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/opera_ims.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_ims.py | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | functest/utils/openstack_tacker.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | requirements.txt | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | test-requirements.txt | 0 |
10 files changed, 14 insertions, 10 deletions
diff --git a/functest/core/pytest_suite_runner.py b/functest/core/pytest_suite_runner.py index 1eed92b57..1eed92b57 100755..100644 --- a/functest/core/pytest_suite_runner.py +++ b/functest/core/pytest_suite_runner.py diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py index 995204940..4d019858a 100644 --- a/functest/core/vnf_base.py +++ b/functest/core/vnf_base.py @@ -35,6 +35,7 @@ class VnfOnBoardingBase(base.TestcaseBase): self.details['orchestrator'] = {} self.details['vnf'] = {} self.details['test_vnf'] = {} + self.images = {} try: self.tenant_name = CONST.__getattribute__( 'vnf_{}_tenant_name'.format(self.case_name)) @@ -44,7 +45,7 @@ class VnfOnBoardingBase(base.TestcaseBase): raise Exception("Unknown VNF case=" + self.case_name) try: - self.tenant_images = CONST.__getattribute__( + self.images = CONST.__getattribute__( 'vnf_{}_tenant_images'.format(self.case_name)) except: self.logger.warn("No tenant image defined for this VNF") @@ -152,14 +153,15 @@ class VnfOnBoardingBase(base.TestcaseBase): self.logger.info("Update OpenStack creds informations") self.creds.update({ - "username": self.tenant_name, - "password": self.tenant_name, "tenant": self.tenant_name, }) - self.glance_client = os_utils.get_glance_client(self.creds) self.neutron_client = os_utils.get_neutron_client(self.creds) self.nova_client = os_utils.get_nova_client(self.creds) - + self.creds.update({ + "username": self.tenant_name, + "password": self.tenant_name, + }) + self.glance_client = os_utils.get_glance_client(self.creds) self.logger.info("Upload some OS images if it doesn't exist") temp_dir = os.path.join(self.data_dir, "tmp/") diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 8285d93f8..8285d93f8 100755..100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py index 8898b9fc9..f1c265f47 100644 --- a/functest/opnfv_tests/vnf/aaa/aaa.py +++ b/functest/opnfv_tests/vnf/aaa/aaa.py @@ -21,8 +21,7 @@ class AaaVnf(vnf_base.VnfOnBoardingBase): logger = ft_logger.Logger("VNF AAA").getLogger() def __init__(self): - super(AaaVnf, self).__init__() - self.case_name = "aaa" + super(AaaVnf, self).__init__(case="aaa") def deploy_orchestrator(self): self.logger.info("No VNFM needed to deploy a free radius here") diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index e584519b7..13a5af4fd 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -25,7 +25,8 @@ from orchestrator_cloudify import Orchestrator class ImsVnf(vnf_base.VnfOnBoardingBase): - def __init__(self, project='functest', case='', repo='', cmd=''): + def __init__(self, project='functest', case='cloudify_ims', + repo='', cmd=''): super(ImsVnf, self).__init__(project, case, repo, cmd) self.logger = ft_logger.Logger("vIMS").getLogger() self.case_dir = os.path.join(CONST.functest_test, 'vnf/ims/') diff --git a/functest/opnfv_tests/vnf/ims/opera_ims.py b/functest/opnfv_tests/vnf/ims/opera_ims.py index fa8f9ec98..073a56c37 100644 --- a/functest/opnfv_tests/vnf/ims/opera_ims.py +++ b/functest/opnfv_tests/vnf/ims/opera_ims.py @@ -21,7 +21,8 @@ from functest.utils.constants import CONST class ImsVnf(vnf_base.VnfOnBoardingBase): - def __init__(self, project='functest', case='', repo='', cmd=''): + def __init__(self, project='functest', case='opera_ims', + repo='', cmd=''): super(ImsVnf, self).__init__(project, case, repo, cmd) self.logger = ft_logger.Logger("vIMS").getLogger() self.case_dir = os.path.join(CONST.functest_test, 'vnf/ims/') diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py index ebd6c9baf..28f37f053 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py @@ -21,7 +21,8 @@ from functest.utils.constants import CONST class ImsVnf(vnf_base.VnfOnBoardingBase): - def __init__(self, project='functest', case='', repo='', cmd=''): + def __init__(self, project='functest', case='orchestra_ims', + repo='', cmd=''): super(ImsVnf, self).__init__(project, case, repo, cmd) self.logger = ft_logger.Logger("vIMS").getLogger() self.case_dir = os.path.join(CONST.functest_test, 'vnf/ims/') diff --git a/functest/utils/openstack_tacker.py b/functest/utils/openstack_tacker.py index f17b421e8..f17b421e8 100755..100644 --- a/functest/utils/openstack_tacker.py +++ b/functest/utils/openstack_tacker.py diff --git a/requirements.txt b/requirements.txt index 28b3fed3e..28b3fed3e 100755..100644 --- a/requirements.txt +++ b/requirements.txt diff --git a/test-requirements.txt b/test-requirements.txt index 2bf297ba8..2bf297ba8 100755..100644 --- a/test-requirements.txt +++ b/test-requirements.txt |