Fix scenario tests

Fix several issues in scenario test to get them stable again:

 - The SSH timeout was set to 80 seconds what is way too low for an
   Nova instance to come up in the gate.
 - Scenario test access rule cleanup is not necessary, access rules
   are deleted when share instance is deleted.

Co-Authored-By: Rodrigo Barbieri <rodrigo.barbieri@fit-tecnologia.org.br>
Closes-bug #1545715

Change-Id: I9f22f0416bb248666fe906e1ca653517054f21b5
This commit is contained in:
Marc Koderer 2016-02-15 17:37:13 +01:00
parent 8ff942b575
commit 08e3e61de5
2 changed files with 4 additions and 3 deletions
contrib/ci
manila_tempest_tests/tests/scenario

@ -191,7 +191,6 @@ iniset $TEMPEST_CONFIG identity alt_username ${ALT_USERNAME:-"alt_demo"}
iniset $TEMPEST_CONFIG identity alt_password $ADMIN_PASSWORD
iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"}
iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4
iniset $TEMPEST_CONFIG validation ssh_timeout $BUILD_TIMEOUT
iniset $TEMPEST_CONFIG validation network_for_ssh ${PRIVATE_NETWORK_NAME:-"private"}
echo "Running tempest manila test suites"

@ -173,7 +173,8 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
self.security_group = self._create_security_group()
self.create_share()
instance = self.boot_instance()
self.allow_access_ip(self.share['id'], instance=instance)
self.allow_access_ip(self.share['id'], instance=instance,
cleanup=False)
ssh_client = self.init_ssh(instance)
for location in self.share['export_locations']:
self.mount_share(location, ssh_client)
@ -189,7 +190,8 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
# boot first VM and write data
instance1 = self.boot_instance()
self.allow_access_ip(self.share['id'], instance=instance1)
self.allow_access_ip(self.share['id'], instance=instance1,
cleanup=False)
ssh_client_inst1 = self.init_ssh(instance1)
# TODO(vponomaryov): use separate API for getting export location for