From f03f1a0ddada041b8a73a80d9087cad87e1bdbdf Mon Sep 17 00:00:00 2001 From: Marc Koderer Date: Thu, 23 Apr 2015 09:12:03 +0200 Subject: [PATCH] Remove ping check from basic scenario test ICMP ping was a workaround to proof that a connection between storage server and VM was working. Since it's now supporting actual mount operations this is just optional. By default this check is deactivated. Change-Id: I0eba48abc4583b2d1a4d690c92137941463730c1 Partially-implements: blueprint scenario-tests --- contrib/tempest/tempest/scenario/test_share_basic_ops.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/tempest/tempest/scenario/test_share_basic_ops.py b/contrib/tempest/tempest/scenario/test_share_basic_ops.py index 89ff2afd..d6672cfe 100644 --- a/contrib/tempest/tempest/scenario/test_share_basic_ops.py +++ b/contrib/tempest/tempest/scenario/test_share_basic_ops.py @@ -86,7 +86,7 @@ class TestShareBasicOps(manager.ShareScenarioTest): self.instance = self.create_server(image=self.image_ref, create_kwargs=create_kwargs) - def verify_ssh(self): + def init_ssh(self, do_ping=False): # Obtain a floating IP floating_ip = self.floating_ips_client.create_floating_ip() self.addCleanup(self.delete_wrapper, @@ -101,8 +101,9 @@ class TestShareBasicOps(manager.ShareScenarioTest): username=self.ssh_user, private_key=self.keypair['private_key']) self.share = self.shares_client.get_share(self.share['id']) - server_ip = self.share['export_location'].split(":")[0] - self.ssh_client.exec_command("ping -c 1 %s" % server_ip) + if do_ping: + server_ip = self.share['export_location'].split(":")[0] + self.ssh_client.exec_command("ping -c 1 %s" % server_ip) def mount_share(self, location): self.ssh_client.exec_command("sudo mount \"%s\" /mnt" % location) @@ -147,7 +148,7 @@ class TestShareBasicOps(manager.ShareScenarioTest): self.create_share(self.share_net['id']) self.boot_instance(self.net) self.allow_access_ip(self.share['id'], instance=self.instance) - self.verify_ssh() + self.init_ssh() for location in self.share['export_locations']: self.mount_share(location) self.umount_share()