From d539686847c9102f2a7a6f326579d920dc66e932 Mon Sep 17 00:00:00 2001 From: Kyrylo Galanov Date: Thu, 24 Mar 2016 02:46:51 +0100 Subject: [PATCH] Fix neutron resource name Change-Id: I5054f69d237640a39fd11801eefd8fd012384bbf Closes-bug: #1558154 --- .../tests/tests_strength/test_failover_group_1.py | 8 ++++---- fuelweb_test/tests/tests_strength/test_neutron_base.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fuelweb_test/tests/tests_strength/test_failover_group_1.py b/fuelweb_test/tests/tests_strength/test_failover_group_1.py index 65eb10440..fc69b2604 100644 --- a/fuelweb_test/tests/tests_strength/test_failover_group_1.py +++ b/fuelweb_test/tests/tests_strength/test_failover_group_1.py @@ -183,13 +183,13 @@ class FailoverGroup1(TestBasic): self.show_step(2) neutron_agents = [ {'name': 'neutron-openvswitch-agent', - 'resource': 'p_neutron-plugin-openvswitch-agent'}, + 'resource': 'neutron-openvswitch-agent'}, {'name': 'neutron-l3-agent', - 'resource': 'p_neutron-l3-agent'}, + 'resource': 'neutron-l3-agent'}, {'name': 'neutron-dhcp-agent', - 'resource': 'p_neutron-dhcp-agent'}, + 'resource': 'neutron-dhcp-agent'}, {'name': 'neutron-metadata-agent', - 'resource': 'p_neutron-metadata-agent'} + 'resource': 'neutron-metadata-agent'} ] cluster_id = self.fuel_web.get_last_created_cluster() diff --git a/fuelweb_test/tests/tests_strength/test_neutron_base.py b/fuelweb_test/tests/tests_strength/test_neutron_base.py index 00d78aadd..8f639f98f 100644 --- a/fuelweb_test/tests/tests_strength/test_neutron_base.py +++ b/fuelweb_test/tests/tests_strength/test_neutron_base.py @@ -240,7 +240,7 @@ class TestNeutronFailoverBase(base_test_case.TestBasic): node_with_l3 = os_conn.get_l3_agent_hosts(router_id)[0] # Ban this l3 agent using pacemaker - remote.execute("pcs resource ban p_neutron-l3-agent {0}".format( + remote.execute("pcs resource ban neutron-l3-agent {0}".format( node_with_l3)) err_msg = "l3 agent wasn't banned, it is still {0}" @@ -261,7 +261,7 @@ class TestNeutronFailoverBase(base_test_case.TestBasic): with self.env.d_env.get_ssh_to_remote(_ip) as remote: # Unban banned l3 agent - remote.execute("pcs resource clear p_neutron-l3-agent {0}". + remote.execute("pcs resource clear neutron-l3-agent {0}". format(node_with_l3)) def neutron_l3_migration_after_reset(self):