Rewrite list_locks()

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

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 5db5408a13bd8c4518b19c123ccc7f237380f5f9..f2dbd0355b81b27d3b070593ee7c62aa6e056c5a 100644 (file)
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -119,10 +119,14 @@ def unlock_one(ctx, name, user=None):
     return success
 
 
-def list_locks():
-    success, content, _ = ls.send_request('GET', config.lock_server)
+def list_locks(machine_type=None):
+    uri = os.path.join(config.lock_server, 'nodes', '')
+    if machine_type:
+        uri += '?machine_type=' + machine_type
+    response = requests.get(uri)
+    success = response.ok
     if success:
-        return json.loads(content)
+        return response.json()
     return None