x/stacklight-integration-tests
Code Issues Proposed changes

Fix cluster services names for consistency with 1.0 version

Browse Source 
Change-Id: I03198e2730692e07da61a164be1ff94e52ea4fc3
This commit is contained in:
Rodion Promyshlennikov 2016-10-18 17:32:58 +03:00
parent 16b0bafa2f
commit 01bf19a44d
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
stacklight_tests/toolchain/test_functional.py
View File

@ -255,13 +255,21 @@ class TestFunctionalToolchain(api.ToolchainApi):
alerting_plugin = self.LMA_INFRASTRUCTURE_ALERTING alerting_plugin = self.LMA_INFRASTRUCTURE_ALERTING
services_names_in_nagios = {} services_names_in_nagios = {}
for service in components: services_names_in_influx = {}
nagios_service_name = ( for component in components:
service influx_service_name = component
if alerting_plugin.settings.version.startswith("0.") if alerting_plugin.settings.version.startswith("0."):
else "global-{}".format(service) nagios_service_name = component
) else:
services_names_in_nagios[service] = nagios_service_name nagios_service_name = "global-{}".format(component)
if component in ("nova", "neutron", "cinder"):
nagios_service_name = "{}-control-plane".format(
nagios_service_name)
influx_service_name = "{}-control-plane".format(
influx_service_name)
services_names_in_nagios[component] = nagios_service_name
services_names_in_influx[component] = influx_service_name
lma_devops_node = self.helpers.get_node_with_vip( lma_devops_node = self.helpers.get_node_with_vip(
self.settings.stacklight_roles, self.settings.stacklight_roles,
@ -285,7 +293,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
logger.info("Checking service {0}".format(service)) logger.info("Checking service {0}".format(service))
self.change_verify_service_state( self.change_verify_service_state(
service_name=[ service_name=[
service, component, service,
services_names_in_influx[component],
services_names_in_nagios[component], services_names_in_nagios[component],
haproxy_backend], haproxy_backend],
action="stop", action="stop",
@ -297,7 +306,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
nagios_driver=driver) nagios_driver=driver)
self.change_verify_service_state( self.change_verify_service_state(
service_name=[ service_name=[
service, component, service,
services_names_in_influx[component],
services_names_in_nagios[component], services_names_in_nagios[component],
haproxy_backend], haproxy_backend],
action="start", action="start",