Merge remote-tracking branch 'origin/issue-resource-op' into feature-fix-acls

Conflicts:
	circle/dashboard/views.py

circle/dashboard/static/dashboard/vm-details.js

@@ -11,13 +11,14 @@ $(function() {
   /* save resources */
   /* save resources */
   $('#vm-details-resources-save').click(function() {
   $('#vm-details-resources-save').click(function() {
     $('i.icon-save', this).removeClass("icon-save").addClass("icon-refresh icon-spin");
     $('i.icon-save', this).removeClass("icon-save").addClass("icon-refresh icon-spin");
+    var vm = $(this).data("vm");
     $.ajax({
     $.ajax({
       type: 'POST',
       type: 'POST',
-      url: location.href,
+      url: "/dashboard/vm/" + vm + "/op/resources_change/", 
       data: $('#vm-details-resources-form').serialize(),
       data: $('#vm-details-resources-form').serialize(),
       success: function(data, textStatus, xhr) {
       success: function(data, textStatus, xhr) {
-        addMessage(data['message'], 'success');
         $("#vm-details-resources-save i").removeClass('icon-refresh icon-spin').addClass("icon-save");
         $("#vm-details-resources-save i").removeClass('icon-refresh icon-spin').addClass("icon-save");
+        $('a[href="#activity"]').trigger("click");
       },
       },
       error: function(xhr, textStatus, error) {
       error: function(xhr, textStatus, error) {
         $("#vm-details-resources-save i").removeClass('icon-refresh icon-spin').addClass("icon-save");
         $("#vm-details-resources-save i").removeClass('icon-refresh icon-spin').addClass("icon-save");
@@ -330,7 +331,7 @@ function decideActivityRefresh() {
 
 
 /* unescapes html got via the request, also removes whitespaces and replaces all ' with " */
 /* unescapes html got via the request, also removes whitespaces and replaces all ' with " */
 function unescapeHTML(html) {
 function unescapeHTML(html) {
-  return html.replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&').replace(/&ndash;/g, "–").replace(/\//g, "").replace(/'/g, '"').replace(/ /g, '');
+  return html.replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&').replace(/&ndash;/g, "–").replace(/\//g, "").replace(/'/g, '"').replace(/&#39;/g, "'").replace(/ /g, '');
 }
 }
 
 
 /* the html page contains some tags that were modified via js (titles for example), we delete these
 /* the html page contains some tags that were modified via js (titles for example), we delete these
@@ -367,6 +368,14 @@ function checkNewActivity(only_status, runs) {
         $("[data-target=#_console]").attr("data-toggle", "_pill").attr("href", "#").parent("li").addClass("disabled");
         $("[data-target=#_console]").attr("data-toggle", "_pill").attr("href", "#").parent("li").addClass("disabled");
       }
       }
 
 
+      if(data['status'] == "STOPPED") {
+        $(".enabled-when-stopped").prop("disabled", false);
+        $(".hide-when-stopped").hide();
+      } else {
+        $(".enabled-when-stopped").prop("disabled", true);
+        $(".hide-when-stopped").show();
+      }
+
       if(runs > 0 && decideActivityRefresh()) {
       if(runs > 0 && decideActivityRefresh()) {
         setTimeout(
         setTimeout(
           function() {checkNewActivity(only_status, runs + 1)}, 
           function() {checkNewActivity(only_status, runs + 1)}, 

circle/dashboard/templates/dashboard/vm-detail/resources.html

@@ -33,11 +33,20 @@
   </div>
   </div>
 </p>
 </p>
 
 
+{% if can_change_resources %}
 <p class="row">
 <p class="row">
   <div class="col-sm-12">
   <div class="col-sm-12">
-    <button type="submit" class="btn btn-success btn-sm" id="vm-details-resources-save"><i class="icon-save"></i> {% trans "Save resources" %}</button>
+    <button type="submit" class="btn btn-success btn-sm enabled-when-stopped" id="vm-details-resources-save"
+      data-vm="{{ instance.pk }}"
+      {% if not op.resources_change %}disabled{% endif %}>
+      <i class="icon-save"></i> {% trans "Save resources" %}
+    </button>
+    <span class="hide-when-stopped"
+      {% if op.resources_change %}style="display: none;"{% endif %}
+      >{% trans "Stop your VM to change resources." %}</span>
   </div>
   </div>
 </p>
 </p>
+{% endif %}
 </form>
 </form>
 
 
 <hr />
 <hr />

circle/dashboard/views.py

@@ -293,13 +293,14 @@ class VmDetailView(CheckedDetailView):
         if self.request.user.is_superuser:
         if self.request.user.is_superuser:
             context['traits_form'] = TraitsForm(instance=instance)
             context['traits_form'] = TraitsForm(instance=instance)
             context['raw_data_form'] = RawDataForm(instance=instance)
             context['raw_data_form'] = RawDataForm(instance=instance)
+
+        # resources change perm
+        context['can_change_resources'] = self.request.user.has_perm(
+            "vm.change_resources")
+
         return context
         return context
 
 
     def post(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
-        if (request.POST.get('ram-size') and request.POST.get('cpu-count')
-                and request.POST.get('cpu-priority')):
-            return self.__set_resources(request)
-
         options = {
         options = {
             'change_password': self.__change_password,
             'change_password': self.__change_password,
             'new_name': self.__set_name,
             'new_name': self.__set_name,
@@ -327,33 +328,6 @@ class VmDetailView(CheckedDetailView):
             return redirect(reverse_lazy("dashboard.views.detail",
             return redirect(reverse_lazy("dashboard.views.detail",
                                          kwargs={'pk': self.object.pk}))
                                          kwargs={'pk': self.object.pk}))
 
 
-    def __set_resources(self, request):
-        self.object = self.get_object()
-        if not self.object.has_level(request.user, 'owner'):
-            raise PermissionDenied()
-        if not request.user.has_perm('vm.change_resources'):
-            raise PermissionDenied()
-
-        resources = {
-            'num_cores': request.POST.get('cpu-count'),
-            'ram_size': request.POST.get('ram-size'),
-            'max_ram_size': request.POST.get('ram-size'),  # TODO: max_ram
-            'priority': request.POST.get('cpu-priority')
-        }
-        Instance.objects.filter(pk=self.object.pk).update(**resources)
-
-        success_message = _("Resources successfully updated.")
-        if request.is_ajax():
-            response = {'message': success_message}
-            return HttpResponse(
-                json.dumps(response),
-                content_type="application/json"
-            )
-        else:
-            messages.success(request, success_message)
-            return redirect(reverse_lazy("dashboard.views.detail",
-                                         kwargs={'pk': self.object.pk}))
-
     def __set_name(self, request):
     def __set_name(self, request):
         self.object = self.get_object()
         self.object = self.get_object()
         if not self.object.has_level(request.user, 'owner'):
         if not self.object.has_level(request.user, 'owner'):
@@ -599,8 +573,9 @@ class VmOperationView(OperationView):
     model = Instance
     model = Instance
     context_object_name = 'instance'  # much simpler to mock object
     context_object_name = 'instance'  # much simpler to mock object
 
 
-    def post(self, request, *args, **kwargs):
-        resp = super(VmOperationView, self).post(request, *args, **kwargs)
+    def post(self, request, extra=None, *args, **kwargs):
+        resp = super(VmOperationView, self).post(request, extra, *args,
+                                                 **kwargs)
         if request.is_ajax():
         if request.is_ajax():
             store = messages.get_messages(request)
             store = messages.get_messages(request)
             store.used = True
             store.used = True
@@ -690,6 +665,29 @@ class VmSaveView(FormOperationMixin, VmOperationView):
     icon = 'save'
     icon = 'save'
     form_class = VmSaveForm
     form_class = VmSaveForm
 
 
+
+class VmResourcesChangeView(VmOperationView):
+    op = 'resources_change'
+    icon = "save"
+    show_in_toolbar = False
+
+    def post(self, request, extra=None, *args, **kwargs):
+        if extra is None:
+            extra = {}
+
+        resources = {
+            'num_cores': "cpu-count",
+            'priority': "cpu-priority",
+            'ram_size': "ram-size",
+            "max_ram_size": "ram-size",  # TODO
+        }
+        for k, v in resources.iteritems():
+            extra[k] = request.POST.get(v)
+
+        return super(VmResourcesChangeView, self).post(request, extra,
+                                                       *args, **kwargs)
+
+
 vm_ops = {
 vm_ops = {
     'reset': VmOperationView.factory(op='reset', icon='bolt'),
     'reset': VmOperationView.factory(op='reset', icon='bolt'),
     'deploy': VmOperationView.factory(op='deploy', icon='play'),
     'deploy': VmOperationView.factory(op='deploy', icon='play'),
@@ -703,6 +701,7 @@ vm_ops = {
     'wake_up': VmOperationView.factory(op='wake_up', icon='sun'),
     'wake_up': VmOperationView.factory(op='wake_up', icon='sun'),
     'create_disk': VmCreateDiskView,
     'create_disk': VmCreateDiskView,
     'download_disk': VmDownloadDiskView,
     'download_disk': VmDownloadDiskView,
+    'resources_change': VmResourcesChangeView,
 }
 }
 
 
 
 

circle/vm/operations.py

@@ -42,6 +42,7 @@ class InstanceOperation(Operation):
     acl_level = 'owner'
     acl_level = 'owner'
     async_operation = abortable_async_instance_operation
     async_operation = abortable_async_instance_operation
     host_cls = Instance
     host_cls = Instance
+    concurrency_check = True
 
 
     def __init__(self, instance):
     def __init__(self, instance):
         super(InstanceOperation, self).__init__(subject=instance)
         super(InstanceOperation, self).__init__(subject=instance)
@@ -73,7 +74,7 @@ class InstanceOperation(Operation):
         else:
         else:
             return InstanceActivity.create(
             return InstanceActivity.create(
                 code_suffix=self.activity_code_suffix, instance=self.instance,
                 code_suffix=self.activity_code_suffix, instance=self.instance,
-                user=user)
+                user=user, concurrency_check=self.concurrency_check)
 
 
 
 
 class AddInterfaceOperation(InstanceOperation):
 class AddInterfaceOperation(InstanceOperation):
@@ -600,3 +601,35 @@ class ScreenshotOperation(InstanceOperation):
 
 
 
 
 register_operation(ScreenshotOperation)
 register_operation(ScreenshotOperation)
+
+
+class ResourcesOperation(InstanceOperation):
+    activity_code_suffix = 'Resources change'
+    id = 'resources_change'
+    name = _("resources change")
+    description = _("Change resources")
+    acl_level = "owner"
+    concurrency_check = False
+
+    def check_precond(self):
+        super(ResourcesOperation, self).check_precond()
+        if self.instance.status not in ["STOPPED", "PENDING"]:
+            raise self.instance.WrongStateError(self.instance)
+
+    def check_auth(self, user):
+        if not user.has_perm('vm.change_resources'):
+            raise PermissionDenied()
+
+        super(InstanceOperation, self).check_auth(user=user)
+
+    def _operation(self, user, num_cores, ram_size, max_ram_size, priority):
+
+        self.instance.num_cores = num_cores
+        self.instance.ram_size = ram_size
+        self.instance.max_ram_size = max_ram_size
+        self.instance.priority = priority
+
+        self.instance.save()
+
+
+register_operation(ResourcesOperation)