kvm_vm.py: add function VM.get_name().
kvm_preprocessing.py: use VM.get_name() instead of directly accessing the .name
attribute.
Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
client/tests/kvm_runtest_2/kvm_preprocessing.py | 6 +++---
client/tests/kvm_runtest_2/kvm_vm.py | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/client/tests/kvm_runtest_2/kvm_preprocessing.py b/client/tests/kvm_runtest_2/kvm_preprocessing.py
index c9eb35d..bcabf5a 100644
--- a/client/tests/kvm_runtest_2/kvm_preprocessing.py
+++ b/client/tests/kvm_runtest_2/kvm_preprocessing.py
@@ -178,7 +178,7 @@ def preprocess(test, params, env):
if vm.is_dead():
continue
if not vm.verify_process_identity():
- kvm_log.debug("VM '%s' seems to have been replaced by another process" % vm.name)
+ kvm_log.debug("VM '%s' seems to have been replaced by another process" % vm.get_name())
vm.pid = None
# Destroy and remove VMs that are no longer needed in the environment
@@ -187,8 +187,8 @@ def preprocess(test, params, env):
vm = env[key]
if not kvm_utils.is_vm(vm):
continue
- if not vm.name in requested_vms:
- kvm_log.debug("VM '%s' found in environment but not required for test; removing it..." % vm.name)
+ if not vm.get_name() in requested_vms:
+ kvm_log.debug("VM '%s' found in environment but not required for test; removing it..." % vm.get_name())
vm.destroy()
del env[key]
diff --git a/client/tests/kvm_runtest_2/kvm_vm.py b/client/tests/kvm_runtest_2/kvm_vm.py
index fab839f..df99859 100644
--- a/client/tests/kvm_runtest_2/kvm_vm.py
+++ b/client/tests/kvm_runtest_2/kvm_vm.py
@@ -454,6 +454,10 @@ class VM:
"""Return True iff the VM's PID does not exist."""
return not kvm_utils.pid_exists(self.pid)
+ def get_name(self):
+ """Return the VM's name."""
+ return self.name
+
def get_params(self):
"""Return the VM's params dict.
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
