From 7e13330620e235e9611ed1b474bcfb33902797f5 Mon Sep 17 00:00:00 2001 From: Umar Farooq Date: Thu, 13 Jul 2017 14:51:51 +0200 Subject: Fix host status grep bug and Remove connection_pool argument Host status returned the wrong output as the "OS-EXT-SRV-ATTR:host" pattern appears twice in the "openstack server show" output. The argument connection_pool is deprecated and is not needed. Change-Id: Ib107e0bad8084bdf6f77689f112bde04bdb97543 Signed-off-by: Umar Farooq --- tests/inspector.py | 3 +-- tests/run.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/inspector.py b/tests/inspector.py index d11da299..a61051f1 100644 --- a/tests/inspector.py +++ b/tests/inspector.py @@ -54,8 +54,7 @@ class DoctorInspectorSample(object): # Pool of novaclients for redundant usage for i in range(self.NUMBER_OF_CLIENTS): self.novaclients.append( - novaclient.Client(self.NOVA_API_VERSION, session=sess, - connection_pool=True)) + novaclient.Client(self.NOVA_API_VERSION, session=sess)) # Normally we use this client for non redundant API calls self.nova=self.novaclients[0] self.nova.servers.list(detailed=False) diff --git a/tests/run.sh b/tests/run.sh index fda1e753..b838adab 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -48,7 +48,7 @@ as_admin_user="--os-username admin --os-project-name $DOCTOR_PROJECT get_compute_host_info() { # get computer host info which first VM boot in as admin user COMPUTE_HOST=$(openstack $as_admin_user server show ${VM_BASENAME}1 | - grep "OS-EXT-SRV-ATTR:host" | awk '{ print $4 }') + grep "OS-EXT-SRV-ATTR:host " | awk '{ print $4 }') compute_host_in_undercloud=${COMPUTE_HOST%%.*} die_if_not_set $LINENO COMPUTE_HOST "Failed to get compute hostname" -- cgit 1.2.3-korg