diff --git a/create/forms.py b/create/forms.py index 00fcb2f..9be0888 100644 --- a/create/forms.py +++ b/create/forms.py @@ -46,6 +46,7 @@ class NewVMForm(forms.Form): hdd_size = forms.IntegerField(required=False) meta_prealloc = forms.BooleanField(required=False) virtio = forms.BooleanField(required=False) + qemu_ga = forms.BooleanField(required=False) mac = forms.CharField(required=False) console_pass = forms.CharField(required=False,empty_value="", widget=forms.PasswordInput()) video = forms.CharField(error_messages={'required': _('Please select a graphic display')}) diff --git a/create/templates/create_instance.html b/create/templates/create_instance.html index 5e10f2d..baaada2 100644 --- a/create/templates/create_instance.html +++ b/create/templates/create_instance.html @@ -203,6 +203,12 @@ +
+ +
+ +
+
@@ -375,6 +381,12 @@
+
+ +
+ +
+
@@ -515,6 +527,12 @@
+
+ +
+ +
+
diff --git a/create/views.py b/create/views.py index 9879d05..b367e95 100644 --- a/create/views.py +++ b/create/views.py @@ -53,7 +53,6 @@ def create_instance(request, compute_id): disk_devices = conn.get_disk_device_types() disk_buses = conn.get_disk_bus_types() default_bus = INSTANCE_VOLUME_DEFAULT_BUS - #get_images = sorted(conn.get_storages_images()) except libvirtError as lib_err: error_messages.append(lib_err) @@ -173,7 +172,7 @@ def create_instance(request, compute_id): conn.create_instance(data['name'], data['memory'], data['vcpu'], data['host_model'], uuid, volume_list, data['cache_mode'], data['networks'], data['virtio'], data["listener_addr"], data["nwfilter"], data["video"], data["console_pass"], - data['mac']) + data['mac'], data['qemu_ga']) create_instance = Instance(compute_id=compute_id, name=data['name'], uuid=uuid) create_instance.save() msg = _("Instance is created.") diff --git a/vrtManager/create.py b/vrtManager/create.py index 0431194..29d2e68 100644 --- a/vrtManager/create.py +++ b/vrtManager/create.py @@ -154,7 +154,7 @@ class wvmCreate(wvmConnect): vol = self.get_volume_by_path(path) vol.delete() - def create_instance(self, name, memory, vcpu, host_model, uuid, images, cache_mode, networks, virtio, listen_addr, nwfilter=None, video="cirrus", console_pass="random", mac=None): + def create_instance(self, name, memory, vcpu, host_model, uuid, images, cache_mode, networks, virtio, listen_addr, nwfilter=None, video="cirrus", console_pass="random", mac=None, qemu_ga=False): """ Create VM function """ @@ -260,11 +260,21 @@ class wvmCreate(wvmConnect): xml += """ - - + + + """ % video + + + + self._defineXML(xml)