Merge "Fix backup/restore master node system tests" into stable/6.0

This commit is contained in:
Jenkins 2014-12-23 19:33:01 +00:00 committed by Gerrit Code Review
commit 81d38d6f29
2 changed files with 4 additions and 2 deletions

View File

@ -317,7 +317,8 @@ class BackupRestoreHa(TestBasic):
cluster_id = self.fuel_web.get_last_created_cluster()
os_conn = os_actions.OpenStackActions(
self.fuel_web.get_public_vip(cluster_id))
self.fuel_web.get_public_vip(cluster_id),
'novaHaFlat', 'novaHaFlat', 'novaHaFlat')
self.fuel_web.assert_cluster_ready(
os_conn, smiles_count=16, networks_count=1, timeout=300)
self.fuel_web.backup_master(self.env.get_admin_remote())

View File

@ -898,7 +898,8 @@ class BackupRestoreSimple(TestBasic):
cluster_id = self.fuel_web.get_last_created_cluster()
os_conn = os_actions.OpenStackActions(
self.fuel_web.get_nailgun_node_by_name('slave-01')['ip'])
self.fuel_web.get_nailgun_node_by_name('slave-01')['ip'],
'novaSimpleFlat', 'novaSimpleFlat', 'novaSimpleFlat')
self.fuel_web.assert_cluster_ready(
os_conn, smiles_count=6, networks_count=1, timeout=300)
self.fuel_web.backup_master(self.env.get_admin_remote())