openstack
/
fuel-qa
Code Issues Proposed changes

Fix for expect result in 'grep' 

Fix scenario steps

Change-Id: I100e59b614fe91965ba5af90fece7f27019ce250
Closes-bug: #1610145
This commit is contained in:
Valentyn Yakovlev 2016-10-03 11:06:34 +03:00
parent 80834d71e4
commit 51681dfdbb
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fuelweb_test/tests/tests_scale/test_scale_group_2.py
View File

@ -13,7 +13,7 @@
# under the License.
from proboscis import test
from proboscis.asserts import assert_false, assert_equal
from proboscis.asserts import assert_false
from devops.error import TimeoutError
from devops.helpers.helpers import wait
@ -43,8 +43,8 @@ class HaScaleGroup2(TestBasic):
6. Remove offline controller from cluster
7. Add 1 new controller
8. Deploy changes
9. Run OSTF
10. Verify networks
9. Verify networks
10. Run OSTF
Duration 120m
Snapshot replace_primary_controller
@ -96,9 +96,9 @@ class HaScaleGroup2(TestBasic):
)
self.show_step(8)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(10)
self.fuel_web.verify_network(cluster_id)
self.show_step(9)
self.fuel_web.verify_network(cluster_id)
self.show_step(10)
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("replace_primary_controller")
@ -115,8 +115,8 @@ class HaScaleGroup2(TestBasic):
3. Deploy the cluster
4. Remove 2 controllers
5. Deploy changes
6. Run OSTF
7. Verify networks
6. Verify networks
7. Run OSTF
8. Check /etc/hosts that removed nodes aren't present
9. Check corosync.conf that removed nodes aren't present
@ -160,9 +160,9 @@ class HaScaleGroup2(TestBasic):
)
self.show_step(5)
self.fuel_web.deploy_cluster_wait(cluster_id)
self.show_step(7)
self.fuel_web.verify_network(cluster_id)
self.show_step(6)
self.fuel_web.verify_network(cluster_id)
self.show_step(7)
self.fuel_web.run_ostf(cluster_id=cluster_id)
node = self.fuel_web.get_nailgun_node_by_devops_node(
@ -170,14 +170,12 @@ class HaScaleGroup2(TestBasic):
self.show_step(8)
self.show_step(9)
for host in hosts:
result = self.ssh_manager.execute_on_remote(
ip=node['ip'], cmd="grep '{}' /etc/hosts".format(host))
assert_equal(result['exit_code'], 1,
"host {} is present in /etc/hosts".format(host))
result = self.ssh_manager.execute_on_remote(
ip=node['ip'], cmd="grep '{}' /etc/corosync/"
"corosync.conf".format(host))
assert_equal(result['exit_code'], 1,
"host {} is present in"
" /etc/corosync/corosync.conf".format(host))
self.ssh_manager.execute_on_remote(
ip=node['ip'],
cmd="grep '{}' /etc/hosts".format(host),
assert_ec_equal=[1])
self.ssh_manager.execute_on_remote(
ip=node['ip'],
cmd="grep '{}' /etc/corosync/corosync.conf".format(host),
assert_ec_equal=[1])
self.env.make_snapshot("remove_controllers")