From c4674818215a642600db28bcec6d458da12e9c85 Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Thu, 21 Apr 2016 10:49:11 +0000 Subject: [PATCH] Revert "Disable Murano tests" This reverts commit bc16aa02b0a5b553b4059a576da4f1ca03d7c882. Murano still available out of the box and we need to test it. Closes-Bug: #1572975 Change-Id: I2566566c5124a76e4bfff232d20a8516f45ffac2 --- fuelweb_test/tests/test_ha_one_controller.py | 1 + fuelweb_test/tests/test_services.py | 11 ++++------- .../tests_os_components/test_mixed_os_components.py | 5 +++-- .../tests_os_components/test_murano_os_component.py | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/fuelweb_test/tests/test_ha_one_controller.py b/fuelweb_test/tests/test_ha_one_controller.py index 16d31e421..a610797e9 100644 --- a/fuelweb_test/tests/test_ha_one_controller.py +++ b/fuelweb_test/tests/test_ha_one_controller.py @@ -476,6 +476,7 @@ class MultiroleMultipleServices(TestBasic): 'net_provider': 'neutron', 'net_segment_type': NEUTRON_SEGMENT['tun'], 'sahara': True, + 'murano': True, 'ceilometer': True, 'volumes_lvm': True, 'volumes_ceph': False, diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py index 475e7e55d..201a8b4fc 100644 --- a/fuelweb_test/tests/test_services.py +++ b/fuelweb_test/tests/test_services.py @@ -239,14 +239,12 @@ class SaharaHA(TestBasic): self.env.make_snapshot("deploy_sahara_ha_tun") -@test(enabled=False, - groups=["services", "services.murano", "services_ha_one_controller"]) +@test(groups=["services", "services.murano", "services_ha_one_controller"]) class MuranoHAOneController(TestBasic): """Murano HA with 1 controller tests. Don't recommend to start tests without kvm. """ - # TODO (tleontovich) Update tests with Murano Plugin - @test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_3], + @test(depends_on=[SetupEnvironment.prepare_slaves_3], groups=["deploy_murano_ha_one_controller_tun"]) @log_snapshot_after_test def deploy_murano_ha_one_controller_tun(self): @@ -324,13 +322,12 @@ class MuranoHAOneController(TestBasic): self.env.make_snapshot("deploy_murano_ha_one_controller_tun") -@test(enabled=False, groups=["services", "services.murano", "services_ha"]) +@test(groups=["services", "services.murano", "services_ha"]) class MuranoHA(TestBasic): """Murano HA tests. Don't recommend to start tests without kvm. """ - # TODO (tleontovich) Update test with Murano Plugin - @test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_5], + @test(depends_on=[SetupEnvironment.prepare_slaves_5], groups=["deploy_murano_ha_with_tun"]) @log_snapshot_after_test def deploy_murano_ha_with_tun(self): diff --git a/fuelweb_test/tests/tests_os_components/test_mixed_os_components.py b/fuelweb_test/tests/tests_os_components/test_mixed_os_components.py index cac0b2889..51cae096c 100644 --- a/fuelweb_test/tests/tests_os_components/test_mixed_os_components.py +++ b/fuelweb_test/tests/tests_os_components/test_mixed_os_components.py @@ -23,8 +23,8 @@ from fuelweb_test.tests.base_test_case import TestBasic @test(groups=["mixed_os_components", "additional_components"]) class MixedComponents(TestBasic): """MixedComponents""" # TODO documentation - # TODO (tleontovich) Update test with Murano Plugin - @test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_9], + + @test(depends_on=[SetupEnvironment.prepare_slaves_9], groups=["mixed_components_murano_sahara_ceilometer"]) @log_snapshot_after_test def mixed_components_murano_sahara_ceilometer(self): @@ -51,6 +51,7 @@ class MixedComponents(TestBasic): """ self.env.revert_snapshot('ready_with_9_slaves') + data = { 'murano': True, 'sahara': True, diff --git a/fuelweb_test/tests/tests_os_components/test_murano_os_component.py b/fuelweb_test/tests/tests_os_components/test_murano_os_component.py index 743ed4ede..adfd5b39c 100644 --- a/fuelweb_test/tests/tests_os_components/test_murano_os_component.py +++ b/fuelweb_test/tests/tests_os_components/test_murano_os_component.py @@ -20,11 +20,11 @@ from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import TestBasic -@test(enabled=False, groups=['murano_os_component', 'additional_components']) +@test(groups=['murano_os_component', 'additional_components']) class MuranoOSComponent(TestBasic): """MuranoOSComponent""" # TODO documentation - # TODO (tleontovich) Update test with Murano Plugin - @test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_9], + + @test(depends_on=[SetupEnvironment.prepare_slaves_9], groups=['murano_neutron_vlan']) @log_snapshot_after_test def murano_neutron_vlan(self):