ProvisionOpenStack: Cache server info in destroy()

So we don't have to call "openstack server show" twice

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/provision.py b/teuthology/provision.py
index f1621f6ed9d84577e287c4dfc1ccce7ad9f9d7cc..45beb0437fb0ee46bd3457b636bbbb5e8be2606a 100644 (file)
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -269,16 +269,20 @@ class ProvisionOpenStack(OpenStack):
             misc.sh("openstack server add volume " +
                     name + " " + volume_name)
 
-    def list_volumes(self, name_or_id):
+    def list_volumes(self, name_or_id, server_info=None):
         """
         Return the uuid of the volumes attached to the name_or_id
         OpenStack instance.
+
+        :param name_or_id:  The name or ID of the server to query
+        :param server_info: Optionally, use already-retrieved results of
+                            self.show()
         """
-        instance = misc.sh("openstack server show -f json " +
-                           name_or_id)
-        volumes = self.get_value(json.loads(instance),
+        if not server_info:
+            server_info = self.show(name_or_id)
+        volumes = self.get_value(server_info,
                                  'os-extended-volumes:volumes_attached')
-        return [ volume['id'] for volume in volumes ]
+        return [volume['id'] for volume in volumes ]
 
     @staticmethod
     def ip2name(prefix, ip):
@@ -355,9 +359,10 @@ class ProvisionOpenStack(OpenStack):
         Delete the name_or_id OpenStack instance.
         """
         log.debug('ProvisionOpenStack:destroy ' + name_or_id)
-        if not self.exists(name_or_id):
+        server_info = self.show(name_or_id)
+        if not self.exists(name_or_id, server_info=server_info):
             return True
-        volumes = self.list_volumes(name_or_id)
+        volumes = self.list_volumes(name_or_id, server_info=server_info)
         for volume in volumes:
             misc.sh("openstack server remove volume %s %s" %
                     (name_or_id, volume))