From 01bf19a44d6d7a546cd48cc412049d8a6bfb58c8 Mon Sep 17 00:00:00 2001
From: Rodion Promyshlennikov <rpromyshlennikov@mirantis.com>
Date: Tue, 18 Oct 2016 17:32:58 +0300
Subject: [PATCH] Fix cluster services names for consistency with 1.0 version

Change-Id: I03198e2730692e07da61a164be1ff94e52ea4fc3
---
 stacklight_tests/toolchain/test_functional.py | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/stacklight_tests/toolchain/test_functional.py b/stacklight_tests/toolchain/test_functional.py
index 3204818..654a8aa 100644
--- a/stacklight_tests/toolchain/test_functional.py
+++ b/stacklight_tests/toolchain/test_functional.py
@@ -255,13 +255,21 @@ class TestFunctionalToolchain(api.ToolchainApi):
 
         alerting_plugin = self.LMA_INFRASTRUCTURE_ALERTING
         services_names_in_nagios = {}
-        for service in components:
-            nagios_service_name = (
-                service
-                if alerting_plugin.settings.version.startswith("0.")
-                else "global-{}".format(service)
-            )
-            services_names_in_nagios[service] = nagios_service_name
+        services_names_in_influx = {}
+        for component in components:
+            influx_service_name = component
+            if alerting_plugin.settings.version.startswith("0."):
+                nagios_service_name = component
+            else:
+                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(
             self.settings.stacklight_roles,
@@ -285,7 +293,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
                     logger.info("Checking service {0}".format(service))
                     self.change_verify_service_state(
                         service_name=[
-                            service, component,
+                            service,
+                            services_names_in_influx[component],
                             services_names_in_nagios[component],
                             haproxy_backend],
                         action="stop",
@@ -297,7 +306,8 @@ class TestFunctionalToolchain(api.ToolchainApi):
                         nagios_driver=driver)
                     self.change_verify_service_state(
                         service_name=[
-                            service, component,
+                            service,
+                            services_names_in_influx[component],
                             services_names_in_nagios[component],
                             haproxy_backend],
                         action="start",