j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-03-22 18:44:49 +00:00
Code Issues Projects Releases Wiki Activity

dev

Browse source
This commit is contained in:
aiminick 2021-04-12 02:17:48 +08:00
parent cd798eb9b7
commit 156cfb40dd
22 changed files with 1069 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

8
instances/forms.py
View file

@ -34,15 +34,15 @@ class ConsoleForm(forms.Form):
class NewVMForm(forms.Form):
name = forms.CharField(error_messages={'required': _('No Virtual Machine name has been entered')}, max_length=64)
firmware = forms.CharField(max_length=50, required=False)
name = forms.CharField(error_messages={'required': _('No Virtual Machine name has been entered')}, max_length=200)
firmware = forms.CharField(max_length=200, required=False)
vcpu = forms.IntegerField(error_messages={'required': _('No VCPU has been entered')})
vcpu_mode = forms.CharField(max_length=20, required=False)
vcpu_mode = forms.CharField(max_length=5136, required=False)
disk = forms.IntegerField(required=False)
memory = forms.IntegerField(error_messages={'required': _('No RAM size has been entered')})
networks = forms.CharField(error_messages={'required': _('No Network pool has been choosen')})
nwfilter = forms.CharField(required=False)
storage = forms.CharField(max_length=20, required=False)
storage = forms.CharField(max_length=200, required=False)
template = forms.CharField(required=False)
images = forms.CharField(required=False)
cache_mode = forms.CharField(error_messages={'required': _('Please select HDD cache mode')})

3
instances/tests.py
View file

@ -390,7 +390,8 @@ class InstancesTestCase(TestCase):
response = self.client.post(
reverse('instances:add_cdrom', args=[self.instance.id]),
{
'bus': 'sata',
#'bus': 'sata',
'bus': 'scsi',
},
HTTP_REFERER=reverse('index'),
)

3
instances/views.py
View file

@ -691,7 +691,8 @@ def add_cdrom(request, pk):
instance = get_instance(request.user, pk)
allow_admin_or_not_template = request.user.is_superuser or request.user.is_staff or not instance.is_template
if allow_admin_or_not_template:
bus = request.POST.get("bus", "ide" if instance.machine == "pc" else "sata")
#bus = request.POST.get("bus", "ide" if instance.machine == "pc" else "sata")
bus = request.POST.get("bus", "ide" if instance.machine == "pc" else "scsi")
target = utils.get_new_disk_dev(instance.media, instance.disks, bus)
instance.proxy.attach_disk(target, "", disk_device="cdrom", cache_mode="none", target_bus=bus, readonly=True)
msg = _("Add CD-ROM: %(target)s") % {"target": target}