Revert "Revert "lock.py: is_vpm should test is_vm""

This reverts commit 097e11c04a40e013e91a7a64836c98413af6a71a.

I misidentified this as the commit which introduced a bug on Friday.
Reintroduce the original, innocent commit.

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

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 1fc685e4f65b2d8449c42cd89f79c4bb300000a5..73bb648ed29a788654e3d3fee95d4494d9aab72a 100644 (file)
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -17,7 +17,9 @@ from .lockstatus import get_status
 
 log = logging.getLogger(__name__)
 
-is_vpm = lambda name: 'vpm' in name
+
+def is_vm(name):
+    return get_status(name)['is_vm']
 
 
 def get_distro_from_downburst():
@@ -314,7 +316,7 @@ def main(ctx):
         if ctx.owner is None and user is None:
             user = misc.get_user()
         # If none of them are vpm, do them all in one shot
-        if not filter(is_vpm, machines):
+        if not filter(is_vm, machines):
             res = unlock_many(machines, user)
             return 0 if res else 1
         for machine in machines: