From e36189f8ba98d8a1b254a8dd300f59d5c12a9430 Mon Sep 17 00:00:00 2001 From: Marco Capitani Date: Tue, 13 Jun 2017 12:44:04 +0200 Subject: IRATI: added per-node policy support, and revamped policy data model. additional: + fixed small bug rlated to vhost checking in qemu. + example scripts now correctly use policies. --- rumba/testbeds/qemu.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'rumba/testbeds/qemu.py') diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index df02ab6..1d449dc 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -111,11 +111,12 @@ class Testbed(mod.Testbed): if os.geteuid() != 0: try: subprocess.check_call(["sudo", "-v"]) - if not os.access("/dev/vhost-net", os.R_OK) \ - or not os.access("/dev/vhost-net", os.W_OK) \ - or not os.access("/dev/kvm", os.R_OK) \ - or not os.access("/dev/kvm", os.W_OK): - raise Exception('Cannot open vhost device. Make sure it is' + if self.vhost and \ + (not os.access("/dev/vhost-net", os.R_OK) + or not os.access("/dev/vhost-net", os.W_OK) + or not os.access("/dev/kvm", os.R_OK) + or not os.access("/dev/kvm", os.W_OK)): + raise Exception('Cannot open vhost device. Make sure it is ' 'available and you have rw permissions ' 'on /dev/vhost-net') except subprocess.CalledProcessError: -- cgit v1.2.3