From: Carlos Goncalves Date: Wed, 26 Jul 2017 10:36:34 +0000 (+0000) Subject: Merge "Fix host status grep bug and Remove connection_pool argument" X-Git-Tag: opnfv-5.0.RC1~38 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9eb18cabdddda3a2e0bbd05076bc1786ebe6be8b;hp=41fc677e7f6349d28ec938fe6ac9ff03e99894f1;p=doctor.git Merge "Fix host status grep bug and Remove connection_pool argument" --- 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"