diff options
| author | Marco Capitani <m.capitani@nextworks.it> | 2017-06-13 12:44:04 +0200 |
|---|---|---|
| committer | Marco Capitani <m.capitani@nextworks.it> | 2017-06-13 12:44:04 +0200 |
| commit | e36189f8ba98d8a1b254a8dd300f59d5c12a9430 (patch) | |
| tree | e815229b91e78a13cc96ec7fc3b18015b9544389 /rumba/testbeds/qemu.py | |
| parent | 457977f337a47caddf8788e1d4e1d1736f2a6ccb (diff) | |
| download | rumba-e36189f8ba98d8a1b254a8dd300f59d5c12a9430.tar.gz rumba-e36189f8ba98d8a1b254a8dd300f59d5c12a9430.zip | |
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.
Diffstat (limited to 'rumba/testbeds/qemu.py')
| -rw-r--r-- | rumba/testbeds/qemu.py | 11 |
1 files changed, 6 insertions, 5 deletions
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: |