x/stacklight-integration-tests
Code Issues Proposed changes

Merge "s/add_node_to_cluster/add_nodes_to_cluster/"

Browse Source
This commit is contained in:
Jenkins 2016-06-14 09:10:41 +00:00 committed by Gerrit Code Review
commit 746c3f39e0
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stacklight_tests/elasticsearch_kibana/test_system.py
View File

@ -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()

2
stacklight_tests/helpers/helpers.py
View File

@ -206,7 +206,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.

6
stacklight_tests/influxdb_grafana/test_system.py
View File

@ -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()

6
stacklight_tests/lma_infrastructure_alerting/test_system.py
View File

@ -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(

6
stacklight_tests/toolchain/test_system.py
View File

@ -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()