diff --git a/Dockerfile b/Dockerfile index c3b122f..b04b9d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM phusion/baseimage:0.11 -MAINTAINER Jethro Yu RUN echo 'APT::Get::Clean=always;' >> /etc/apt/apt.conf.d/99AutomaticClean diff --git a/accounts/models.py b/accounts/models.py index 33b6251..02192fe 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -30,13 +30,13 @@ class UserSSHKey(models.Model): class UserAttributes(models.Model): user = models.OneToOneField(User, on_delete=models.CASCADE) can_clone_instances = models.BooleanField(default=True) - max_instances = models.IntegerField(default=1, + max_instances = models.IntegerField(default=2, help_text="-1 for unlimited. Any integer value", validators=[ MinValueValidator(-1), ]) max_cpus = models.IntegerField( - default=1, + default=2, help_text="-1 for unlimited. Any integer value", validators=[MinValueValidator(-1)], ) diff --git a/computes/templates/overview.html b/computes/templates/overview.html index 7b1965e..5f2e669 100644 --- a/computes/templates/overview.html +++ b/computes/templates/overview.html @@ -226,29 +226,30 @@ } } }); + if (Boolean({{ status }}) === true) { + window.setInterval(function graph_usage() { + $.getJSON('{% url 'compute_graph' compute_id %}', function (data) { + cpuChart.data.labels.push(data.timeline); + memChart.data.labels.push(data.timeline); - window.setInterval(function graph_usage() { - $.getJSON('{% url 'compute_graph' compute_id %}', function (data) { - cpuChart.data.labels.push(data.timeline); - memChart.data.labels.push(data.timeline); + cpuChart.data.datasets[0].data.push(data.cpudata); + if (cpuChart.data.datasets[0].data.length > 10){ + cpuChart.data.labels.shift(); + cpuChart.data.datasets[0].data.shift(); + } + memChart.options.scales.yAxes[0].ticks.max = parseInt(data.memdata.total / 1048576); + memChart.options.scales.yAxes[0].ticks.stepSize = parseInt(data.memdata.total / (1048576 * 5)); + memChart.data.datasets[0].data.push(parseInt(data.memdata.usage / 1048576)); - cpuChart.data.datasets[0].data.push(data.cpudata); - if (cpuChart.data.datasets[0].data.length > 10){ - cpuChart.data.labels.shift(); - cpuChart.data.datasets[0].data.shift(); - } - memChart.options.scales.yAxes[0].ticks.max = parseInt(data.memdata.total / 1048576); - memChart.options.scales.yAxes[0].ticks.stepSize = parseInt(data.memdata.total / (1048576 * 5)); - memChart.data.datasets[0].data.push(parseInt(data.memdata.usage / 1048576)); + if (memChart.data.datasets[0].data.length > 10){ + memChart.data.labels.shift(); + memChart.data.datasets[0].data.shift(); + } - if (memChart.data.datasets[0].data.length > 10){ - memChart.data.labels.shift(); - memChart.data.datasets[0].data.shift(); - } - - cpuChart.update(); - memChart.update(); - }); - }, 5000); + cpuChart.update(); + memChart.update(); + }); + }, 5000); + } {% endblock %} diff --git a/computes/views.py b/computes/views.py index 6d7a4bd..d96f439 100644 --- a/computes/views.py +++ b/computes/views.py @@ -86,7 +86,8 @@ def overview(request, compute_id): error_messages = [] compute = get_object_or_404(Compute, pk=compute_id) - + status = 'true' if connection_manager.host_is_up(compute.type, compute.hostname) is True else 'false' + try: conn = wvmHostDetails( compute.hostname, @@ -141,6 +142,14 @@ def compute_graph(request, compute_id): def get_compute_disk_buses(request, compute_id, arch, machine, disk): + """ + :param request: + :param compute_id: + :param arch: + :param machine: + :param disk: + :return: + """ data = dict() compute = get_object_or_404(Compute, pk=compute_id) try: @@ -169,6 +178,12 @@ def get_compute_disk_buses(request, compute_id, arch, machine, disk): def get_compute_machine_types(request, compute_id, arch): + """ + :param request: + :param compute_id: + :param arch: + :return: + """ data = dict() try: compute = get_object_or_404(Compute, pk=compute_id) @@ -186,6 +201,13 @@ def get_compute_machine_types(request, compute_id, arch): def get_compute_video_models(request, compute_id, arch, machine): + """ + :param request: + :param compute_id: + :param arch: + :param machine: + :return: + """ data = dict() try: compute = get_object_or_404(Compute, pk=compute_id) @@ -203,6 +225,13 @@ def get_compute_video_models(request, compute_id, arch, machine): def get_dom_capabilities(request, compute_id, arch, machine): + """ + :param request: + :param compute_id: + :param arch: + :param machine: + :return: + """ data = dict() try: compute = get_object_or_404(Compute, pk=compute_id) diff --git a/console/views.py b/console/views.py index cc4358a..bdfddd5 100644 --- a/console/views.py +++ b/console/views.py @@ -1,10 +1,10 @@ import re from django.shortcuts import render +from libvirt import libvirtError from instances.models import Instance from vrtManager.instance import wvmInstance from webvirtcloud.settings import WS_PUBLIC_PORT from webvirtcloud.settings import WS_PUBLIC_HOST -from libvirt import libvirtError def console(request): diff --git a/create/templates/create_instance_w1.html b/create/templates/create_instance_w1.html index a75a0b2..584ff05 100644 --- a/create/templates/create_instance_w1.html +++ b/create/templates/create_instance_w1.html @@ -125,7 +125,7 @@ } - + + - + - + - +