From c02bc0b46ab1824ecd24ab7514da68200f006944 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Mon, 2 Mar 2020 12:45:12 -0500
Subject: [PATCH] Correct issues with VM lock freeing

Code was bad and using a depricated feature.
---
 node-daemon/pvcnoded/VMInstance.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/node-daemon/pvcnoded/VMInstance.py b/node-daemon/pvcnoded/VMInstance.py
index b9a48462..11c47977 100644
--- a/node-daemon/pvcnoded/VMInstance.py
+++ b/node-daemon/pvcnoded/VMInstance.py
@@ -56,13 +56,13 @@ def flush_locks(zk_conn, logger, dom_uuid):
         # If there's at least one lock
         if lock_list:
             # Loop through the locks
-            for lock, detail in lock_list.items():
+            for lock in lock_list:
                 # Free the lock
-                lock_remove_retcode, lock_remove_stdout, lock_remove_stderr = common.run_os_command('rbd lock remove {} "{}" "{}"'.format(rbd, lock, detail['locker']))
+                lock_remove_retcode, lock_remove_stdout, lock_remove_stderr = common.run_os_command('rbd lock remove {} "{}" "{}"'.format(rbd, lock['id'], lock['locker']))
                 if lock_remove_retcode != 0:
-                    logger.out('Failed to free RBD lock "{}" on volume "{}"\n{}'.format(lock, rbd, lock_remove_stderr), state='e')
+                    logger.out('Failed to free RBD lock "{}" on volume "{}"\n{}'.format(lock['id'], rbd, lock_remove_stderr), state='e')
                     continue
-                logger.out('Freed RBD lock "{}" on volume "{}"'.format(lock, rbd), state='o')
+                logger.out('Freed RBD lock "{}" on volume "{}"'.format(lock['id'], rbd), state='o')
 
     return True