From bea293167d7a7aedb82d5c5dd3751b543a6d37cb Mon Sep 17 00:00:00 2001 From: Anastasia Kuznetsova Date: Mon, 15 Sep 2014 10:59:16 +0400 Subject: [PATCH] Use cluster VIP instead of controller IP in test 'Deploy Heat HA' In the system test 'Deploy Heat HA' controller IP was used to connect to keystone, in this case, in HA mode, need to use cluster VIP instead of internal controller IP to successfully connection to keystone. Closes-Bug: #1369412 Change-Id: I8ce6f9094396a8b203aa9fe8c4b05bd8675199e1 (cherry picked from commit bbfeb5d4bbaaa7e2e50f81d45c9e4c8619429e8d) --- fuelweb_test/tests/test_services.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py index 70dbf1ea8..f669e6baa 100644 --- a/fuelweb_test/tests/test_services.py +++ b/fuelweb_test/tests/test_services.py @@ -509,7 +509,7 @@ class HeatSimple(TestBasic): groups=["deploy_heat_simple_neutron"]) @log_snapshot_on_error def deploy_heat_simple_neutron(self): - """Deploy cluster in simple mode with Neutron GRE + """Deploy Heat cluster in simple mode with Neutron GRE Scenario: 1. Create cluster @@ -600,7 +600,7 @@ class HeatSimple(TestBasic): groups=["deploy_heat_simple_nova"]) @log_snapshot_on_error def deploy_heat_simple_nova(self): - """Deploy cluster in simple mode with Nova Network + """Deploy Heat cluster in simple mode with Nova Network Scenario: 1. Create cluster @@ -696,7 +696,7 @@ class HeatHA(TestBasic): groups=["deploy_heat_ha"]) @log_snapshot_on_error def deploy_heat_ha(self): - """Deploy cluster in HA mode + """Deploy Heat cluster in HA mode Scenario: 1. Create cluster @@ -752,8 +752,9 @@ class HeatHA(TestBasic): self.env.get_ssh_to_remote_by_name(slave), service_name='heat-api', count=3) - controller = self.fuel_web.get_nailgun_node_by_name('slave-01') - common_func = Common(controller['ip'], + cluster_vip = self.fuel_web.get_public_vip(cluster_id) + + common_func = Common(cluster_vip, data['user'], data['password'], data['tenant'])