Skip to content

vmrunner: make mac optional, use virtio/tap by default #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2017
Merged

vmrunner: make mac optional, use virtio/tap by default #1089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions vmrunner/vmrunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"CALLBACK_FAILED" : 68,
"BUILD_FAIL" : 69,
"ABORT" : 70,
"VM_EOT" : 71 }
"VM_EOT" : 71,
"BOOT_FAILED": 72
}

def get_exit_code_name (exit_code):
for name, code in exit_codes.iteritems():
Expand Down Expand Up @@ -124,15 +126,25 @@ def __init__(self, config):
def name(self):
return "Qemu"

def drive_arg(self, filename, drive_type="virtio", drive_format="raw", media_type="disk"):
return ["-drive","file="+filename+",format="+drive_format+",if="+drive_type+",media="+media_type]
def drive_arg(self, filename, drive_type = "virtio", drive_format = "raw", media_type = "disk"):
return ["-drive","file=" + filename
+ ",format=" + drive_format
+ ",if=" + drive_type
+ ",media=" + media_type]

def net_arg(self, backend, device, if_name = "net0", mac="c0:01:0a:00:00:2a"):
qemu_ifup = INCLUDEOS_HOME+"/includeos/scripts/qemu-ifup"
# FIXME: this needs to get removed
def net_arg(self, backend, device, if_name = "net0", mac = None):
qemu_ifup = INCLUDEOS_HOME + "/includeos/scripts/qemu-ifup"

# FIXME: this needs to get removed, e.g. fetched from the schema
names = {"virtio" : "virtio-net", "vmxnet" : "vmxnet3", "vmxnet3" : "vmxnet3"}
return ["-device", names[device]+",netdev="+if_name+",mac="+mac,
"-netdev", backend+",id="+if_name+",script="+qemu_ifup]

device = names[device] + ",netdev=" + if_name

# Add mac-address if specified
if mac: device += ",mac=" + mac

return ["-device", device,
"-netdev", backend + ",id=" + if_name + ",script=" + qemu_ifup]

def kvm_present(self):
command = "egrep -m 1 '^flags.*(vmx|svm)' /proc/cpuinfo"
Expand Down Expand Up @@ -203,7 +215,8 @@ def boot(self, multiboot, kernel_args = "", image_name = None):
i = 0
if "net" in self._config:
for net in self._config["net"]:
net_args += self.net_arg(net["backend"], net["device"], "net"+str(i), net["mac"])
mac = net["mac"] if "mac" in net else None
net_args += self.net_arg(net["backend"], net["device"], "net"+str(i), mac)
i+=1

mem_arg = []
Expand All @@ -213,7 +226,7 @@ def boot(self, multiboot, kernel_args = "", image_name = None):
vga_arg = ["-nographic" ]
if "vga" in self._config:
vga_arg = ["-vga", str(self._config["vga"])]

# TODO: sudo is only required for tap networking and kvm. Check for those.
command = ["sudo", "qemu-system-x86_64"]
if self.kvm_present(): command.append("--enable-kvm")
Expand Down Expand Up @@ -459,9 +472,10 @@ def boot(self, timeout = 60, multiboot = True, kernel_args = "booted with vmrunn
try:
self._hyper.boot(multiboot, kernel_args, image_name)
except Exception as err:
print color.WARNING("Exception raised while booting ")
print color.WARNING("Exception raised while booting: ")
print_exception()
if (timeout): self._timer.cancel()
self.exit(exit_codes["CALLBACK_FAILED"], str(err))
self.exit(exit_codes["BOOT_FAILED"], str(err))

# Start analyzing output
while self._hyper.poll() == None and not self._exit_status:
Expand Down Expand Up @@ -526,7 +540,8 @@ def boot(self, timeout = 60, multiboot = True, kernel_args = "booted with vmrunn
validate_vm.load_schema(schema_path)
validate_vm.has_required_stuff(".")

default_spec = {"image" : "service.img"}
default_spec = {"image" : "service.img",
"net" : [{"device" : "virtio", "backend" : "tap" }] }

# Provide a list of VM's with validated specs
vms = []
Expand Down