Merge "Disable ceilometer tests"

This commit is contained in:
Jenkins 2017-03-09 12:21:54 +00:00 committed by Gerrit Code Review
commit 5bfc26dfa0
11 changed files with 64 additions and 53 deletions

View File

@ -343,7 +343,8 @@ class TestIronicDeploy(TestBasic):
self.env.make_snapshot("ironic_deploy_sahara") self.env.make_snapshot("ironic_deploy_sahara")
@test(depends_on=[SetupEnvironment.prepare_slaves_3], @test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["ironic_deploy_ceilometer"]) groups=["ironic_deploy_ceilometer"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def ironic_deploy_ceilometer(self): def ironic_deploy_ceilometer(self):
"""Deploy Ironic with Ceilometer """Deploy Ironic with Ceilometer

View File

@ -48,7 +48,7 @@ class NodeReinstallationEnv(TestBasic):
Scenario: Scenario:
1. Create a cluster 1. Create a cluster
2. Add 3 nodes with controller and mongo roles 2. Add 3 nodes with controller role
3. Add a node with compute and cinder roles 3. Add a node with compute and cinder roles
4. Deploy the cluster 4. Deploy the cluster
5. Verify that the deployment is completed successfully 5. Verify that the deployment is completed successfully
@ -61,16 +61,13 @@ class NodeReinstallationEnv(TestBasic):
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
mode=DEPLOYMENT_MODE, mode=DEPLOYMENT_MODE,
settings={
'ceilometer': True,
}
) )
self.fuel_web.update_nodes( self.fuel_web.update_nodes(
cluster_id, { cluster_id, {
'slave-01': ['controller', 'mongo'], 'slave-01': ['controller'],
'slave-02': ['controller', 'mongo'], 'slave-02': ['controller'],
'slave-03': ['controller', 'mongo'], 'slave-03': ['controller'],
'slave-04': ['compute', 'cinder'], 'slave-04': ['compute', 'cinder'],
} }
) )
@ -90,7 +87,7 @@ class NodeReinstallationEnv(TestBasic):
Scenario: Scenario:
1. Revert the snapshot 1. Revert the snapshot
2. Create a cluster 2. Create a cluster
3. Add 3 nodes with controller and mongo roles 3. Add 3 nodes with controller role
4. Add a node with compute and cinder roles 4. Add a node with compute and cinder roles
5. Provision nodes 5. Provision nodes
@ -102,16 +99,13 @@ class NodeReinstallationEnv(TestBasic):
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
mode=DEPLOYMENT_MODE, mode=DEPLOYMENT_MODE,
settings={
'ceilometer': True,
}
) )
self.fuel_web.update_nodes( self.fuel_web.update_nodes(
cluster_id, { cluster_id, {
'slave-01': ['controller', 'mongo'], 'slave-01': ['controller'],
'slave-02': ['controller', 'mongo'], 'slave-02': ['controller'],
'slave-03': ['controller', 'mongo'], 'slave-03': ['controller'],
'slave-04': ['compute', 'cinder'], 'slave-04': ['compute', 'cinder'],
} }
) )
@ -549,7 +543,8 @@ class PartitionPreservation(TestBasic):
"ip".format(vm.name, vm_floating_ip)) "ip".format(vm.name, vm_floating_ip))
@test(depends_on=[NodeReinstallationEnv.node_reinstallation_env], @test(depends_on=[NodeReinstallationEnv.node_reinstallation_env],
groups=["mongo_mysql_partition_preservation"]) groups=["mongo_mysql_partition_preservation"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def mongo_mysql_partition_preservation(self): def mongo_mysql_partition_preservation(self):
"""Verify partition preservation of Ceilometer and mysql data. """Verify partition preservation of Ceilometer and mysql data.

View File

@ -477,7 +477,8 @@ class OSTFCeilometerHelper(TestBasic):
class CeilometerHAOneControllerMongo(OSTFCeilometerHelper): class CeilometerHAOneControllerMongo(OSTFCeilometerHelper):
@test(depends_on=[SetupEnvironment.prepare_slaves_3], @test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["deploy_ceilometer_ha_one_controller_with_mongo"]) groups=["deploy_ceilometer_ha_one_controller_with_mongo"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_ceilometer_ha_one_controller_with_mongo(self): def deploy_ceilometer_ha_one_controller_with_mongo(self):
"""Deploy cluster in HA mode with Ceilometer """Deploy cluster in HA mode with Ceilometer
@ -562,7 +563,8 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper):
"deploy_ceilometer_ha_one_controller_with_mongo") "deploy_ceilometer_ha_one_controller_with_mongo")
@test(depends_on=[SetupEnvironment.prepare_slaves_3], @test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["deploy_ceilometer_ha_one_controller_multirole"]) groups=["deploy_ceilometer_ha_one_controller_multirole"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_ceilometer_ha_one_controller_multirole(self): def deploy_ceilometer_ha_one_controller_multirole(self):
"""Deploy cluster in ha multirole mode with Ceilometer """Deploy cluster in ha multirole mode with Ceilometer
@ -613,7 +615,8 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper):
@test(groups=["services", "services.ceilometer", "services_ha.ceilometer"]) @test(groups=["services", "services.ceilometer", "services_ha.ceilometer"])
class CeilometerHAMongo(OSTFCeilometerHelper): class CeilometerHAMongo(OSTFCeilometerHelper):
@test(depends_on=[SetupEnvironment.prepare_slaves_5], @test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_ceilometer_ha_with_mongo"]) groups=["deploy_ceilometer_ha_with_mongo"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_ceilometer_ha_with_mongo(self): def deploy_ceilometer_ha_with_mongo(self):
"""Deploy cluster in ha mode with Ceilometer """Deploy cluster in ha mode with Ceilometer
@ -669,7 +672,8 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
self.env.make_snapshot("deploy_ceilometer_ha_with_mongo") self.env.make_snapshot("deploy_ceilometer_ha_with_mongo")
@test(depends_on=[SetupEnvironment.prepare_slaves_5], @test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_ceilometer_ha_multirole"]) groups=["deploy_ceilometer_ha_multirole"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_ceilometer_ha_multirole(self): def deploy_ceilometer_ha_multirole(self):
"""Deploy cluster in ha multirole mode with Ceilometer """Deploy cluster in ha multirole mode with Ceilometer
@ -720,7 +724,8 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
self.env.make_snapshot("deploy_ceilometer_ha_multirole", is_make=True) self.env.make_snapshot("deploy_ceilometer_ha_multirole", is_make=True)
@test(depends_on=[deploy_ceilometer_ha_multirole], @test(depends_on=[deploy_ceilometer_ha_multirole],
groups=["ceilometer_ha_multirole_add_mongo"]) groups=["ceilometer_ha_multirole_add_mongo"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def ceilometer_ha_multirole_add_mongo(self): def ceilometer_ha_multirole_add_mongo(self):
"""Add mongo node to cluster with HA mode and Ceilometer """Add mongo node to cluster with HA mode and Ceilometer
@ -750,7 +755,8 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
self.env.make_snapshot("ceilometer_ha_multirole_add_mongo") self.env.make_snapshot("ceilometer_ha_multirole_add_mongo")
@test(depends_on=[SetupEnvironment.prepare_slaves_5], @test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_ceilometer_ha_with_external_mongo"]) groups=["deploy_ceilometer_ha_with_external_mongo"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_ceilometer_ha_with_external_mongo(self): def deploy_ceilometer_ha_with_external_mongo(self):
"""Deploy cluster in ha mode with Ceilometer and external Mongo """Deploy cluster in ha mode with Ceilometer and external Mongo
@ -821,7 +827,8 @@ class HeatHAOneController(TestBasic):
Don't recommend to start tests without kvm Don't recommend to start tests without kvm
""" """
@test(depends_on=[SetupEnvironment.prepare_slaves_3], @test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["deploy_heat_ha_one_controller_neutron"]) groups=["deploy_heat_ha_one_controller_neutron"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_heat_ha_one_controller_neutron(self): def deploy_heat_ha_one_controller_neutron(self):
"""Deploy Heat cluster in HA mode with Neutron VXLAN """Deploy Heat cluster in HA mode with Neutron VXLAN
@ -910,7 +917,8 @@ class HeatHA(TestBasic):
Don't recommend to start tests without kvm Don't recommend to start tests without kvm
""" """
@test(depends_on=[SetupEnvironment.prepare_slaves_5], @test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_heat_ha"]) groups=["deploy_heat_ha"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_heat_ha(self): def deploy_heat_ha(self):
"""Deploy Heat cluster in HA mode """Deploy Heat cluster in HA mode

View File

@ -66,7 +66,7 @@ class TestUseMirror(TestBasic):
Scenario: Scenario:
1. Create cluster with neutron networking 1. Create cluster with neutron networking
2. Add 3 nodes with controller, ceph-osd roles 2. Add 3 nodes with controller, ceph-osd roles
3. Add 1 node with cinder, mongo roles 3. Add 1 node with cinder role
4. Add 1 node with compute role 4. Add 1 node with compute role
5. Fix fuel-mirror config according to cluster repos 5. Fix fuel-mirror config according to cluster repos
6. Run create command for Ubuntu mirrors 6. Run create command for Ubuntu mirrors
@ -94,7 +94,6 @@ class TestUseMirror(TestBasic):
"net_provider": 'neutron', "net_provider": 'neutron',
"net_segment_type": NEUTRON_SEGMENT['tun'], "net_segment_type": NEUTRON_SEGMENT['tun'],
'sahara': True, 'sahara': True,
'ceilometer': True,
'volumes_lvm': True, 'volumes_lvm': True,
'volumes_ceph': False, 'volumes_ceph': False,
'images_ceph': True 'images_ceph': True
@ -110,7 +109,7 @@ class TestUseMirror(TestBasic):
'slave-01': ['controller', 'ceph-osd'], 'slave-01': ['controller', 'ceph-osd'],
'slave-02': ['controller', 'ceph-osd'], 'slave-02': ['controller', 'ceph-osd'],
'slave-03': ['controller', 'ceph-osd'], 'slave-03': ['controller', 'ceph-osd'],
'slave-04': ['cinder', 'mongo'], 'slave-04': ['cinder'],
'slave-05': ['compute'] 'slave-05': ['compute']
} }
) )

View File

@ -26,7 +26,8 @@ class MongoMultirole(TestBasic):
"""MongoMultirole""" # TODO documentation """MongoMultirole""" # TODO documentation
@test(depends_on=[SetupEnvironment.prepare_slaves_9], @test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=['ha_ceilometer_untag_network']) groups=['ha_ceilometer_untag_network'],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def ha_ceilometer_untag_network(self): def ha_ceilometer_untag_network(self):
"""Deployment with 3 controllers, NeutronVLAN and untag network, """Deployment with 3 controllers, NeutronVLAN and untag network,
@ -118,7 +119,8 @@ class MongoMultirole(TestBasic):
self.env.make_snapshot('ha_ceilometer_untag_network') self.env.make_snapshot('ha_ceilometer_untag_network')
@test(depends_on=[SetupEnvironment.prepare_slaves_9], @test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=['mongo_ceph_with_ceilometer']) groups=['mongo_ceph_with_ceilometer'],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def mongo_ceph_with_ceilometer(self): def mongo_ceph_with_ceilometer(self):
"""Deployment with 3 controlelrs, NeutronVLAN, with Ceph, """Deployment with 3 controlelrs, NeutronVLAN, with Ceph,

View File

@ -25,7 +25,8 @@ class MixedComponents(TestBasic):
"""MixedComponents""" # TODO documentation """MixedComponents""" # TODO documentation
@test(depends_on=[SetupEnvironment.prepare_slaves_9], @test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["mixed_components_murano_sahara_ceilometer"]) groups=["mixed_components_murano_sahara_ceilometer"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def mixed_components_murano_sahara_ceilometer(self): def mixed_components_murano_sahara_ceilometer(self):
"""Deployment with 3 controllers, NeutronTUN, with Murano, """Deployment with 3 controllers, NeutronTUN, with Murano,

View File

@ -243,7 +243,8 @@ class TestsDeployPlatformComponents(BaseDeployPlatformComponents):
self._deploy_and_check(cluster_id=cluster_id) self._deploy_and_check(cluster_id=cluster_id)
@test(depends_on=[SetupEnvironment.prepare_slaves_9], @test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["acceptance_deploy_platform_components_ceilometer"]) groups=["acceptance_deploy_platform_components_ceilometer"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def acceptance_deploy_platform_components_ceilometer(self): def acceptance_deploy_platform_components_ceilometer(self):
"""Deploy cluster with detached keystone, rabbitmq, """Deploy cluster with detached keystone, rabbitmq,

View File

@ -43,7 +43,7 @@ class CICMaintenanceMode(TestBasic):
Scenario: Scenario:
1. Create cluster 1. Create cluster
2. Add 3 node with controller and mongo roles 2. Add 3 node with controller role
3. Add 2 node with compute and cinder roles 3. Add 2 node with compute and cinder roles
4. Deploy the cluster 4. Deploy the cluster
@ -51,21 +51,17 @@ class CICMaintenanceMode(TestBasic):
""" """
self.check_run('cic_maintenance_mode') self.check_run('cic_maintenance_mode')
self.env.revert_snapshot("ready_with_5_slaves") self.env.revert_snapshot("ready_with_5_slaves")
data = {
'ceilometer': True,
}
cluster_id = self.fuel_web.create_cluster( cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__, name=self.__class__.__name__,
mode=settings.DEPLOYMENT_MODE_HA, mode=settings.DEPLOYMENT_MODE_HA)
settings=data)
self.fuel_web.update_nodes( self.fuel_web.update_nodes(
cluster_id, cluster_id,
{ {
'slave-01': ['controller', 'mongo'], 'slave-01': ['controller'],
'slave-02': ['controller', 'mongo'], 'slave-02': ['controller'],
'slave-03': ['controller', 'mongo'], 'slave-03': ['controller'],
'slave-04': ['compute', 'cinder'], 'slave-04': ['compute', 'cinder'],
'slave-05': ['compute', 'cinder'] 'slave-05': ['compute', 'cinder']
} }

View File

@ -22,12 +22,14 @@ from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.tests.base_test_case import TestBasic from fuelweb_test.tests.base_test_case import TestBasic
@test(groups=['failover_group_mongo']) @test(groups=['failover_group_mongo'],
enabled=False)
class FailoverGroupMongo(TestBasic): class FailoverGroupMongo(TestBasic):
""" FailoverGroupMongo """ # TODO documentation """ FailoverGroupMongo """ # TODO documentation
@test(depends_on_groups=["prepare_slaves_9"], @test(depends_on_groups=["prepare_slaves_9"],
groups=['deploy_mongo_cluster']) groups=['deploy_mongo_cluster'],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def deploy_mongo_cluster(self): def deploy_mongo_cluster(self):
"""Deploy cluster with MongoDB nodes """Deploy cluster with MongoDB nodes
@ -92,7 +94,8 @@ class FailoverGroupMongo(TestBasic):
self.env.make_snapshot('deploy_mongo_cluster', is_make=True) self.env.make_snapshot('deploy_mongo_cluster', is_make=True)
@test(depends_on_groups=["deploy_mongo_cluster"], @test(depends_on_groups=["deploy_mongo_cluster"],
groups=['kill_mongo_processes']) groups=['kill_mongo_processes'],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def kill_mongo_processes(self): def kill_mongo_processes(self):
"""Kill mongo processes """Kill mongo processes
@ -152,7 +155,8 @@ class FailoverGroupMongo(TestBasic):
self.env.make_snapshot('kill_mongo_processes') self.env.make_snapshot('kill_mongo_processes')
@test(depends_on_groups=['deploy_mongo_cluster'], @test(depends_on_groups=['deploy_mongo_cluster'],
groups=['close_connections_for_mongo']) groups=['close_connections_for_mongo'],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def close_connections_for_mongo(self): def close_connections_for_mongo(self):
"""Close connection for Mongo node """Close connection for Mongo node
@ -191,7 +195,8 @@ class FailoverGroupMongo(TestBasic):
self.env.make_snapshot('close_connections_for_mongo') self.env.make_snapshot('close_connections_for_mongo')
@test(depends_on_groups=['deploy_mongo_cluster'], @test(depends_on_groups=['deploy_mongo_cluster'],
groups=['shut_down_mongo_node']) groups=['shut_down_mongo_node'],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def shut_down_mongo_node(self): def shut_down_mongo_node(self):
"""Shut down Mongo node for Neutron """Shut down Mongo node for Neutron

View File

@ -27,7 +27,8 @@ class HugeEnvironments(base_test_case.TestBasic):
"""HugeEnvironments.""" # TODO documentation """HugeEnvironments.""" # TODO documentation
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9], @test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9],
groups=["nine_nodes_mixed"]) groups=["nine_nodes_mixed"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def nine_nodes_mixed(self): def nine_nodes_mixed(self):
"""Deploy cluster with mixed roles on 9 nodes in HA mode """Deploy cluster with mixed roles on 9 nodes in HA mode
@ -97,7 +98,7 @@ class HugeEnvironments(base_test_case.TestBasic):
3. Add 2 nodes as compute 3. Add 2 nodes as compute
4. Add 1 node as cinder and 1 as mongo 4. Add 1 node as cinder and 1 as mongo
5. Add 2 nodes as ceph 5. Add 2 nodes as ceph
6. Turn on Sahara and Ceilometer 6. Turn on Sahara
7. Verify network 7. Verify network
8. Deploy the cluster 8. Deploy the cluster
9. Check networks and OSTF 9. Check networks and OSTF
@ -115,8 +116,7 @@ class HugeEnvironments(base_test_case.TestBasic):
'images_ceph': False, 'images_ceph': False,
'volumes_lvm': False, 'volumes_lvm': False,
'osd_pool_size': '2', 'osd_pool_size': '2',
'sahara': True, 'sahara': True
'ceilometer': True
} }
) )
self.fuel_web.update_nodes( self.fuel_web.update_nodes(
@ -128,7 +128,7 @@ class HugeEnvironments(base_test_case.TestBasic):
'slave-04': ['compute'], 'slave-04': ['compute'],
'slave-05': ['compute'], 'slave-05': ['compute'],
'slave-06': ['cinder'], 'slave-06': ['cinder'],
'slave-07': ['mongo'], 'slave-07': ['cinder'],
'slave-08': ['ceph-osd'], 'slave-08': ['ceph-osd'],
'slave-09': ['ceph-osd'], 'slave-09': ['ceph-osd'],
} }
@ -153,7 +153,8 @@ class HugeEnvironments(base_test_case.TestBasic):
class HugeHaNeutron(base_test_case.TestBasic): class HugeHaNeutron(base_test_case.TestBasic):
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9], @test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9],
groups=["huge_ha_neutron_tun_ceph_ceilometer_rados"]) groups=["huge_ha_neutron_tun_ceph_ceilometer_rados"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def huge_ha_neutron_tun_ceph_ceilometer_rados(self): def huge_ha_neutron_tun_ceph_ceilometer_rados(self):
"""Deploy cluster in HA mode with Neutron VXLAN, RadosGW """Deploy cluster in HA mode with Neutron VXLAN, RadosGW
@ -239,7 +240,8 @@ class HugeHaNeutron(base_test_case.TestBasic):
test_name=test_name, timeout=60 * 20) test_name=test_name, timeout=60 * 20)
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9], @test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9],
groups=["huge_ha_neutron_vlan_ceph_ceilometer_rados"]) groups=["huge_ha_neutron_vlan_ceph_ceilometer_rados"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def huge_ha_neutron_vlan_ceph_ceilometer_rados(self): def huge_ha_neutron_vlan_ceph_ceilometer_rados(self):
"""Deploy cluster with separate roles in HA mode """Deploy cluster with separate roles in HA mode

View File

@ -227,7 +227,8 @@ class UCATest(TestBasic):
self.fuel_web.run_ostf(cluster_id=cluster_id) self.fuel_web.run_ostf(cluster_id=cluster_id)
@test(depends_on=[SetupEnvironment.prepare_slaves_9], @test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["uca_vlan_mongo"]) groups=["uca_vlan_mongo"],
enabled=False)
@log_snapshot_after_test @log_snapshot_after_test
def uca_vlan_mongo(self): def uca_vlan_mongo(self):
"""Deploy cluster with NeutronVlan, Ceilometer and UCA repo """Deploy cluster with NeutronVlan, Ceilometer and UCA repo