From 8d8eedcdba96cfc5afc0ecaf810ec58d4c636eb8 Mon Sep 17 00:00:00 2001 From: Yaroslav Lobankov Date: Wed, 6 Aug 2014 15:34:02 +0400 Subject: [PATCH] Missed renaming for Sahara system tests We can still see the word "savanna" in the names of variables, methods and classes in system tests for Sahara. This fact causes errors when running OSTF tests because all variables, methods and classes have been renamed in OSTF tests for Sahara. In addition, variable SERVTEST_SAVANNA_SERVER_URL has been removed because there is no code fragment where this variable is used. Closes-Bug: #1353433 Change-Id: Ia414f9f5bbb0a5efbab537f7f2a1b381dc7387ca --- fuelweb_test/ostf_test_mapping.py | 6 +++--- fuelweb_test/settings.py | 13 ++++++------- fuelweb_test/tests/test_services.py | 18 +++++++++--------- .../tests_strength/test_huge_environments.py | 4 ++-- fuelweb_ui_test/pageobjects/environments.py | 2 +- fuelweb_ui_test/pageobjects/settings.py | 2 +- fuelweb_ui_test/tests/test_env_settings.py | 12 ++++++------ fuelweb_ui_test/tests/test_env_wizard.py | 12 ++++++------ fuelweb_ui_test/tests/test_environment.py | 12 ++++++------ utils/pairwise_testcases.py | 4 ++-- 10 files changed, 42 insertions(+), 43 deletions(-) diff --git a/fuelweb_test/ostf_test_mapping.py b/fuelweb_test/ostf_test_mapping.py index d86e02c57..444c38057 100644 --- a/fuelweb_test/ostf_test_mapping.py +++ b/fuelweb_test/ostf_test_mapping.py @@ -79,10 +79,10 @@ OSTF_TEST_MAPPING = { 'Request list of networks': 'fuel_health.tests.sanity.' 'test_sanity_networking.NetworksTest.' 'test_list_networks', - 'Savanna tests to create/list/delete node' + 'Sahara tests to create/list/delete node' ' group and cluster templates': 'fuel_health.tests.sanity.' - 'test_sanity_savanna.' - 'SanitySavannaTests.test_sanity_savanna', + 'test_sanity_sahara.' + 'SanitySaharaTests.test_sanity_sahara', 'Create instance flavor': 'fuel_health.tests.smoke.test_create_flavor.' 'FlavorsAdminTest.test_create_flavor', 'Create volume and attach it to instance': 'fuel_health.tests.smoke.' diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py index 7cbc52630..ab829536d 100644 --- a/fuelweb_test/settings.py +++ b/fuelweb_test/settings.py @@ -175,13 +175,12 @@ SERVTEST_LOCAL_PATH = os.environ.get('SERVTEST_LOCAL_PATH', '/tmp') SERVTEST_USERNAME = os.environ.get('SERVTEST_USERNAME', 'admin') SERVTEST_PASSWORD = os.environ.get('SERVTEST_PASSWORD', SERVTEST_USERNAME) SERVTEST_TENANT = os.environ.get('SERVTEST_TENANT', SERVTEST_USERNAME) -SERVTEST_SAVANNA_SERVER_URL = 'http://savanna-files.mirantis.com' -SERVTEST_SAVANNA_IMAGE = 'savanna-0.3-vanilla-1.2.1-ubuntu-13.04.qcow2' -SERVTEST_SAVANNA_IMAGE_NAME = 'sahara' -SERVTEST_SAVANNA_IMAGE_MD5 = '9ab37ec9a13bb005639331c4275a308d' -SERVTEST_SAVANNA_IMAGE_META = {'_sahara_tag_1.2.1': 'True', - '_sahara_tag_vanilla': 'True', - '_sahara_username': 'ubuntu'} +SERVTEST_SAHARA_IMAGE = 'savanna-0.3-vanilla-1.2.1-ubuntu-13.04.qcow2' +SERVTEST_SAHARA_IMAGE_NAME = 'sahara' +SERVTEST_SAHARA_IMAGE_MD5 = '9ab37ec9a13bb005639331c4275a308d' +SERVTEST_SAHARA_IMAGE_META = {'_sahara_tag_1.2.1': 'True', + '_sahara_tag_vanilla': 'True', + '_sahara_username': 'ubuntu'} SERVTEST_MURANO_IMAGE = "cloud-fedora.qcow2" SERVTEST_MURANO_IMAGE_MD5 = '6e5e2f149c54b898b3c272f11ae31125' diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py index 7cf4d2b55..25a736ff3 100644 --- a/fuelweb_test/tests/test_services.py +++ b/fuelweb_test/tests/test_services.py @@ -59,8 +59,8 @@ class SaharaSimple(TestBasic): LOGGER.debug('Check MD5 of image') check_image = checkers.check_image( - settings.SERVTEST_SAVANNA_IMAGE, - settings.SERVTEST_SAVANNA_IMAGE_MD5, + settings.SERVTEST_SAHARA_IMAGE, + settings.SERVTEST_SAHARA_IMAGE_MD5, settings.SERVTEST_LOCAL_PATH) asserts.assert_true(check_image) @@ -98,8 +98,8 @@ class SaharaSimple(TestBasic): common_func = Common(controller['ip'], data['user'], data['password'], data['tenant']) - test_classes = ['fuel_health.tests.sanity.test_sanity_savanna.' - 'SanitySavannaTests.test_sanity_savanna'] + test_classes = ['fuel_health.tests.sanity.test_sanity_sahara.' + 'SanitySaharaTests.test_sanity_sahara'] self.fuel_web.run_ostf( cluster_id=self.fuel_web.get_last_created_cluster(), tests_must_be_passed=test_classes @@ -108,9 +108,9 @@ class SaharaSimple(TestBasic): LOGGER.debug('Import image') common_func.image_import( settings.SERVTEST_LOCAL_PATH, - settings.SERVTEST_SAVANNA_IMAGE, - settings.SERVTEST_SAVANNA_IMAGE_NAME, - settings.SERVTEST_SAVANNA_IMAGE_META) + settings.SERVTEST_SAHARA_IMAGE, + settings.SERVTEST_SAHARA_IMAGE_NAME, + settings.SERVTEST_SAHARA_IMAGE_META) common_func.goodbye_security() @@ -119,8 +119,8 @@ class SaharaSimple(TestBasic): self.fuel_web.run_single_ostf_test( cluster_id=cluster_id, test_sets=['platform_tests'], test_name=('fuel_health.tests.platform_tests.' - 'test_platform_savanna.PlatformSavannaTests.' - 'test_platform_savanna'), timeout=60 * 200) + 'test_platform_sahara.PlatformSaharaTests.' + 'test_platform_sahara'), timeout=60 * 200) self.env.make_snapshot("deploy_sahara_simple") diff --git a/fuelweb_test/tests/tests_strength/test_huge_environments.py b/fuelweb_test/tests/tests_strength/test_huge_environments.py index 0d49d6c89..45fd6e7d4 100644 --- a/fuelweb_test/tests/tests_strength/test_huge_environments.py +++ b/fuelweb_test/tests/tests_strength/test_huge_environments.py @@ -32,7 +32,7 @@ class HugeEnvironments(base_test_case.TestBasic): 1. Create cluster 2. Add 4 nodes as controllers with ceph OSD roles 3. Add 5 nodes as compute with ceph OSD and mongo roles - 4. Turn on Savanna and Ceilometer + 4. Turn on Sahara and Ceilometer 5. Deploy the cluster 6. Check networks and OSTF @@ -90,7 +90,7 @@ class HugeEnvironments(base_test_case.TestBasic): 3. Add 2 nodes as compute 4. Add 1 node as cinder and 1 as mongo 5. Add 2 nodes as ceph - 6. Turn on Savanna and Ceilometer + 6. Turn on Sahara and Ceilometer 7. Deploy the cluster 8. Check networks and OSTF diff --git a/fuelweb_ui_test/pageobjects/environments.py b/fuelweb_ui_test/pageobjects/environments.py index 6df6fecff..e79e7817d 100644 --- a/fuelweb_ui_test/pageobjects/environments.py +++ b/fuelweb_ui_test/pageobjects/environments.py @@ -142,7 +142,7 @@ class Wizard(Popup, RedhatAccountPopup): self.XPATH_RADIO.format('glance', 'ceph')) @property - def install_savanna(self): + def install_sahara(self): return self.parent.\ find_element_by_xpath( self.XPATH_CHECKBOX.format('sahara')) diff --git a/fuelweb_ui_test/pageobjects/settings.py b/fuelweb_ui_test/pageobjects/settings.py index af6a3857d..16b691884 100644 --- a/fuelweb_ui_test/pageobjects/settings.py +++ b/fuelweb_ui_test/pageobjects/settings.py @@ -60,7 +60,7 @@ class Settings(PageObject, SettingsFooter): return self.parent.find_element_by_name('access.email') @property - def install_savanna(self): + def install_sahara(self): return self.parent.\ find_element_by_xpath(self.XPATH_CHECKBOX.format ('additional_components.sahara')) diff --git a/fuelweb_ui_test/tests/test_env_settings.py b/fuelweb_ui_test/tests/test_env_settings.py index 010277443..a7143e852 100644 --- a/fuelweb_ui_test/tests/test_env_settings.py +++ b/fuelweb_ui_test/tests/test_env_settings.py @@ -170,17 +170,17 @@ class TestAccess(BaseClass): class TestAdditionalComponents(BaseClass): - def test_savanna(self): - """Install Savanna component + def test_sahara(self): + """Install Sahara component Scenario: - 1. Click on Install Savanna checkbox + 1. Click on Install Sahara checkbox 2. Save settings - 3. Verify that Install Savanna checkbox is selected + 3. Verify that Install Sahara checkbox is selected 4. Click Load defaults - 5. Verify that Install Savanna checkbox is not selected + 5. Verify that Install Sahara checkbox is not selected """ - self._test_tumbler_field('install_savanna') + self._test_tumbler_field('install_sahara') def test_murano(self): """Install Murano component diff --git a/fuelweb_ui_test/tests/test_env_wizard.py b/fuelweb_ui_test/tests/test_env_wizard.py index 80926f14b..6e32a8d1e 100644 --- a/fuelweb_ui_test/tests/test_env_wizard.py +++ b/fuelweb_ui_test/tests/test_env_wizard.py @@ -275,7 +275,7 @@ class TestEnvWizard(BaseTestCase): click next three times 3. Select Neutron with GRE network 4. Click next two times - 5. Select install Savanna, Murano, Ceilometer + 5. Select install Sahara, Murano, Ceilometer 6. Click next and previous button 7. Verify checkboxes are selected """ @@ -288,12 +288,12 @@ class TestEnvWizard(BaseTestCase): w.network_neutron_gre.click() w.next.click() w.next.click() - w.install_savanna.click() + w.install_sahara.click() w.install_murano.click() w.install_ceilometer.click() w.next.click() w.prev.click() - self.assertTrue(w.install_savanna. + self.assertTrue(w.install_sahara. find_element_by_tag_name('input').is_selected()) self.assertTrue(w.install_murano. find_element_by_tag_name('input').is_selected()) @@ -310,7 +310,7 @@ class TestEnvWizard(BaseTestCase): 4. Select KVM hypervisor and click next 5. Select Neutron with GRE and click next 6. Select Ceph options for Cinder and Glance and click next - 7. Select install Savanna, Murano and click next + 7. Select install Sahara, Murano and click next 8. Click cancel button 9. Click create environment again and check that all default values are selected @@ -328,7 +328,7 @@ class TestEnvWizard(BaseTestCase): w.storage_cinder_ceph.click() w.storage_glance_ceph.click() w.next.click() - w.install_savanna.click() + w.install_sahara.click() w.install_murano.click() w.next.click() w.cancel.click() @@ -355,7 +355,7 @@ class TestEnvWizard(BaseTestCase): self.assertTrue(w.storage_glance_default. find_element_by_tag_name('input').is_selected()) w.next.click() - self.assertFalse(w.install_savanna. + self.assertFalse(w.install_sahara. find_element_by_tag_name('input').is_selected()) self.assertFalse(w.install_murano. find_element_by_tag_name('input').is_selected()) diff --git a/fuelweb_ui_test/tests/test_environment.py b/fuelweb_ui_test/tests/test_environment.py index c0351ba2d..1399f053f 100644 --- a/fuelweb_ui_test/tests/test_environment.py +++ b/fuelweb_ui_test/tests/test_environment.py @@ -63,7 +63,7 @@ class TestEnvironment(BaseTestCase): find_element_by_tag_name('input').is_selected()) Tabs().settings.click() with Settings() as s: - self.assertFalse(s.install_savanna. + self.assertFalse(s.install_sahara. find_element_by_tag_name('input').is_selected()) self.assertFalse(s.install_murano. find_element_by_tag_name('input').is_selected()) @@ -227,14 +227,14 @@ class TestEnvironment(BaseTestCase): find_element_by_tag_name('input').is_selected()) def test_services(self): - """Create environment with Savanna, Murano, Ceilometer selected + """Create environment with Sahara, Murano, Ceilometer selected Scenario: - 1. Create environment with Install Savanna, + 1. Create environment with Install Sahara, Murano, Ceilometer selected 2. Click on created environment 3. Open settings tab - 4. Verify that Install Savanna, Murano, + 4. Verify that Install Sahara, Murano, Ceilometer checkboxes are selected """ with Wizard() as w: @@ -245,7 +245,7 @@ class TestEnvironment(BaseTestCase): w.network_neutron_gre.click() w.next.click() w.next.click() - w.install_savanna.click() + w.install_sahara.click() w.install_murano.click() w.install_ceilometer.click() w.next.click() @@ -257,7 +257,7 @@ class TestEnvironment(BaseTestCase): Tabs().settings.click() with Settings() as s: - self.assertTrue(s.install_savanna. + self.assertTrue(s.install_sahara. find_element_by_tag_name('input').is_selected()) self.assertTrue(s.install_murano. find_element_by_tag_name('input').is_selected()) diff --git a/utils/pairwise_testcases.py b/utils/pairwise_testcases.py index dfe7fb380..71e2b6708 100644 --- a/utils/pairwise_testcases.py +++ b/utils/pairwise_testcases.py @@ -27,7 +27,7 @@ parameters = [ ("tagging", ["yes", "no"]), ("storage volume", ["default", "ceph"]), ("storage images", ["default", "ceph"]), - ("savanna", ["yes", "no"]), + ("sahara", ["yes", "no"]), ("murano", ["yes", "no"]), ("ceilometer", ["yes", "no"]) ] @@ -47,7 +47,7 @@ def is_valid_combination(values, names): rules = [ lambda d: "RedHat" == d["os"] and "ceph" == d["storage volume"], lambda d: "RedHat" == d["os"] and "ceph" == d["storage images"], - lambda d: "RedHat" == d["os"] and "yes" == d["savanna"], + lambda d: "RedHat" == d["os"] and "yes" == d["sahara"], lambda d: "RedHat" == d["os"] and "yes" == d["murano"], lambda d: "RedHat" == d["os"] and "neutron GRE" == d["network"], lambda d: "RedHat" == d["os"] and "neutron VLAN" == d["network"],