diff options
| author | Vincenzo Maffione <v.maffione@gmail.com> | 2017-06-15 14:04:08 +0000 |
|---|---|---|
| committer | Vincenzo Maffione <v.maffione@gmail.com> | 2017-06-15 14:04:08 +0000 |
| commit | f804a189255d30d8367731d5f6b1382876aed891 (patch) | |
| tree | 62faeab8bb79a73ba499597154ce5abadbab75eb /rumba/testbeds | |
| parent | c345d1b54f8e78d7c6e457b62e6b925a4daf6190 (diff) | |
| parent | e36189f8ba98d8a1b254a8dd300f59d5c12a9430 (diff) | |
| download | rumba-f804a189255d30d8367731d5f6b1382876aed891.tar.gz rumba-f804a189255d30d8367731d5f6b1382876aed891.zip | |
Merge branch 'policies' into 'master'
Add per-node policy management
See merge request !44
Diffstat (limited to 'rumba/testbeds')
| -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: |