From: Zack Cerza <zack.cerza@inktank.com>
Date: Mon, 18 Aug 2014 23:07:51 +0000 (-0600)
Subject: Properly query for multiple machine types
X-Git-Tag: 1.1.0~1229
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e0aca2e6d72eff9ed920654044c298c0f5571542;p=teuthology.git

Properly query for multiple machine types

...in list_locks()

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

diff --git a/teuthology/lock.py b/teuthology/lock.py
index b920f6a6cf..d8ac78f013 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -289,6 +289,8 @@ def unlock_one(ctx, name, user=None):
 def list_locks(keyed_by_name=False, **kwargs):
     uri = os.path.join(config.lock_server, 'nodes', '')
     if kwargs:
+        if 'machine_type' in kwargs:
+            kwargs['machine_type'] = kwargs['machine_type'].replace(',','|')
         uri += '?' + urllib.urlencode(kwargs)
     response = requests.get(uri)
     success = response.ok
@@ -397,7 +399,7 @@ def push_new_keys(keys_dict, reference):
 
 def do_summary(ctx):
     lockd = collections.defaultdict(lambda: [0, 0, 'unknown'])
-    for l in list_locks(ctx.machine_type):
+    for l in list_locks(machine_type=ctx.machine_type):
         who = l['locked_by'] if l['locked'] == 1 \
             else '(free)', l['machine_type']
         lockd[who][0] += 1