From 78949a3d610e2619c6f905502ea6798a20e535a8 Mon Sep 17 00:00:00 2001 From: spisarski Date: Mon, 6 Mar 2017 12:58:34 -0700 Subject: Added support for scenario-based flavor creation. As certain scenarios such as, DPDK, FDIO, and OVS use cases require special 'hw:' settings to flavors, SNAPS-OO has just implemented the ability to take in these configuration values to apply to its integration tests. This change checks the scenario and should be configuring the flavor metadata accordingly. Also see SNAPS-38 Used this as an opportunity to refactor the SNAPS test classes as well... JIRA: FUNCTEST-746 Change-Id: I63535776acde088a7461f602966a324b6207592d Signed-off-by: spisarski --- functest/opnfv_tests/openstack/snaps/health_check.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'functest/opnfv_tests/openstack/snaps/health_check.py') diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py index c19bf39c..8fece746 100644 --- a/functest/opnfv_tests/openstack/snaps/health_check.py +++ b/functest/opnfv_tests/openstack/snaps/health_check.py @@ -7,15 +7,15 @@ import unittest +from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \ + SnapsTestRunner +from functest.utils.constants import CONST + from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase from snaps.openstack.tests.create_instance_tests import SimpleHealthCheck -from functest.core.pytest_suite_runner import PyTestSuiteRunner -from functest.opnfv_tests.openstack.snaps import snaps_utils -from functest.utils.constants import CONST - -class HealthCheck(PyTestSuiteRunner): +class HealthCheck(SnapsTestRunner): """ This test executes the SNAPS Python Test case SimpleHealthCheck which creates a VM with a single port with an IPv4 address that is assigned by @@ -26,7 +26,6 @@ class HealthCheck(PyTestSuiteRunner): self.suite = unittest.TestSuite() self.case_name = "snaps_health_check" - ext_net_name = snaps_utils.get_ext_net_name() image_custom_config = None if hasattr(CONST, 'snaps_health_check'): @@ -34,6 +33,7 @@ class HealthCheck(PyTestSuiteRunner): self.suite.addTest( OSIntegrationTestCase.parameterize( - SimpleHealthCheck, CONST.openstack_creds, ext_net_name, + SimpleHealthCheck, CONST.openstack_creds, self.ext_net_name, use_keystone=CONST.snaps_use_keystone, + flavor_metadata=self.flavor_metadata, image_metadata=image_custom_config)) -- cgit 1.2.3-korg