From 8017fbb90fcf9539a5e7ff52cc62c7c55eedc6d1 Mon Sep 17 00:00:00 2001 From: Modulos Date: Sat, 13 May 2017 10:00:07 +0200 Subject: [PATCH 1/2] Work on configuration --- .../hosting/create_virtual_machine.html | 3 +- hosting/views.py | 8 +++-- opennebula_api/models.py | 29 ++++++------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html index 405b2988..3618fd6b 100644 --- a/hosting/templates/hosting/create_virtual_machine.html +++ b/hosting/templates/hosting/create_virtual_machine.html @@ -27,9 +27,10 @@
Select VM Configuration: diff --git a/hosting/views.py b/hosting/views.py index 0025a40d..4f0699d3 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -394,7 +394,8 @@ class PaymentVMView(LoginRequiredMixin, FormView): specifications = request.session.get('template') vm_template_id = specifications.get('id', 1) - vm_image_id = request.session.get('image').get('id', 1) + + vm_image_id = request.session.get('image').get('id', None) final_price = specifications.get('price', 1) @@ -439,12 +440,13 @@ class PaymentVMView(LoginRequiredMixin, FormView): except UserHostingKey.DoesNotExist: pass + # Create a vm using logged user vm_id = manager.create_vm( template_id=vm_template_id, - ssh_key=user_key.public_key, image_id=vm_image_id, + ssh_key=user_key.public_key, ) # Create a Hosting Order @@ -586,7 +588,7 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View): image_id = request.POST.get('vm_image_id') image = manager.get_image(image_id) request.session['template'] = VirtualMachineTemplateSerializer(template).data - request.session['image'] = ImageSerializer(image).data + #request.session['image'] = ImageSerializer(image).data return redirect(reverse('hosting:payment')) diff --git a/opennebula_api/models.py b/opennebula_api/models.py index f543d0ec..2f8744e3 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -110,33 +110,21 @@ class OpenNebulaManager(): return None def create_vm(self, template_id, image_id=None, ssh_key=None): - extra_template_formater = """ - {ssh_key} - - - {image_id} - - """ template = self.get_template(template_id) vm_id = template.instantiate(name ='', pending=False, extra_template='') - image = self.get_image(image_id) - image_name = "{image_name}{template_name}{vm_id}".format( - image_name=image.name, - template_name=template.name, - vm_id = vm_id, - ) + extra_template= """ + {ssh_key} + + """ - image_id = image.clone(name=image_name) + extra_template.format(ssh_key=ssh_key) self.oneadmin_client.call( - oca.VmTemplate.METHODS['update'], + oca.VirtualMachine.METHODS['update'], vm_id, - extra_template_formater.format( - ssh_key=ssh_key, - image_id=image_id - ), + extra_template, # 0 = Replace / 1 = Merge 1, ) @@ -282,7 +270,8 @@ class OpenNebulaManager(): public_images = [ image for image in self._get_image_pool() - if 'public-' in image.name + #XXX: Change this + if 'READY' in image.str_state ] return public_images except ConnectionRefusedError: From 752e11bcea29a42e1f0c988781b4f871a0b0b1c5 Mon Sep 17 00:00:00 2001 From: Modulos Date: Sat, 13 May 2017 13:47:53 +0200 Subject: [PATCH 2/2] Readded hostingplans --- hosting/admin.py | 3 +- hosting/migrations/0040_hostingplan.py | 24 ++++ hosting/models.py | 25 ++++ hosting/templates/hosting/bill_detail.html | 6 +- .../hosting/create_virtual_machine.html | 23 ++-- hosting/templates/hosting/payment.html | 11 +- hosting/views.py | 34 +++--- opennebula_api/models.py | 107 +++++++++--------- opennebula_api/serializers.py | 11 +- 9 files changed, 148 insertions(+), 96 deletions(-) create mode 100644 hosting/migrations/0040_hostingplan.py diff --git a/hosting/admin.py b/hosting/admin.py index 4f2f15e1..c38fa8d0 100644 --- a/hosting/admin.py +++ b/hosting/admin.py @@ -4,8 +4,9 @@ from django.core.urlresolvers import reverse from utils.mailer import BaseEmail -from .models import HostingOrder, HostingBill +from .models import HostingOrder, HostingBill, HostingPlan admin.site.register(HostingOrder) admin.site.register(HostingBill) +admin.site.register(HostingPlan) diff --git a/hosting/migrations/0040_hostingplan.py b/hosting/migrations/0040_hostingplan.py new file mode 100644 index 00000000..cb48ccd6 --- /dev/null +++ b/hosting/migrations/0040_hostingplan.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-05-13 11:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hosting', '0039_hostingorder_price'), + ] + + operations = [ + migrations.CreateModel( + name='HostingPlan', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('disk_size', models.FloatField(default=0.0)), + ('cpu_cores', models.FloatField(default=0.0)), + ('memory', models.FloatField(default=0.0)), + ], + ), + ] diff --git a/hosting/models.py b/hosting/models.py index 6be6c246..f8f180a5 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -21,6 +21,31 @@ from .managers import VMPlansManager logger = logging.getLogger(__name__) +class HostingPlan(models.Model): + disk_size = models.FloatField(default=0.0) + cpu_cores = models.FloatField(default=0.0) + memory = models.FloatField(default=0.0) + + def serialize(self): + return { + 'id': self.id, + 'cpu':self.cpu_cores, + 'memory': self.memory, + 'disk_size': self.disk_size, + 'price': self.price(), + } + + @classmethod + def get_serialized_configs(cls): + return [cfg.serialize() + for cfg in cls.objects.all()] + + def price(self): + price = self.disk_size * 0.2 + price += self.cpu_cores * 5 + price += self.memory * 2 + return price + class HostingOrder(AssignPermissionsMixin, models.Model): ORDER_APPROVED_STATUS = 'Approved' diff --git a/hosting/templates/hosting/bill_detail.html b/hosting/templates/hosting/bill_detail.html index 9e92d0e9..e34b2f11 100644 --- a/hosting/templates/hosting/bill_detail.html +++ b/hosting/templates/hosting/bill_detail.html @@ -4,7 +4,7 @@ {% block content %}
-
+
{# Adress bar #}
@@ -78,14 +78,14 @@
- {% trans "CH02 0900 0000 6071 8848 8%} + {% trans "CH02 0900 0000 6071 8848 8" %}
{% trans "POFICHBEXXX" %}
-
+
{% endblock %} diff --git a/hosting/templates/hosting/create_virtual_machine.html b/hosting/templates/hosting/create_virtual_machine.html index 3618fd6b..67a61ead 100644 --- a/hosting/templates/hosting/create_virtual_machine.html +++ b/hosting/templates/hosting/create_virtual_machine.html @@ -11,27 +11,22 @@
{% csrf_token %}
- Select VM: + Select VM Template:
Select VM Configuration: - + {% for config in configuration_options %} + {% endfor %}
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index bb80d566..459dcf0b 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -100,14 +100,17 @@
-

Cores {{request.session.template.cores}}

+

Cores {{request.session.specs.cpu|floatformat}}

-

Memory {{request.session.template.memory}} GiB

+

Memory {{request.session.specs.memory|floatformat}} GiB

-

Disk space {{request.session.template.disk_size}} GiB

+

Disk space {{request.session.specs.disk_size|floatformat}} GiB

Total

{{request.session.template.price }} CHF

+ class="pull-right">{{request.session.specs.price }} CHF

diff --git a/hosting/views.py b/hosting/views.py index 4f0699d3..04199136 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -25,14 +25,13 @@ from utils.stripe_utils import StripeUtils from utils.forms import BillingAddressForm, PasswordResetRequestForm, UserBillingAddressForm from utils.views import PasswordResetViewMixin, PasswordResetConfirmViewMixin, LoginViewMixin from utils.mailer import BaseEmail -from .models import HostingOrder, HostingBill, UserHostingKey +from .models import HostingOrder, HostingBill, HostingPlan, UserHostingKey from .forms import HostingUserSignupForm, HostingUserLoginForm, UserHostingKeyForm from .mixins import ProcessVMSelectionMixin from opennebula_api.models import OpenNebulaManager from opennebula_api.serializers import VirtualMachineSerializer,\ - VirtualMachineTemplateSerializer,\ - ImageSerializer + VirtualMachineTemplateSerializer from oca.exceptions import OpenNebulaException @@ -391,13 +390,12 @@ class PaymentVMView(LoginRequiredMixin, FormView): context = self.get_context_data() - specifications = request.session.get('template') + template = request.session.get('template') + specs = request.session.get('specs') - vm_template_id = specifications.get('id', 1) + vm_template_id = template.get('id', 1) - vm_image_id = request.session.get('image').get('id', None) - - final_price = specifications.get('price', 1) + final_price = specs.get('price') token = form.cleaned_data.get('token') @@ -445,7 +443,8 @@ class PaymentVMView(LoginRequiredMixin, FormView): # Create a vm using logged user vm_id = manager.create_vm( template_id=vm_template_id, - image_id=vm_image_id, + #XXX: Confi + specs=specs, ssh_key=user_key.public_key, ) @@ -573,11 +572,11 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View): manager = OpenNebulaManager() templates = manager.get_templates() - images = manager.get_images() + configuration_options = HostingPlan.get_serialized_configs() context = { 'templates': VirtualMachineTemplateSerializer(templates, many=True).data, - 'images' : ImageSerializer(images, many=True).data + 'configuration_options' : configuration_options, } return render(request, self.template_name, context) @@ -585,10 +584,11 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View): manager = OpenNebulaManager() template_id = request.POST.get('vm_template_id') template = manager.get_template(template_id) - image_id = request.POST.get('vm_image_id') - image = manager.get_image(image_id) + configuration_id = int(request.POST.get('configuration')) + configuration = HostingPlan.objects.get(id=configuration_id) request.session['template'] = VirtualMachineTemplateSerializer(template).data - #request.session['image'] = ImageSerializer(image).data + + request.session['specs'] = configuration.serialize() return redirect(reverse('hosting:payment')) @@ -701,6 +701,10 @@ class HostingBillDetailView(PermissionRequiredMixin, LoginRequiredMixin, DetailV # Get vms queryset = manager.get_vms() vms = VirtualMachineSerializer(queryset, many=True).data + # Set total price + bill = context['bill'] + bill.total_price = 0.0 + for vm in vms: + bill.total_price += vm['price'] context['vms'] = vms - return context diff --git a/opennebula_api/models.py b/opennebula_api/models.py index 2f8744e3..c2bdb9f7 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -109,25 +109,64 @@ class OpenNebulaManager(): except: return None - def create_vm(self, template_id, image_id=None, ssh_key=None): + def create_template(self, name, cores, memory, disk_size, core_price, memory_price, + disk_size_price, ssh='' ): + """Create and add a new template to opennebula. + :param name: A string representation describing the template. + Used as label in view. + :param cores: Amount of virtual cpu cores for the VM. + :param memory: Amount of RAM for the VM (GB) + :param disk_size: Amount of disk space for VM (GB) + :param core_price: Price of virtual cpu for the VM per core. + :param memory_price: Price of RAM for the VM per GB + :param disk_size_price: Price of disk space for VM per GB + :param ssh: User public ssh key + """ + + template_id = oca.VmTemplate.allocate( + self.oneadmin_client, + template_string_formatter.format( + name=name, + vcpu=cores, + cpu=0.1*cores, + size=1024 * disk_size, + memory=1024 * memory, + # * 10 because we set cpu to *0.1 + cpu_cost=10*core_price, + memory_cost=memory_price, + disk_cost=disk_size_price, + ssh=ssh + ) + ) + + def create_vm(self, template_id, specs, ssh_key=None): template = self.get_template(template_id) - vm_id = template.instantiate(name ='', pending=False, extra_template='') + vm_specs_formatter = """ + """ + vm_id = template.instantiate(name ='', + pending=False, + extra_template=vm_specs_formatter.format( + vcpu=int(specs['cpu']), + cpu=0.1* int(specs['cpu']), + size=1024 * int(specs['disk_size']), + memory=1024 * int(specs['memory']), + ssh=ssh_key + ) + ) - extra_template= """ - {ssh_key} - - """ - - extra_template.format(ssh_key=ssh_key) - - self.oneadmin_client.call( - oca.VirtualMachine.METHODS['update'], - vm_id, - extra_template, - # 0 = Replace / 1 = Merge - 1, - ) try: self.oneadmin_client.call( oca.VirtualMachine.METHODS['chown'], @@ -250,39 +289,3 @@ class OpenNebulaManager(): self.opennebula_user.id, new_password ) - - - def _get_image_pool(self): - try: - image_pool = oca.ImagePool(self.oneadmin_client) - image_pool.info() - #TODO: Replace with logger - except ConnectionRefusedError: - logger.info('Could not connect to host: {host} via protocol {protocol}'.format( - host=settings.OPENNEBULA_DOMAIN, - protocol=settings.OPENNEBULA_PROTOCOL) - ) - raise ConnectionRefusedError - return image_pool - - def get_images(self): - try: - public_images = [ - image - for image in self._get_image_pool() - #XXX: Change this - if 'READY' in image.str_state - ] - return public_images - except ConnectionRefusedError: - return [] - pass - - def get_image(self, image_id): - image_id = int(image_id) - try: - image_pool = self._get_image_pool() - return image_pool.get_by_id(image_id) - except: - return None - diff --git a/opennebula_api/serializers.py b/opennebula_api/serializers.py index 86da2f0b..911d0dfd 100644 --- a/opennebula_api/serializers.py +++ b/opennebula_api/serializers.py @@ -10,7 +10,7 @@ from .models import OpenNebulaManager class VirtualMachineTemplateSerializer(serializers.Serializer): """Serializer to map the virtual machine template instance into JSON format.""" id = serializers.IntegerField(read_only=True) - name = serializers.CharField() + name = serializers.SerializerMethodField() cores = serializers.IntegerField(source='template.vcpu') disk = serializers.IntegerField(write_only=True) disk_size = serializers.SerializerMethodField() @@ -63,6 +63,9 @@ class VirtualMachineTemplateSerializer(serializers.Serializer): def get_memory(self, obj): return int(obj.template.memory)/1024 + def get_name(self, obj): + return obj.name + class VirtualMachineSerializer(serializers.Serializer): """Serializer to map the virtual machine instance into JSON format.""" @@ -116,9 +119,3 @@ class VirtualMachineSerializer(serializers.Serializer): for disk in template.disks: price += int(disk.size)/1024 * float(template.disk_cost) return price - -class ImageSerializer(serializers.Serializer): - """Serializer to map the image instance into JSON format.""" - id = serializers.IntegerField(read_only=True) - name = serializers.CharField() -