From 86a185129aee0879ccb46da0b66accf85a098211 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 13 Jun 2016 17:53:54 +0200 Subject: [PATCH] s/add_node_to_cluster/add_nodes_to_cluster/ Change-Id: I43b920f56c589a0ebd29b8b6afe9dcf94b4d429c --- stacklight_tests/elasticsearch_kibana/test_system.py | 6 +++--- stacklight_tests/helpers/helpers.py | 2 +- stacklight_tests/influxdb_grafana/test_system.py | 6 +++--- stacklight_tests/lma_infrastructure_alerting/test_system.py | 6 +++--- stacklight_tests/toolchain/test_system.py | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stacklight_tests/elasticsearch_kibana/test_system.py b/stacklight_tests/elasticsearch_kibana/test_system.py index 25296da..1bd452b 100644 --- a/stacklight_tests/elasticsearch_kibana/test_system.py +++ b/stacklight_tests/elasticsearch_kibana/test_system.py @@ -55,7 +55,7 @@ class TestNodesElasticsearchPlugin(api.ElasticsearchPluginApi): self.helpers.run_ostf(should_fail=1) # Add a controller - self.helpers.add_node_to_cluster(target_node) + self.helpers.add_nodes_to_cluster(target_node) self.check_plugin_online() @@ -94,7 +94,7 @@ class TestNodesElasticsearchPlugin(api.ElasticsearchPluginApi): self.helpers.run_ostf(should_fail=1) # Add a compute node - self.helpers.add_node_to_cluster(target_node) + self.helpers.add_nodes_to_cluster(target_node) self.check_plugin_online() @@ -137,7 +137,7 @@ class TestNodesElasticsearchPlugin(api.ElasticsearchPluginApi): self.fuel_web.run_ostf() # Add an Elasticsearch-Kibana node - self.helpers.add_node_to_cluster(target_node) + self.helpers.add_nodes_to_cluster(target_node) self.check_plugin_online() diff --git a/stacklight_tests/helpers/helpers.py b/stacklight_tests/helpers/helpers.py index 28b0c94..75a0010 100644 --- a/stacklight_tests/helpers/helpers.py +++ b/stacklight_tests/helpers/helpers.py @@ -203,7 +203,7 @@ class PluginHelper(object): self.fuel_web.run_single_ostf_test(self.cluster_id, test_sets, test_name, *args, **kwargs) - def add_node_to_cluster(self, node, redeploy=True, check_services=False): + def add_nodes_to_cluster(self, node, redeploy=True, check_services=False): """Add nodes to the cluster. :param node: list of nodes with their roles. diff --git a/stacklight_tests/influxdb_grafana/test_system.py b/stacklight_tests/influxdb_grafana/test_system.py index b196b8d..fa5420b 100644 --- a/stacklight_tests/influxdb_grafana/test_system.py +++ b/stacklight_tests/influxdb_grafana/test_system.py @@ -59,7 +59,7 @@ class TestNodesInfluxdbPlugin(api.InfluxdbPluginApi): self.helpers.run_ostf(should_fail=1) # Add controller - self.helpers.add_node_to_cluster(manipulated_node) + self.helpers.add_nodes_to_cluster(manipulated_node) self.check_plugin_online() @@ -102,7 +102,7 @@ class TestNodesInfluxdbPlugin(api.InfluxdbPluginApi): self.helpers.run_ostf(should_fail=1) # Add compute - self.helpers.add_node_to_cluster(manipulated_node) + self.helpers.add_nodes_to_cluster(manipulated_node) self.check_plugin_online() @@ -147,7 +147,7 @@ class TestNodesInfluxdbPlugin(api.InfluxdbPluginApi): self.fuel_web.run_ostf() # Add InfluxDB-Grafana node - self.helpers.add_node_to_cluster(manipulated_node) + self.helpers.add_nodes_to_cluster(manipulated_node) self.check_plugin_online() diff --git a/stacklight_tests/lma_infrastructure_alerting/test_system.py b/stacklight_tests/lma_infrastructure_alerting/test_system.py index 399a607..82c450b 100644 --- a/stacklight_tests/lma_infrastructure_alerting/test_system.py +++ b/stacklight_tests/lma_infrastructure_alerting/test_system.py @@ -55,7 +55,7 @@ class TestLMAInfraAlertingPluginSystem(api.InfraAlertingPluginApi): self.check_plugin_online() self.check_node_in_nagios(target_node_hostname, False) - self.helpers.add_node_to_cluster(target_node) + self.helpers.add_nodes_to_cluster(target_node) self.helpers.run_ostf(should_fail=1) self.check_plugin_online() target_node_hostname = self.helpers.get_hostname_by_node_name( @@ -94,7 +94,7 @@ class TestLMAInfraAlertingPluginSystem(api.InfraAlertingPluginApi): self.check_plugin_online() self.check_node_in_nagios(target_node_hostname, False) - self.helpers.add_node_to_cluster(target_node) + self.helpers.add_nodes_to_cluster(target_node) self.helpers.run_ostf(should_fail=1) self.check_plugin_online() target_node_hostname = self.helpers.get_hostname_by_node_name( @@ -132,7 +132,7 @@ class TestLMAInfraAlertingPluginSystem(api.InfraAlertingPluginApi): self.check_plugin_online() self.check_node_in_nagios(target_node_hostname, False) - self.helpers.add_node_to_cluster(target_node) + self.helpers.add_nodes_to_cluster(target_node) self.helpers.run_ostf(should_fail=1) self.check_plugin_online() target_node_hostname = self.helpers.get_hostname_by_node_name( diff --git a/stacklight_tests/toolchain/test_system.py b/stacklight_tests/toolchain/test_system.py index 3b3b043..5413406 100644 --- a/stacklight_tests/toolchain/test_system.py +++ b/stacklight_tests/toolchain/test_system.py @@ -54,7 +54,7 @@ class TestNodesToolchain(api.ToolchainApi): self.helpers.run_ostf(should_fail=1) # Add controller - self.helpers.add_node_to_cluster(manipulated_node) + self.helpers.add_nodes_to_cluster(manipulated_node) self.check_plugins_online() @@ -91,7 +91,7 @@ class TestNodesToolchain(api.ToolchainApi): self.helpers.run_ostf(should_fail=1) # Add compute - self.helpers.add_node_to_cluster(manipulated_node) + self.helpers.add_nodes_to_cluster(manipulated_node) self.check_plugins_online() @@ -135,7 +135,7 @@ class TestNodesToolchain(api.ToolchainApi): self.fuel_web.run_ostf() # Add node with StackLight roles - self.helpers.add_node_to_cluster(manipulated_node) + self.helpers.add_nodes_to_cluster(manipulated_node) self.check_plugin_online()