diff --git a/.gitignore b/.gitignore index 1a2a4cd..0238b9a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,11 @@ coverage.xml *.mo # saml -circle/attribute-maps/ +circle/attribute-maps circle/remote_metadata.xml -circle/samlcert.key -circle/samlcert.pem +circle/*.key +circle/*.pem + +# collected static files: +circle/static +circle/static_collected diff --git a/circle/circle/settings/base.py b/circle/circle/settings/base.py index 41dcd67..de25d05 100644 --- a/circle/circle/settings/base.py +++ b/circle/circle/settings/base.py @@ -5,6 +5,7 @@ from os.path import abspath, basename, dirname, join, normpath, isfile from sys import path from django.core.exceptions import ImproperlyConfigured +from django.utils.translation import ugettext_lazy as _ from json import loads @@ -93,7 +94,13 @@ except: TIME_ZONE = get_env_variable('DJANGO_TIME_ZONE', default=systz) # See: https://docs.djangoproject.com/en/dev/ref/settings/#language-code -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = get_env_variable("DJANGO_LANGUAGE_CODE", "en") + +# https://docs.djangoproject.com/en/dev/ref/settings/#languages +LANGUAGES = ( + ('en', _('English')), + ('hu', _('Hungarian')), +) # See: https://docs.djangoproject.com/en/dev/ref/settings/#site-id SITE_ID = 1 @@ -125,11 +132,6 @@ STATIC_ROOT = normpath(join(SITE_ROOT, 'static_collected')) # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url STATIC_URL = get_env_variable('DJANGO_STATIC_URL', default='/static/') -# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS -STATICFILES_DIRS = ( - normpath(join(SITE_ROOT, 'static')), -) - # See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', diff --git a/circle/common/operations.py b/circle/common/operations.py index 7a11e15..ed01532 100644 --- a/circle/common/operations.py +++ b/circle/common/operations.py @@ -13,6 +13,7 @@ class Operation(object): """ async_queue = 'localhost.man' required_perms = () + do_not_call_in_templates = True def __call__(self, **kwargs): return self.call(**kwargs) @@ -28,11 +29,11 @@ class Operation(object): def __prelude(self, kwargs): """This method contains the shared prelude of call and async. """ - skip_checks = kwargs.setdefault('system', False) + skip_auth_check = kwargs.setdefault('system', False) user = kwargs.setdefault('user', None) parent_activity = kwargs.pop('parent_activity', None) - if not skip_checks: + if not skip_auth_check: self.check_auth(user) self.check_precond() return self.create_activity(parent=parent_activity, user=user) @@ -42,8 +43,7 @@ class Operation(object): """ with activity_context(activity, on_abort=self.on_abort, on_commit=self.on_commit): - return self._operation(activity=activity, user=user, - **kwargs) + return self._operation(activity=activity, user=user, **kwargs) def _operation(self, activity, user, system, **kwargs): """This method is the operation's particular implementation. @@ -128,15 +128,46 @@ class OperatedMixin(object): raise AttributeError("%r object has no attribute %r" % (self.__class__.__name__, name)) - -def register_operation(target_cls, op_cls, op_id=None): + def get_available_operations(self, user): + """Yield Operations that match permissions of user and preconditions. + """ + for name in getattr(self, operation_registry_name, {}): + try: + op = getattr(self, name) + op.check_auth(user) + op.check_precond() + except: + pass # unavailable + else: + yield op + + +def register_operation(op_cls, op_id=None, target_cls=None): """Register the specified operation with the target class. You can optionally specify an ID to be used for the registration; otherwise, the operation class' 'id' attribute will be used. """ if op_id is None: - op_id = op_cls.id + try: + op_id = op_cls.id + except AttributeError: + raise NotImplementedError("Operations should specify an 'id' " + "attribute designating the name the " + "operation can be called by on its " + "host. Alternatively, provide the name " + "in the 'op_id' parameter to this call.") + + if target_cls is None: + try: + target_cls = op_cls.host_cls + except AttributeError: + raise NotImplementedError("Operations should specify a 'host_cls' " + "attribute designating the host class " + "the operation should be registered to. " + "Alternatively, provide the host class " + "in the 'target_cls' parameter to this " + "call.") if not issubclass(target_cls, OperatedMixin): raise TypeError("%r is not a subclass of %r" % diff --git a/circle/dashboard/admin.py b/circle/dashboard/admin.py new file mode 100644 index 0000000..65eeeee --- /dev/null +++ b/circle/dashboard/admin.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- + +from django import contrib +from django.contrib.auth.admin import UserAdmin +from django.contrib.auth.models import User + +from dashboard.models import Profile + + +class ProfileInline(contrib.admin.TabularInline): + model = Profile + + +UserAdmin.inlines = (ProfileInline, ) + +contrib.admin.site.unregister(User) +contrib.admin.site.register(User, UserAdmin) diff --git a/circle/dashboard/forms.py b/circle/dashboard/forms.py index 4141946..dcc0359 100644 --- a/circle/dashboard/forms.py +++ b/circle/dashboard/forms.py @@ -1,8 +1,11 @@ +from __future__ import absolute_import + from datetime import timedelta from django.contrib.auth.models import User from django.contrib.auth.forms import ( AuthenticationForm, PasswordResetForm, SetPasswordForm, + PasswordChangeForm, ) from crispy_forms.helper import FormHelper @@ -1075,9 +1078,20 @@ class MyProfileForm(forms.ModelForm): def helper(self): helper = FormHelper() helper.layout = Layout('preferred_language', ) - helper.add_input(Submit("submit", _("Save"))) + helper.add_input(Submit("submit", _("Change language"))) return helper def save(self, *args, **kwargs): value = super(MyProfileForm, self).save(*args, **kwargs) return value + + +class CirclePasswordChangeForm(PasswordChangeForm): + + @property + def helper(self): + helper = FormHelper() + helper.add_input(Submit("submit", _("Change password"), + css_class="btn btn-primary", + css_id="submit-password-button")) + return helper diff --git a/circle/dashboard/models.py b/circle/dashboard/models.py index 680b524..18c8533 100644 --- a/circle/dashboard/models.py +++ b/circle/dashboard/models.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from itertools import chain from logging import getLogger diff --git a/circle/dashboard/static/dashboard/vm-common.js b/circle/dashboard/static/dashboard/vm-common.js index 55599f3..c26738a 100644 --- a/circle/dashboard/static/dashboard/vm-common.js +++ b/circle/dashboard/static/dashboard/vm-common.js @@ -2,22 +2,21 @@ $(function() { - /* vm migrate */ - $('.vm-migrate').click(function(e) { - var icon = $(this).children("i"); - var vm = $(this).data("vm-pk"); - icon.removeClass("icon-truck").addClass("icon-spinner icon-spin"); + /* vm operations */ + $('#ops').on('click', '.operation.btn', function(e) { + var icon = $(this).children("i").addClass('icon-spinner icon-spin'); $.ajax({ type: 'GET', - url: '/dashboard/vm/' + vm + '/migrate/', + url: $(this).attr('href'), success: function(data) { - icon.addClass("icon-truck").removeClass("icon-spinner icon-spin"); + icon.removeClass("icon-spinner icon-spin"); $('body').append(data); - $('#create-modal').modal('show'); - $('#create-modal').on('hidden.bs.modal', function() { - $('#create-modal').remove(); + $('#confirmation-modal').modal('show'); + $('#confirmation-modal').on('hidden.bs.modal', function() { + $('#confirmation-modal').remove(); }); + $('#vm-migrate-node-list li').click(function(e) { var li = $(this).closest('li'); if (li.find('input').attr('disabled')) diff --git a/circle/dashboard/static/dashboard/vm-details.js b/circle/dashboard/static/dashboard/vm-details.js index 916f75b..dce3b55 100644 --- a/circle/dashboard/static/dashboard/vm-details.js +++ b/circle/dashboard/static/dashboard/vm-details.js @@ -211,6 +211,7 @@ function checkNewActivity(only_status, runs) { success: function(data) { if(!only_status) { $("#activity-timeline").html(data['activities']); + $("#ops").html(data['ops']); $("[title]").tooltip(); } diff --git a/circle/dashboard/tables.py b/circle/dashboard/tables.py index 301eb3b..14b508c 100644 --- a/circle/dashboard/tables.py +++ b/circle/dashboard/tables.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from django.contrib.auth.models import Group, User from django_tables2 import Table, A from django_tables2.columns import (TemplateColumn, Column, BooleanColumn, diff --git a/circle/dashboard/templates/dashboard/_base.html b/circle/dashboard/templates/dashboard/_base.html new file mode 100644 index 0000000..572e73f --- /dev/null +++ b/circle/dashboard/templates/dashboard/_base.html @@ -0,0 +1,20 @@ +{% extends "dashboard/base.html" %} +{% load i18n %} + +{% block content %} +
+
+
+

+ {% if title %} + {{ title }} + {% else %} + {% trans "Confirmation" %} + {% endif %} +

+
+
+ {{ body|safe|default:"(body missing from context.)" }} +
+
+{% endblock %} diff --git a/circle/dashboard/templates/dashboard/_modal.html b/circle/dashboard/templates/dashboard/_modal.html new file mode 100644 index 0000000..cc9ab39 --- /dev/null +++ b/circle/dashboard/templates/dashboard/_modal.html @@ -0,0 +1,12 @@ +{% load i18n %} + diff --git a/circle/dashboard/templates/dashboard/_vm-migrate.html b/circle/dashboard/templates/dashboard/_vm-migrate.html index e1ec92b..7fb36ce 100644 --- a/circle/dashboard/templates/dashboard/_vm-migrate.html +++ b/circle/dashboard/templates/dashboard/_vm-migrate.html @@ -1,10 +1,19 @@ +{% extends "dashboard/operate.html" %} {% load i18n %} {% load sizefieldtags %} -
- {% csrf_token %} -
- {% crispy form %} +
+
+
+ {% trans "Password change" %} + {% crispy forms.change_password %} +
+
+
+
+ {% trans "Language selection" %} + {% crispy forms.change_language %} +
+
+
diff --git a/circle/dashboard/templates/dashboard/vm-detail.html b/circle/dashboard/templates/dashboard/vm-detail.html index 060d309..3a8f89b 100644 --- a/circle/dashboard/templates/dashboard/vm-detail.html +++ b/circle/dashboard/templates/dashboard/vm-detail.html @@ -40,54 +40,8 @@ {% endif %}
-
-
- {% csrf_token %} - - -
-
- {% csrf_token %} - - -
-
- {% csrf_token %} - - -
-
- {% csrf_token %} - - -
-
- {% csrf_token %} - - -
-
- {% csrf_token %} - - -
-
- {% csrf_token %} - - -
- - - -
- {% csrf_token %} - - -
- - +
+ {% include "dashboard/vm-detail/_operations.html" %}

@@ -102,46 +56,6 @@
{{ instance.primary_host.get_fqdn }}

-
-
    -
  • - {% trans "Sleep" %}: - {% trans "Suspend virtual machine with memory dump." %} -
    • -
  • - {% trans "Wake up" %}: - {% trans "Wake up suspended machine." %} -
    • -
  • - {% trans "Shutdown" %}: - {% trans "Shutdown virtual machine with ACPI signal." %} -
    • -
  • - {% trans "Reboot (ctrl + alt + del)" %}: - {% trans "Reboot virtual machine with Ctrl+Alt+Del signal." %} -
    • -
  • - {% trans "Reset (power cycle)" %}: - {% trans "Reset virtual machine (reset button)" %} -
    • -
  • - {% trans "Shut off" %}: - {% trans "Shut off VM. (plug-out)" %} -
    • -
  • - {% trans "Migrate" %}: - {% trans "Live migrate running vm to another node." %} -
    • -
  • - {% trans "Save as template" %}: - {% trans "Shut down the virtual machine, and save it as a new template." %} -
    • -
  • - {% trans "Destroy" %}: - {% trans "Remove virtual machine and its networks." %} -
    • -
-
diff --git a/circle/dashboard/templates/dashboard/vm-detail/_operations.html b/circle/dashboard/templates/dashboard/vm-detail/_operations.html new file mode 100644 index 0000000..a28ad1a --- /dev/null +++ b/circle/dashboard/templates/dashboard/vm-detail/_operations.html @@ -0,0 +1,9 @@ +{% load i18n %} + +{% for op in ops %} + + + {{op.name}} + +{% endfor %} diff --git a/circle/dashboard/tests/test_mockedviews.py b/circle/dashboard/tests/test_mockedviews.py index 0dd9468..01e1826 100644 --- a/circle/dashboard/tests/test_mockedviews.py +++ b/circle/dashboard/tests/test_mockedviews.py @@ -3,10 +3,11 @@ from factory import Factory, Sequence from mock import patch, MagicMock from django.contrib.auth.models import User -# from django.core.exceptions import PermissionDenied +from django.core.exceptions import PermissionDenied from django.http import HttpRequest, Http404 -from dashboard.views import InstanceActivityDetail, InstanceActivity +from ..views import InstanceActivityDetail, InstanceActivity +from ..views import vm_ops, Instance class ViewUserTestCase(unittest.TestCase): @@ -36,6 +37,82 @@ class ViewUserTestCase(unittest.TestCase): self.assertEquals(view(request, pk=1234).render().status_code, 200) +class VmOperationViewTestCase(unittest.TestCase): + + def test_available(self): + request = FakeRequestFactory(superuser=True) + view = vm_ops['destroy'] + + with patch.object(view, 'get_object') as go: + inst = MagicMock(spec=Instance) + inst._meta.object_name = "Instance" + inst.destroy = Instance._ops['destroy'](inst) + go.return_value = inst + self.assertEquals( + view.as_view()(request, pk=1234).render().status_code, 200) + + def test_unpermitted(self): + request = FakeRequestFactory() + view = vm_ops['destroy'] + + with patch.object(view, 'get_object') as go: + inst = MagicMock(spec=Instance) + inst._meta.object_name = "Instance" + inst.destroy = Instance._ops['destroy'](inst) + inst.has_level.return_value = False + go.return_value = inst + with self.assertRaises(PermissionDenied): + view.as_view()(request, pk=1234).render() + + def test_migrate(self): + request = FakeRequestFactory(POST={'node': 1}) + view = vm_ops['migrate'] + + with patch.object(view, 'get_object') as go, \ + patch('dashboard.views.messages') as msg, \ + patch('dashboard.views.get_object_or_404') as go4: + inst = MagicMock(spec=Instance) + inst._meta.object_name = "Instance" + inst.migrate = Instance._ops['migrate'](inst) + inst.migrate.async = MagicMock() + inst.has_level.return_value = True + go.return_value = inst + go4.return_value = MagicMock() + assert view.as_view()(request, pk=1234)['location'] + assert not msg.error.called + + def test_migrate_failed(self): + request = FakeRequestFactory(POST={'node': 1}) + view = vm_ops['migrate'] + + with patch.object(view, 'get_object') as go, \ + patch('dashboard.views.messages') as msg, \ + patch('dashboard.views.get_object_or_404') as go4: + inst = MagicMock(spec=Instance) + inst._meta.object_name = "Instance" + inst.migrate = Instance._ops['migrate'](inst) + inst.migrate.async = MagicMock() + inst.migrate.async.side_effect = Exception + inst.has_level.return_value = True + go.return_value = inst + go4.return_value = MagicMock() + assert view.as_view()(request, pk=1234)['location'] + assert msg.error.called + + def test_migrate_template(self): + request = FakeRequestFactory() + view = vm_ops['migrate'] + + with patch.object(view, 'get_object') as go: + inst = MagicMock(spec=Instance) + inst._meta.object_name = "Instance" + inst.migrate = Instance._ops['migrate'](inst) + inst.has_level.return_value = True + go.return_value = inst + self.assertEquals( + view.as_view()(request, pk=1234).render().status_code, 200) + + def FakeRequestFactory(*args, **kwargs): ''' FakeRequestFactory, FakeMessages and FakeRequestContext are good for mocking out django views; they are MUCH faster than the Django test client. @@ -48,12 +125,12 @@ def FakeRequestFactory(*args, **kwargs): request = HttpRequest() request.user = user request.session = kwargs.get('session', {}) - if kwargs.get('POST'): + if kwargs.get('POST') is not None: request.method = 'POST' request.POST = kwargs.get('POST') else: request.method = 'GET' - request.POST = kwargs.get('GET', {}) + request.GET = kwargs.get('GET', {}) return request diff --git a/circle/dashboard/tests/test_views.py b/circle/dashboard/tests/test_views.py index f8de2af..891588a 100644 --- a/circle/dashboard/tests/test_views.py +++ b/circle/dashboard/tests/test_views.py @@ -1,9 +1,11 @@ +from unittest import skip from django.test import TestCase from django.test.client import Client from django.contrib.auth.models import User, Group from django.core.exceptions import SuspiciousOperation from django.core.urlresolvers import reverse from django.contrib.auth.models import Permission +from django.contrib.auth import authenticate from vm.models import Instance, InstanceTemplate, Lease, Node, Trait from vm.operations import WakeUpOperation @@ -277,6 +279,7 @@ class VmDetailTest(LoginMixin, TestCase): self.assertEqual(response.status_code, 403) self.assertEqual(disks, inst.disks.count()) + @skip("until fix merged") def test_permitted_vm_disk_add(self): c = Client() self.login(c, "user1") @@ -493,9 +496,11 @@ class VmDetailTest(LoginMixin, TestCase): mock_method.side_effect = inst.wake_up inst.manual_state_change('RUNNING') inst.set_level(self.u2, 'owner') - self.assertRaises(inst.WrongStateError, c.post, - "/dashboard/vm/1/", {'wake_up': True}) - self.assertEqual(inst.status, 'RUNNING') + with patch('dashboard.views.messages') as msg: + c.post("/dashboard/vm/1/op/wake_up/") + assert msg.error.called + inst = Instance.objects.get(pk=1) + self.assertEqual(inst.status, 'RUNNING') # mocked anyway assert mock_method.called def test_permitted_wake_up(self): @@ -509,7 +514,9 @@ class VmDetailTest(LoginMixin, TestCase): inst.get_remote_queue_name = Mock(return_value='test') inst.manual_state_change('SUSPENDED') inst.set_level(self.u2, 'owner') - response = c.post("/dashboard/vm/1/", {'wake_up': True}) + with patch('dashboard.views.messages') as msg: + response = c.post("/dashboard/vm/1/op/wake_up/") + assert not msg.error.called self.assertEqual(response.status_code, 302) self.assertEqual(inst.status, 'RUNNING') assert new_wake_up.called @@ -521,8 +528,11 @@ class VmDetailTest(LoginMixin, TestCase): inst = Instance.objects.get(pk=1) inst.manual_state_change('SUSPENDED') inst.set_level(self.u2, 'user') - response = c.post("/dashboard/vm/1/", {'wake_up': True}) - self.assertEqual(response.status_code, 403) + with patch('dashboard.views.messages') as msg: + response = c.post("/dashboard/vm/1/op/wake_up/") + assert msg.error.called + self.assertEqual(response.status_code, 302) + inst = Instance.objects.get(pk=1) self.assertEqual(inst.status, 'SUSPENDED') def test_non_existing_template_get(self): @@ -982,3 +992,68 @@ class IndexViewTest(LoginMixin, TestCase): self.u1.profile.notify("urgent", "dashboard/test_message.txt", ) response = c.get("/dashboard/") self.assertEqual(response.context['NEW_NOTIFICATIONS_COUNT'], 1) + + +class ProfileViewTest(LoginMixin, TestCase): + + def setUp(self): + self.u1 = User.objects.create(username='user1') + self.u1.set_password('password') + self.u1.save() + self.p1 = Profile.objects.create(user=self.u1) + self.p1.save() + + def test_permitted_language_change(self): + c = Client() + self.login(c, "user1") + old_language_cookie_value = c.cookies['django_language'].value + old_language_db_value = self.u1.profile.preferred_language + response = c.post("/dashboard/profile/", { + 'preferred_language': "hu", + }) + + self.assertEqual(response.status_code, 302) + self.assertNotEqual(old_language_cookie_value, + c.cookies['django_language'].value) + self.assertNotEqual(old_language_db_value, + User.objects.get( + username="user1").profile.preferred_language) + + def test_permitted_valid_password_change(self): + c = Client() + self.login(c, "user1") + + c.post("/dashboard/profile/", { + 'old_password': "password", + 'new_password1': "asd", + 'new_password2': "asd", + }) + + self.assertIsNone(authenticate(username="user1", password="password")) + self.assertIsNotNone(authenticate(username="user1", password="asd")) + + def test_permitted_invalid_password_changes(self): + c = Client() + self.login(c, "user1") + + # wrong current password + c.post("/dashboard/profile/", { + 'old_password': "password1", + 'new_password1': "asd", + 'new_password2': "asd", + }) + + self.assertIsNotNone(authenticate(username="user1", + password="password")) + self.assertIsNone(authenticate(username="user1", password="asd")) + + # wrong pw confirmation + c.post("/dashboard/profile/", { + 'old_password': "password", + 'new_password1': "asd", + 'new_password2': "asd1", + }) + + self.assertIsNotNone(authenticate(username="user1", + password="password")) + self.assertIsNone(authenticate(username="user1", password="asd")) diff --git a/circle/dashboard/urls.py b/circle/dashboard/urls.py index 24cb064..693ca7c 100644 --- a/circle/dashboard/urls.py +++ b/circle/dashboard/urls.py @@ -1,4 +1,5 @@ -from django.conf.urls import patterns, url +from __future__ import absolute_import +from django.conf.urls import patterns, url, include from vm.models import Instance from .views import ( @@ -40,6 +41,7 @@ urlpatterns = patterns( url(r"^template/clone/(?P\d+)/$", TemplateClone.as_view(), name="dashboard.views.template-clone"), + url(r'^vm/(?P\d+)/op/', include('dashboard.vm.urls')), url(r'^vm/(?P\d+)/remove_port/(?P\d+)/$', PortDelete.as_view(), name='dashboard.views.remove-port'), url(r'^vm/(?P\d+)/$', VmDetailView.as_view(), diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py index 57e3fc2..4484188 100644 --- a/circle/dashboard/views.py +++ b/circle/dashboard/views.py @@ -1,10 +1,9 @@ -from __future__ import unicode_literals +from __future__ import unicode_literals, absolute_import from os import getenv import json import logging import re -from datetime import datetime import requests from django.conf import settings @@ -37,7 +36,8 @@ from braces.views import ( from .forms import ( CircleAuthenticationForm, DiskAddForm, HostForm, LeaseForm, MyProfileForm, - NodeForm, TemplateForm, TraitForm, VmCustomizeForm, TemplateCloneForm + NodeForm, TemplateForm, TraitForm, VmCustomizeForm, TemplateCloneForm, + CirclePasswordChangeForm ) from .tables import (NodeListTable, NodeVmListTable, TemplateListTable, LeaseListTable, GroupListTable,) @@ -47,7 +47,7 @@ from vm.models import ( ) from storage.models import Disk from firewall.models import Vlan, Host, Rule -from dashboard.models import Favourite, Profile +from .models import Favourite, Profile logger = logging.getLogger(__name__) @@ -203,7 +203,8 @@ class VmDetailView(CheckedDetailView): context.update({ 'graphite_enabled': VmGraphView.get_graphite_url() is not None, 'vnc_url': reverse_lazy("dashboard.views.detail-vnc", - kwargs={'pk': self.object.pk}) + kwargs={'pk': self.object.pk}), + 'ops': get_operations(instance, self.request.user), }) # activity data @@ -242,14 +243,6 @@ class VmDetailView(CheckedDetailView): 'to_remove': self.__remove_tag, 'port': self.__add_port, 'new_network_vlan': self.__new_network, - 'save_as': self.__save_as, - 'shut_down': self.__shut_down, - 'sleep': self.__sleep, - 'wake_up': self.__wake_up, - 'deploy': self.__deploy, - 'reset': self.__reset, - 'reboot': self.__reboot, - 'shut_off': self.__shut_off, } for k, v in options.iteritems(): if request.POST.get(k) is not None: @@ -404,8 +397,7 @@ class VmDetailView(CheckedDetailView): if not vlan.has_level(request.user, 'user'): raise PermissionDenied() try: - Interface.create(vlan=vlan, instance=self.object, - managed=vlan.managed, owner=request.user) + self.object.add_interface(vlan=vlan, user=request.user) messages.success(request, _("Successfully added new interface!")) except Exception, e: error = u' '.join(e.messages) @@ -414,75 +406,132 @@ class VmDetailView(CheckedDetailView): return redirect("%s#network" % reverse_lazy( "dashboard.views.detail", kwargs={'pk': self.object.pk})) - def __save_as(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() - date = datetime.now().strftime("%Y-%m-%d %H:%M") - new_name = "Saved from %s (#%d) at %s" % ( - self.object.name, self.object.pk, date - ) - self.object.save_as_template.async(name=new_name, - user=request.user) - messages.success(request, _("Saving instance as template!")) - return redirect("%s#activity" % self.object.get_absolute_url()) +class OperationView(DetailView): - def __shut_down(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() + template_name = 'dashboard/operate.html' - self.object.shutdown.async(user=request.user) - return redirect("%s#activity" % self.object.get_absolute_url()) + @property + def name(self): + return self.get_op().name - def __sleep(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() + @property + def description(self): + return self.get_op().description - self.object.sleep.async(user=request.user) - return redirect("%s#activity" % self.object.get_absolute_url()) + @classmethod + def get_urlname(cls): + return 'dashboard.vm.op.%s' % cls.op - def __wake_up(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() + def get_url(self): + return reverse(self.get_urlname(), args=(self.get_object().pk, )) - self.object.wake_up.async(user=request.user) - return redirect("%s#activity" % self.object.get_absolute_url()) + def get_wrapper_template_name(self): + if self.request.is_ajax(): + return 'dashboard/_modal.html' + else: + return 'dashboard/_base.html' - def __deploy(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() + @classmethod + def get_op_by_object(cls, obj): + return getattr(obj, cls.op) - self.object.deploy.async(user=request.user) - return redirect("%s#activity" % self.object.get_absolute_url()) + def get_op(self): + if not hasattr(self, '_opobj'): + setattr(self, '_opobj', getattr(self.get_object(), self.op)) + return self._opobj - def __reset(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() + def get_context_data(self, **kwargs): + ctx = super(OperationView, self).get_context_data(**kwargs) + ctx['op'] = self.get_op() + ctx['url'] = self.request.path + return ctx - self.object.reset.async(user=request.user) - return redirect("%s#activity" % self.object.get_absolute_url()) + def get(self, request, *args, **kwargs): + self.get_op().check_auth(request.user) + response = super(OperationView, self).get(request, *args, **kwargs) + response.render() + response.content = render_to_string(self.get_wrapper_template_name(), + {'body': response.content}) + return response - def __reboot(self, request): + def post(self, request, extra=None, *args, **kwargs): self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() - - self.object.reboot.async(user=request.user) + if extra is None: + extra = {} + try: + self.get_op().async(user=request.user, **extra) + except Exception as e: + messages.error(request, _('Could not start operation.')) + logger.error(e) return redirect("%s#activity" % self.object.get_absolute_url()) - def __shut_off(self, request): - self.object = self.get_object() - if not self.object.has_level(request.user, 'owner'): - raise PermissionDenied() + @classmethod + def factory(cls, op, icon='cog'): + return type(str(cls.__name__ + op), + (cls, ), {'op': op, 'icon': icon}) - self.object.shut_off.async(user=request.user) - return redirect("%s#activity" % self.object.get_absolute_url()) + @classmethod + def bind_to_object(cls, instance): + v = cls() + v.get_object = lambda: instance + return v + + +class VmOperationView(OperationView): + + model = Instance + + +class VmMigrateView(VmOperationView): + + op = 'migrate' + icon = 'truck' + template_name = 'dashboard/_vm-migrate.html' + + def get_context_data(self, **kwargs): + ctx = super(VmOperationView, self).get_context_data(**kwargs) + ctx['nodes'] = [n for n in Node.objects.filter(enabled=True) + if n.state == "ONLINE"] + return ctx + + def post(self, request, extra=None, *args, **kwargs): + if extra is None: + extra = {} + node = self.request.POST.get("node") + if node: + node = get_object_or_404(Node, pk=node) + extra["to_node"] = node + return super(VmMigrateView, self).post(request, extra, *args, **kwargs) + + +vm_ops = { + 'reset': VmOperationView.factory(op='reset', icon='bolt'), + 'deploy': VmOperationView.factory(op='deploy', icon='play'), + 'migrate': VmMigrateView, + 'reboot': VmOperationView.factory(op='reboot', icon='refresh'), + 'shut_off': VmOperationView.factory(op='shut_off', icon='ban-circle'), + 'shutdown': VmOperationView.factory(op='shutdown', icon='off'), + 'save_as_template': VmOperationView.factory( + op='save_as_template', icon='save'), + 'destroy': VmOperationView.factory(op='destroy', icon='remove'), + 'sleep': VmOperationView.factory(op='sleep', icon='moon'), + 'wake_up': VmOperationView.factory(op='wake_up', icon='sun'), +} + + +def get_operations(instance, user): + ops = [] + for k, v in vm_ops.iteritems(): + try: + op = v.get_op_by_object(instance) + op.check_auth(user) + op.check_precond() + except: + pass # unavailable + else: + ops.append(v.bind_to_object(instance)) + return ops class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin, DetailView): @@ -1615,8 +1664,11 @@ class VmMassDelete(LoginRequiredMixin, View): raise PermissionDenied() # no need for rollback or proper # error message, this can't # normally happen. - i.destroy.async(user=request.user) - names.append(i.name) + try: + i.destroy.async(user=request.user) + names.append(i.name) + except Exception as e: + logger.error(e) success_message = _("Mass delete complete, the following VMs were " "deleted: %s!") % u', '.join(names) @@ -1691,23 +1743,28 @@ def vm_activity(request, pk): raise PermissionDenied() response = {} - only_status = request.GET.get("only_status") + only_status = request.GET.get("only_status", "false") response['human_readable_status'] = instance.get_status_display() response['status'] = instance.status response['icon'] = instance.get_status_icon() if only_status == "false": # instance activity context = { + 'instance': instance, 'activities': InstanceActivity.objects.filter( instance=instance, parent=None - ).order_by('-started').select_related() + ).order_by('-started').select_related(), + 'ops': get_operations(instance, request.user), } - activities = render_to_string( + response['activities'] = render_to_string( "dashboard/vm-detail/_activity-timeline.html", RequestContext(request, context), ) - response['activities'] = activities + response['ops'] = render_to_string( + "dashboard/vm-detail/_operations.html", + RequestContext(request, context), + ) return HttpResponse( json.dumps(response), @@ -2117,40 +2174,6 @@ class NotificationView(LoginRequiredMixin, TemplateView): return response -class VmMigrateView(SuperuserRequiredMixin, TemplateView): - - def get_template_names(self): - if self.request.is_ajax(): - return ['dashboard/modal-wrapper.html'] - else: - return ['dashboard/nojs-wrapper.html'] - - def get(self, request, form=None, *args, **kwargs): - context = self.get_context_data(**kwargs) - vm = Instance.objects.get(pk=kwargs['pk']) - context.update({ - 'template': 'dashboard/_vm-migrate.html', - 'box_title': _('Migrate %(name)s' % {'name': vm.name}), - 'ajax_title': True, - 'vm': vm, - 'nodes': [n for n in Node.objects.filter(enabled=True) - if n.state == "ONLINE"] - }) - return self.render_to_response(context) - - def post(self, *args, **kwargs): - node = self.request.POST.get("node") - vm = Instance.objects.get(pk=kwargs['pk']) - - if node: - node = Node.objects.get(pk=node) - vm.migrate.async(to_node=node, user=self.request.user) - else: - messages.error(self.request, _("You didn't select a node!")) - - return redirect("%s#activity" % vm.get_absolute_url()) - - def circle_login(request): authentication_form = CircleAuthenticationForm extra_context = { @@ -2204,9 +2227,17 @@ class DiskAddView(TemplateView): class MyPreferencesView(UpdateView): - model = Profile - form_class = MyProfileForm + + def get_context_data(self, *args, **kwargs): + context = super(MyPreferencesView, self).get_context_data(*args, + **kwargs) + context['forms'] = { + 'change_password': CirclePasswordChangeForm( + user=self.request.user), + 'change_language': MyProfileForm(instance=self.get_object()), + } + return context def get_object(self, queryset=None): if self.request.user.is_anonymous(): @@ -2216,10 +2247,36 @@ class MyPreferencesView(UpdateView): except Profile.DoesNotExist: raise Http404(_("You don't have a profile.")) - def form_valid(self, form): - response = super(MyPreferencesView, self).form_valid(form) - set_language_cookie(self.request, response) - return response + def post(self, request, *args, **kwargs): + self.ojbect = self.get_object() + redirect_response = HttpResponseRedirect( + reverse("dashboard.views.profile")) + if "preferred_language" in request.POST: + form = MyProfileForm(request.POST, instance=self.get_object()) + if form.is_valid(): + lang = form.cleaned_data.get("preferred_language") + set_language_cookie(self.request, redirect_response, lang) + form.save() + else: + form = CirclePasswordChangeForm(user=request.user, + data=request.POST) + if form.is_valid(): + form.save() + + if form.is_valid(): + return redirect_response + else: + return self.get(request, form=form, *args, **kwargs) + + def get(self, request, form=None, *args, **kwargs): + # if this is not here, it won't work + self.object = self.get_object() + context = self.get_context_data(*args, **kwargs) + if form is not None: + # a little cheating, users can't post invalid + # language selection forms (without modifying the HTML) + context['forms']['change_password'] = form + return self.render_to_response(context) def set_language_cookie(request, response, lang=None): diff --git a/circle/dashboard/vm/__init__.py b/circle/dashboard/vm/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/circle/dashboard/vm/__init__.py diff --git a/circle/dashboard/vm/urls.py b/circle/dashboard/vm/urls.py new file mode 100644 index 0000000..d421d0c --- /dev/null +++ b/circle/dashboard/vm/urls.py @@ -0,0 +1,8 @@ +from django.conf.urls import patterns, url + +from ..views import vm_ops + + +urlpatterns = patterns('', + *(url(r'^%s/$' % op, v.as_view(), name=v.get_urlname()) + for op, v in vm_ops.iteritems())) diff --git a/circle/firewall/admin.py b/circle/firewall/admin.py index f1850c5..b0dcf04 100644 --- a/circle/firewall/admin.py +++ b/circle/firewall/admin.py @@ -38,7 +38,7 @@ class HostAdmin(admin.ModelAdmin): class HostInline(contrib.admin.TabularInline): model = Host - fields = ('hostname', 'ipv4', 'ipv6', 'pub_ipv4', 'mac', 'shared_ip', + fields = ('hostname', 'ipv4', 'ipv6', 'external_ipv4', 'mac', 'shared_ip', 'owner', 'reverse') diff --git a/circle/firewall/iptables.py b/circle/firewall/iptables.py index 48cd3f3..0414ef7 100644 --- a/circle/firewall/iptables.py +++ b/circle/firewall/iptables.py @@ -89,7 +89,7 @@ class IptChain(object): self.rules.add(rule) def sort(self): - return sorted(list(self.rules)) + return sorted(list(self.rules), reverse=True) def __len__(self): return len(self.rules) diff --git a/circle/firewall/migrations/0045_auto__del_field_host_pub_ipv4__add_field_host_external_ipv4__del_field.py b/circle/firewall/migrations/0045_auto__del_field_host_pub_ipv4__add_field_host_external_ipv4__del_field.py index 8aeedfb..8fa4e87 100644 --- a/circle/firewall/migrations/0045_auto__del_field_host_pub_ipv4__add_field_host_external_ipv4__del_field.py +++ b/circle/firewall/migrations/0045_auto__del_field_host_pub_ipv4__add_field_host_external_ipv4__del_field.py @@ -32,8 +32,8 @@ class Migration(SchemaMigration): if rule.nat: # swap tmp = rule.dport -# rule.dport = rule.nat_external_port -# rule.nat_external_port = tmp + rule.dport = rule.nat_external_port + rule.nat_external_port = tmp if rule.direction == '0': rule.direction = 'out' elif rule.direction == '1': diff --git a/circle/storage/admin.py b/circle/storage/admin.py index 46f2841..f5dd46b 100644 --- a/circle/storage/admin.py +++ b/circle/storage/admin.py @@ -5,7 +5,8 @@ from .models import Disk, DataStore, DiskActivity class DiskAdmin(contrib.admin.ModelAdmin): - list_display = ('name', 'datastore') + list_display = ('id', 'name', 'base', 'type', 'datastore') + ordering = ('-id', ) class DataStoreAdmin(contrib.admin.ModelAdmin): diff --git a/circle/vm/models/instance.py b/circle/vm/models/instance.py index ef4a4d7..7b88704 100644 --- a/circle/vm/models/instance.py +++ b/circle/vm/models/instance.py @@ -22,7 +22,6 @@ from taggit.managers import TaggableManager from acl.models import AclBase from common.operations import OperatedMixin -from storage.models import Disk from ..tasks import vm_tasks, agent_tasks from .activity import (ActivityInProgressError, instance_activity, InstanceActivity) @@ -118,8 +117,9 @@ class InstanceTemplate(AclBase, VirtualMachineDescModel, TimeStampedModel): description = TextField(verbose_name=_('description'), blank=True) parent = ForeignKey('self', null=True, blank=True, verbose_name=_('parent template'), + on_delete=SET_NULL, help_text=_('Template which this one is derived of.')) - disks = ManyToManyField(Disk, verbose_name=_('disks'), + disks = ManyToManyField('storage.Disk', verbose_name=_('disks'), related_name='template_set', help_text=_('Disks which are to be mounted.')) owner = ForeignKey(User) @@ -211,7 +211,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin, related_name='instance_set', help_text=_("Current hypervisor of this instance."), verbose_name=_('host node')) - disks = ManyToManyField(Disk, related_name='instance_set', + disks = ManyToManyField('storage.Disk', related_name='instance_set', help_text=_("Set of mounted disks."), verbose_name=_('disks')) vnc_port = IntegerField(blank=True, default=None, null=True, diff --git a/circle/vm/models/network.py b/circle/vm/models/network.py index 94767d0..8a07d4a 100644 --- a/circle/vm/models/network.py +++ b/circle/vm/models/network.py @@ -58,10 +58,6 @@ class Interface(Model): return 'cloud-' + str(self.instance.id) + '-' + str(self.vlan.vid) @property - def destroyed(self): - return self.instance.destroyed_at - - @property def mac(self): try: return self.host.mac @@ -120,10 +116,10 @@ class Interface(Model): host.owner = owner if vlan.network_type == 'public': host.shared_ip = False - host.pub_ipv4 = None + host.external_ipv4 = None elif vlan.network_type == 'portforward': host.shared_ip = True - host.pub_ipv4 = vlan.snat_ip + host.external_ipv4 = vlan.snat_ip host.full_clean() host.save() host.enable_net() @@ -138,34 +134,16 @@ class Interface(Model): return iface def deploy(self): - if self.destroyed: - from .instance import Instance - raise Instance.InstanceDestroyedError(self.instance, - "The associated instance " - "(%s) has already been " - "destroyed" % self.instance) - - net_tasks.create.apply_async( - args=[self.get_vmnetwork_desc()], - queue=self.instance.get_remote_queue_name('net')) + queue_name = self.instance.get_remote_queue_name('net') + return net_tasks.create.apply_async(args=[self.get_vmnetwork_desc()], + queue=queue_name).get() def shutdown(self): - if self.destroyed: - from .instance import Instance - raise Instance.InstanceDestroyedError(self.instance, - "The associated instance " - "(%s) has already been " - "destroyed" % self.instance) - queue_name = self.instance.get_remote_queue_name('net') - net_tasks.destroy.apply_async(args=[self.get_vmnetwork_desc()], - queue=queue_name) + return net_tasks.destroy.apply_async(args=[self.get_vmnetwork_desc()], + queue=queue_name).get() def destroy(self): - if self.destroyed: - return - - self.shutdown() if self.host is not None: self.host.delete() diff --git a/circle/vm/operations.py b/circle/vm/operations.py index b579b5a..3a8f37e 100644 --- a/circle/vm/operations.py +++ b/circle/vm/operations.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, unicode_literals from logging import getLogger +from re import search from django.core.exceptions import PermissionDenied from django.utils import timezone @@ -10,7 +11,8 @@ from celery.exceptions import TimeLimitExceeded from common.operations import Operation, register_operation from .tasks.local_tasks import async_instance_operation, async_node_operation from .models import ( - Instance, InstanceActivity, InstanceTemplate, Node, NodeActivity, + Instance, InstanceActivity, InstanceTemplate, Interface, Node, + NodeActivity, ) @@ -20,6 +22,7 @@ logger = getLogger(__name__) class InstanceOperation(Operation): acl_level = 'owner' async_operation = async_instance_operation + host_cls = Instance def __init__(self, instance): super(InstanceOperation, self).__init__(subject=instance) @@ -54,8 +57,27 @@ class InstanceOperation(Operation): user=user) -def register_instance_operation(op_cls, op_id=None): - return register_operation(Instance, op_cls, op_id) +class AddInterfaceOperation(InstanceOperation): + activity_code_suffix = 'add_interface' + id = 'add_interface' + name = _("add interface") + description = _("Add a new network interface for the specified VLAN to " + "the VM.") + + def _operation(self, activity, user, system, vlan, managed=None): + if managed is None: + managed = vlan.managed + + net = Interface.create(base_activity=activity, instance=self.instance, + managed=managed, owner=user, vlan=vlan) + + if self.instance.is_running: + net.deploy() + + return net + + +register_operation(AddInterfaceOperation) class DeployOperation(InstanceOperation): @@ -63,6 +85,7 @@ class DeployOperation(InstanceOperation): id = 'deploy' name = _("deploy") description = _("Deploy new virtual machine with network.") + icon = 'play' def on_commit(self, activity): activity.resultant_state = 'RUNNING' @@ -91,7 +114,7 @@ class DeployOperation(InstanceOperation): self.instance.renew(which='both', base_activity=activity) -register_instance_operation(DeployOperation) +register_operation(DeployOperation) class DestroyOperation(InstanceOperation): @@ -99,6 +122,7 @@ class DestroyOperation(InstanceOperation): id = 'destroy' name = _("destroy") description = _("Destroy virtual machine and its networks.") + icon = 'remove' def on_commit(self, activity): activity.resultant_state = 'DESTROYED' @@ -107,6 +131,7 @@ class DestroyOperation(InstanceOperation): if self.instance.node: # Destroy networks with activity.sub_activity('destroying_net'): + self.instance.shutdown_net() self.instance.destroy_net() # Delete virtual machine @@ -131,7 +156,7 @@ class DestroyOperation(InstanceOperation): self.instance.save() -register_instance_operation(DestroyOperation) +register_operation(DestroyOperation) class MigrateOperation(InstanceOperation): @@ -139,6 +164,7 @@ class MigrateOperation(InstanceOperation): id = 'migrate' name = _("migrate") description = _("Live migrate running VM to another node.") + icon = 'truck' def _operation(self, activity, user, system, to_node=None, timeout=120): if not to_node: @@ -161,7 +187,7 @@ class MigrateOperation(InstanceOperation): self.instance.deploy_net() -register_instance_operation(MigrateOperation) +register_operation(MigrateOperation) class RebootOperation(InstanceOperation): @@ -169,12 +195,30 @@ class RebootOperation(InstanceOperation): id = 'reboot' name = _("reboot") description = _("Reboot virtual machine with Ctrl+Alt+Del signal.") + icon = 'refresh' def _operation(self, activity, user, system, timeout=5): self.instance.reboot_vm(timeout=timeout) -register_instance_operation(RebootOperation) +register_operation(RebootOperation) + + +class RemoveInterfaceOperation(InstanceOperation): + activity_code_suffix = 'remove_interface' + id = 'remove_interface' + name = _("remove interface") + description = _("Remove the specified network interface from the VM.") + + def _operation(self, activity, user, system, interface): + if self.instance.is_running: + interface.shutdown() + + interface.destroy() + interface.delete() + + +register_operation(RemoveInterfaceOperation) class ResetOperation(InstanceOperation): @@ -182,11 +226,12 @@ class ResetOperation(InstanceOperation): id = 'reset' name = _("reset") description = _("Reset virtual machine (reset button).") + icon = 'bolt' def _operation(self, activity, user, system, timeout=5): self.instance.reset_vm(timeout=timeout) -register_instance_operation(ResetOperation) +register_operation(ResetOperation) class SaveAsTemplateOperation(InstanceOperation): @@ -198,8 +243,19 @@ class SaveAsTemplateOperation(InstanceOperation): Template can be shared with groups and users. Users can instantiate Virtual Machines from Templates. """) + icon = 'save' + + @staticmethod + def _rename(name): + m = search(r" v(\d+)$", name) + if m: + v = int(m.group(1)) + 1 + name = search(r"^(.*) v(\d+)$", name).group(1) + else: + v = 1 + return "%s v%d" % (name, v) - def _operation(self, activity, name, user, system, timeout=300, + def _operation(self, activity, user, system, timeout=300, with_shutdown=True, **kwargs): if with_shutdown: try: @@ -216,7 +272,7 @@ class SaveAsTemplateOperation(InstanceOperation): 'description': self.instance.description, 'lease': self.instance.lease, # Can be problem in new VM 'max_ram_size': self.instance.max_ram_size, - 'name': name, + 'name': self._rename(self.instance.name), 'num_cores': self.instance.num_cores, 'owner': user, 'parent': self.instance.template, # Can be problem @@ -255,7 +311,7 @@ class SaveAsTemplateOperation(InstanceOperation): return tmpl -register_instance_operation(SaveAsTemplateOperation) +register_operation(SaveAsTemplateOperation) class ShutdownOperation(InstanceOperation): @@ -263,6 +319,7 @@ class ShutdownOperation(InstanceOperation): id = 'shutdown' name = _("shutdown") description = _("Shutdown virtual machine with ACPI signal.") + icon = 'off' def check_precond(self): super(ShutdownOperation, self).check_precond() @@ -284,7 +341,7 @@ class ShutdownOperation(InstanceOperation): self.instance.yield_vnc_port() -register_instance_operation(ShutdownOperation) +register_operation(ShutdownOperation) class ShutOffOperation(InstanceOperation): @@ -292,6 +349,7 @@ class ShutOffOperation(InstanceOperation): id = 'shut_off' name = _("shut off") description = _("Shut off VM (plug-out).") + icon = 'ban-circle' def on_commit(self, activity): activity.resultant_state = 'STOPPED' @@ -310,7 +368,7 @@ class ShutOffOperation(InstanceOperation): self.instance.yield_vnc_port() -register_instance_operation(ShutOffOperation) +register_operation(ShutOffOperation) class SleepOperation(InstanceOperation): @@ -318,6 +376,7 @@ class SleepOperation(InstanceOperation): id = 'sleep' name = _("sleep") description = _("Suspend virtual machine with memory dump.") + icon = 'moon' def check_precond(self): super(SleepOperation, self).check_precond() @@ -346,7 +405,7 @@ class SleepOperation(InstanceOperation): # VNC port needs to be kept -register_instance_operation(SleepOperation) +register_operation(SleepOperation) class WakeUpOperation(InstanceOperation): @@ -357,6 +416,7 @@ class WakeUpOperation(InstanceOperation): Power on Virtual Machine and load its memory from dump. """) + icon = 'sun' def check_precond(self): super(WakeUpOperation, self).check_precond() @@ -386,11 +446,12 @@ class WakeUpOperation(InstanceOperation): self.instance.renew(which='both', base_activity=activity) -register_instance_operation(WakeUpOperation) +register_operation(WakeUpOperation) class NodeOperation(Operation): async_operation = async_node_operation + host_cls = Node def __init__(self, node): super(NodeOperation, self).__init__(subject=node) @@ -413,10 +474,6 @@ class NodeOperation(Operation): node=self.node, user=user) -def register_node_operation(op_cls, op_id=None): - return register_operation(Node, op_cls, op_id) - - class FlushOperation(NodeOperation): activity_code_suffix = 'flush' id = 'flush' @@ -430,4 +487,4 @@ class FlushOperation(NodeOperation): i.migrate() -register_node_operation(FlushOperation) +register_operation(FlushOperation) diff --git a/circle/vm/tests/test_operations.py b/circle/vm/tests/test_operations.py index 8febc10..b4f696f 100644 --- a/circle/vm/tests/test_operations.py +++ b/circle/vm/tests/test_operations.py @@ -43,6 +43,14 @@ class SaveAsTemplateOperationTestCase(TestCase): def test_operation_registered(self): assert SaveAsTemplateOperation.id in getattr(Instance, op_reg_name) + def test_rename(self): + self.assertEqual(SaveAsTemplateOperation._rename("foo"), "foo v1") + self.assertEqual(SaveAsTemplateOperation._rename("foo v2"), "foo v3") + self.assertEqual(SaveAsTemplateOperation._rename("foo v"), "foo v v1") + self.assertEqual(SaveAsTemplateOperation._rename("foo v9"), "foo v10") + self.assertEqual( + SaveAsTemplateOperation._rename("foo v111"), "foo v112") + class ShutdownOperationTestCase(TestCase): def test_operation_registered(self): diff --git a/docs/install.rst b/docs/install.rst index fbca119..2e10e6f 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -129,7 +129,8 @@ Install the required Python libraries to the virtual environment:: Sync the database and create a superuser:: - $ circle/manage.py syncdb --migrate --noinput + $ circle/manage.py syncdb --all --noinput + $ circle/manage.py migrate --fake $ circle/manage.py createsuperuser --username=test --email=test@example.org You can now start the development server:: @@ -179,4 +180,4 @@ configure vim like we do:: filetype plugin indent on syntax on END - $ sudo pip install pyflakes rope pep8 mccabe + $ sudo pip install pyflakes rope pep8 mccabe \ No newline at end of file diff --git a/miscellaneous/nginx-uwsgi.conf b/miscellaneous/nginx-uwsgi.conf new file mode 100644 index 0000000..107e3f7 --- /dev/null +++ b/miscellaneous/nginx-uwsgi.conf @@ -0,0 +1,52 @@ +ignore_invalid_headers on; + +server { + listen 443 ssl default; + root /usr/share/nginx/www; + index index.html index.htm; + + ssl on; + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + + ssl_session_timeout 5m; + + ssl_protocols SSLv3 TLSv1; + ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; + ssl_prefer_server_ciphers on; + + client_max_body_size 75M; + client_body_buffer_size 512k; + location /media { + alias /home/cloud/circle/circle/static_collected; # your Django project's media files + } + location /static { + alias /home/cloud/circle/circle/static_collected; # your Django project's static files + } + location /doc { + alias /home/cloud/circle-website/_build/html; + } + + location / { + uwsgi_pass unix:///tmp/uwsgi.sock; + include /etc/nginx/uwsgi_params; # or the uwsgi_params you installed manually + } + + location /vnc/ { + proxy_pass http://localhost:9999; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + # WebSocket support (nginx 1.4) + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} + + +server { + listen 80 default; + rewrite ^ https://$host/; # permanent; +} diff --git a/miscellaneous/portal-uwsgi.conf b/miscellaneous/portal-uwsgi.conf new file mode 100644 index 0000000..bc2cbeb --- /dev/null +++ b/miscellaneous/portal-uwsgi.conf @@ -0,0 +1,15 @@ +description "CIRCLE django server" + +start on runlevel [2345] +stop on runlevel [!2345] + +respawn +respawn limit 30 30 +setgid cloud +setuid cloud + +script + . /home/cloud/.virtualenvs/circle/bin/postactivate + exec /home/cloud/.virtualenvs/circle/bin/uwsgi --chdir=/home/cloud/circle/circle -H /home/cloud/.virtualenvs/circle --socket /tmp/uwsgi.sock --wsgi-file circle/wsgi.py --chmod-socket=666 +end script + diff --git a/requirements/production.txt b/requirements/production.txt index 6cb23f0..31b02c4 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -3,3 +3,4 @@ -r base.txt gunicorn==0.17.4 +uWSGI==2.0.3