openstack
/
fuel-qa
Code Issues Proposed changes

Refactoring Ceilometer SWARM tests to use neutron network manager 

Currently, system tests for Ceilometer are launched with only
nova-network configuration. Need to change network manager 
to neutron for Ceilometer SWARM test cases because nova-network 
tests should be disabled in SWARM

Change-Id: I6fe69ff665615557e04a6309eaf5d1674182031e
Closes-bug: #1460994
This commit is contained in:
vgusev 2015-06-02 13:55:02 +03:00 committed by Vitaly Gusev
parent a40ab529e0
commit 5f9040a695
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fuelweb_test/tests/test_services.py
View File

@ -500,6 +500,8 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper):
mode=settings.DEPLOYMENT_MODE,
settings={
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'tun',
'tenant': 'ceilometerSimple',
'user': 'ceilometerSimple',
'password': 'ceilometerSimple'
@ -578,7 +580,9 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper):
name=self.__class__.__name__,
mode=settings.DEPLOYMENT_MODE,
settings={
'ceilometer': True
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'tun',
}
)
self.fuel_web.update_nodes(
@ -597,7 +601,7 @@ class CeilometerHAOneControllerMongo(OSTFCeilometerHelper):
service_name='ceilometer-api')
self.run_tests(cluster_id)
self.env.make_snapshot("deploy_ceilometer_ha_one_controller_mulirole")
self.env.make_snapshot("deploy_ceilometer_ha_one_controller_multirole")
@test(groups=["services", "services.ceilometer", "services_ha.ceilometer"])
@ -629,6 +633,8 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
mode=settings.DEPLOYMENT_MODE,
settings={
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'tun',
'tenant': 'ceilometerHA',
'user': 'ceilometerHA',
'password': 'ceilometerHA'
@ -680,7 +686,9 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
name=self.__class__.__name__,
mode=settings.DEPLOYMENT_MODE,
settings={
'ceilometer': True
'ceilometer': True,
'net_provider': 'neutron',
'net_segment_type': 'tun',
}
)
self.fuel_web.update_nodes(
@ -701,7 +709,7 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
service_name='ceilometer-api')
self.run_tests(cluster_id)
self.env.make_snapshot("deploy_ceilometer_ha_mulirole")
self.env.make_snapshot("deploy_ceilometer_ha_multirole")
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_ceilometer_ha_with_external_mongo"])
@ -733,6 +741,8 @@ class CeilometerHAMongo(OSTFCeilometerHelper):
'tenant': 'ceilometerHA',
'user': 'ceilometerHA',
'password': 'ceilometerHA',
'net_provider': 'neutron',
'net_segment_type': 'tun',
'volumes_ceph': True,
'images_ceph': True,
'volumes_lvm': False,