Merge remote-tracking branch 'qubesos/pr/41'
* qubesos/pr/41: Create new VM
This commit is contained in:
Marek Marczykowski-Górecki
commit
54b45a91af
@ -26,6 +26,7 @@ import os
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import subprocess
|
||||
|
||||
from PyQt4.QtCore import *
|
||||
from PyQt4.QtGui import *
|
||||
@ -52,7 +53,6 @@ class NewVmDlg(QDialog, Ui_NewVMDlg):
|
||||
# Theoretically we should be locking for writing here and unlock
|
||||
# only after the VM creation finished. But the code would be more messy...
|
||||
# Instead we lock for writing in the actual worker thread
|
||||
|
||||
self.label_list, self.label_idx = utils.prepare_label_choice(
|
||||
self.label,
|
||||
self.app, None,
|
||||
@ -83,11 +83,23 @@ class NewVmDlg(QDialog, Ui_NewVMDlg):
|
||||
self.tr('No template available!'),
|
||||
self.tr('Cannot create a qube when no template exists.'))
|
||||
|
||||
# Order of types is important and used elsewhere; if it's changed
|
||||
# check for changes needed in self.type_change and TODO
|
||||
type_list = [self.tr("AppVM"),
|
||||
self.tr("Standalone VM based on a template"),
|
||||
self.tr("Standalone VM not based on a template")]
|
||||
self.vm_type.addItems(type_list)
|
||||
|
||||
self.vm_type.currentIndexChanged.connect(self.type_change)
|
||||
|
||||
self.launch_settings.stateChanged.connect(self.settings_change)
|
||||
self.install_system.stateChanged.connect(self.install_change)
|
||||
|
||||
def reject(self):
|
||||
self.done(0)
|
||||
|
||||
def accept(self):
|
||||
vmclass = ('StandaloneVM' if self.standalone.isChecked() else 'AppVM')
|
||||
vmclass = ('AppVM' if self.vm_type.currentIndex() == 0 else 'StandaloneVM')
|
||||
|
||||
name = str(self.name.text())
|
||||
try:
|
||||
@ -102,11 +114,15 @@ class NewVmDlg(QDialog, Ui_NewVMDlg):
|
||||
return
|
||||
|
||||
label = self.label_list[self.label.currentIndex()]
|
||||
template = self.template_list[self.template_vm.currentIndex()]
|
||||
|
||||
if self.template_vm.currentIndex() == -1:
|
||||
template = None
|
||||
else:
|
||||
template = self.template_list[self.template_vm.currentIndex()]
|
||||
|
||||
properties = {}
|
||||
properties['provides_network'] = self.provides_network.isChecked()
|
||||
properties['virt_mode'] = 'hvm' if self.hvm.isChecked() else 'pv'
|
||||
properties['virt_mode'] = 'hvm'
|
||||
properties['netvm'] = self.netvm_list[self.netvm.currentIndex()]
|
||||
|
||||
thread_monitor = ThreadMonitor()
|
||||
@ -135,20 +151,68 @@ class NewVmDlg(QDialog, Ui_NewVMDlg):
|
||||
|
||||
self.done(0)
|
||||
|
||||
if thread_monitor.success:
|
||||
if self.launch_settings.isChecked():
|
||||
subprocess.check_call(['qubes-vm-settings', name])
|
||||
if self.install_system.isChecked():
|
||||
subprocess.check_call(
|
||||
['qubes-vm-boot-from-device', name])
|
||||
|
||||
@staticmethod
|
||||
def do_create_vm(app, vmclass, name, label, template, properties,
|
||||
thread_monitor):
|
||||
try:
|
||||
vm = app.add_new_vm(vmclass,
|
||||
name=name, label=label, template=template)
|
||||
for k, v in properties.items():
|
||||
setattr(vm, k, v)
|
||||
if vmclass == 'StandaloneVM' and template is not None:
|
||||
if template is qubesadmin.DEFAULT:
|
||||
src_vm = app.default_template
|
||||
else:
|
||||
src_vm = template
|
||||
vm = app.clone_vm(src_vm, name, vmclass)
|
||||
vm.label = label
|
||||
for k, v in properties.items():
|
||||
setattr(vm, k, v)
|
||||
else:
|
||||
vm = app.add_new_vm(vmclass,
|
||||
name=name, label=label, template=template)
|
||||
for k, v in properties.items():
|
||||
setattr(vm, k, v)
|
||||
|
||||
except Exception as ex:
|
||||
thread_monitor.set_error_msg(str(ex))
|
||||
|
||||
thread_monitor.set_finished()
|
||||
|
||||
def type_change(self):
|
||||
|
||||
# AppVM
|
||||
if self.vm_type.currentIndex() == 0:
|
||||
self.template_vm.setEnabled(True)
|
||||
self.template_vm.setCurrentIndex(0)
|
||||
self.install_system.setEnabled(False)
|
||||
self.install_system.setChecked(False)
|
||||
|
||||
# Standalone - based on a template
|
||||
if self.vm_type.currentIndex() == 1:
|
||||
self.template_vm.setEnabled(True)
|
||||
self.template_vm.setCurrentIndex(0)
|
||||
self.install_system.setEnabled(False)
|
||||
self.install_system.setChecked(False)
|
||||
|
||||
# Standalone - not based on a template
|
||||
if self.vm_type.currentIndex() == 2:
|
||||
self.template_vm.setEnabled(False)
|
||||
self.template_vm.setCurrentIndex(-1)
|
||||
self.install_system.setEnabled(True)
|
||||
self.install_system.setChecked(True)
|
||||
|
||||
def install_change(self):
|
||||
if self.install_system.isChecked():
|
||||
self.launch_settings.setChecked(False)
|
||||
|
||||
def settings_change(self):
|
||||
if self.launch_settings.isChecked() and self.install_system.isEnabled():
|
||||
self.install_system.setChecked(False)
|
||||
|
||||
parser = qubesadmin.tools.QubesArgumentParser()
|
||||
|
||||
def main(args=None):
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>618</width>
|
||||
<height>214</height>
|
||||
<width>616</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -21,8 +21,8 @@
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>180</y>
|
||||
<x>450</x>
|
||||
<y>260</y>
|
||||
<width>160</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
@ -39,22 +39,55 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>10</y>
|
||||
<width>596</width>
|
||||
<height>175</height>
|
||||
<width>611</width>
|
||||
<height>241</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="3">
|
||||
<widget class="QComboBox" name="label">
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="template_label">
|
||||
<property name="text">
|
||||
<string>Template:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>template_vm</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1" colspan="2">
|
||||
<widget class="QLineEdit" name="name">
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="netvm_label">
|
||||
<property name="text">
|
||||
<string>my-new-vm</string>
|
||||
<string>Networking:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>template_vm</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="1" colspan="3">
|
||||
<widget class="QCheckBox" name="install_system">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>install system from device (also available from settings)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1" colspan="3">
|
||||
<widget class="QCheckBox" name="launch_settings">
|
||||
<property name="text">
|
||||
<string>launch settings after creation</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1" colspan="3">
|
||||
<widget class="QComboBox" name="template_vm"/>
|
||||
</item>
|
||||
<item row="7" column="1" colspan="3">
|
||||
<widget class="QCheckBox" name="provides_network">
|
||||
<property name="text">
|
||||
<string>provides network</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -68,56 +101,37 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1" colspan="3">
|
||||
<widget class="QComboBox" name="netvm"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="template_label">
|
||||
<property name="text">
|
||||
<string>Use this template:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>template_vm</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" colspan="3">
|
||||
<widget class="QComboBox" name="template_vm"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="netvm_label">
|
||||
<property name="text">
|
||||
<string>Network:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>template_vm</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QCheckBox" name="hvm">
|
||||
<property name="text">
|
||||
<string>HVM</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<item row="0" column="3">
|
||||
<widget class="QComboBox" name="label">
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QCheckBox" name="provides_network">
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Provides network</string>
|
||||
<string>Advanced</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QCheckBox" name="standalone">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<item row="6" column="1" colspan="3">
|
||||
<widget class="QComboBox" name="netvm"/>
|
||||
</item>
|
||||
<item row="0" column="1" colspan="2">
|
||||
<widget class="QLineEdit" name="name">
|
||||
<property name="text">
|
||||
<string>Standalone</string>
|
||||
<string>my-new-vm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" colspan="3">
|
||||
<widget class="QComboBox" name="vm_type"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user