From 213ca8e4e4d155ed6d5626020e56c3a241d1dace Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 7 May 2018 00:57:23 +0200 Subject: Simplify vping_ssh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It directly calls ping from the ssh socket. It fixes a possible missing security rule. It stops blocking if vpings are in failure. Change-Id: I64092a155bb134fa8b7d31d0d13f695e019540d1 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/vping/vping_base.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'functest/opnfv_tests/openstack/vping/vping_base.py') diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 6f2f5dfbe..2d1f856d7 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -45,6 +45,7 @@ class VPingBase(testcase.TestCase): self.image = None self.flavor = None self.vm1 = None + self.sec1 = None def run(self, **kwargs): # pylint: disable=too-many-locals """ @@ -118,6 +119,12 @@ class VPingBase(testcase.TestCase): self.cloud.set_flavor_specs( self.flavor.id, getattr(config.CONF, 'flavor_extra_specs', {})) + self.sec1 = self.cloud.create_security_group( + getattr(config.CONF, 'vping_sg_name') + self.guid, + getattr(config.CONF, 'vping_sg_desc')) + self.cloud.create_security_group_rule( + self.sec1.id, protocol='icmp', direction='ingress') + vm1_name = getattr(config.CONF, 'vping_vm_name_1') + self.guid self.logger.info( "Creating VM 1 instance with name: '%s'", vm1_name) @@ -126,9 +133,12 @@ class VPingBase(testcase.TestCase): flavor=self.flavor.id, auto_ip=False, wait=True, timeout=getattr(config.CONF, 'vping_vm_boot_timeout'), - network=self.network.id) + network=self.network.id, + security_groups=[self.sec1.id]) self.logger.debug("vm1: %s", self.vm1) self.vm1 = self.cloud.wait_for_server(self.vm1, auto_ip=False) + p_console = self.cloud.get_server_console(self.vm1.id) + self.logger.debug("vm1 console: \n%s", p_console) def _execute(self): """ @@ -151,6 +161,7 @@ class VPingBase(testcase.TestCase): """ assert self.cloud self.cloud.delete_server(self.vm1, wait=True) + self.cloud.delete_security_group(self.sec1.id) self.cloud.delete_image(self.image) self.cloud.remove_router_interface(self.router, self.subnet.id) self.cloud.delete_router(self.router.id) -- cgit 1.2.3-korg