Merge branch 'master' into issue-397

circle/acl/tests/models.py

@@ -15,4 +15,8 @@
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
-from .test_acl import TestModel, Test2Model  # noqa
+from django.conf import settings
+
+# https://code.djangoproject.com/ticket/7835
+if settings.SETTINGS_MODULE == 'circle.settings.test':
+    from .test_acl import TestModel, Test2Model  # noqa

circle/circle/settings/base.py

@@ -355,6 +355,7 @@ LOCAL_APPS = (
     'manager',
     'acl',
     'monitor',
+    'request',
 )
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
@@ -449,7 +450,7 @@ if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
     )
     AUTHENTICATION_BACKENDS = (
         'django.contrib.auth.backends.ModelBackend',
-        'djangosaml2.backends.Saml2Backend',
+        'common.backends.Saml2Backend',
     )
 
     remote_metadata = join(SITE_ROOT, 'remote_metadata.xml')
@@ -527,6 +528,10 @@ except:
 LOCALE_PATHS = (join(SITE_ROOT, 'locale'), )
 COMPANY_NAME = get_env_variable("COMPANY_NAME", "BME IK 2015")
 
+first, last = get_env_variable(
+    'VNC_PORT_RANGE', '20000, 65536').replace(' ', '').split(',')
+VNC_PORT_RANGE = (int(first), int(last))  # inclusive start, exclusive end
+
 graphite_host = environ.get("GRAPHITE_HOST", None)
 graphite_port = environ.get("GRAPHITE_PORT", None)
 if graphite_host and graphite_port:
@@ -555,3 +560,4 @@ ADMIN_ENABLED = False
 
 BLACKLIST_PASSWORD = get_env_variable("BLACKLIST_PASSWORD", "")
 BLACKLIST_HOOK_URL = get_env_variable("BLACKLIST_HOOK_URL", "")
+REQUEST_HOOK_URL = get_env_variable("REQUEST_HOOK_URL", "")

circle/circle/settings/selenium_test.py

@@ -40,7 +40,8 @@ INSTALLED_APPS += (
 )
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
-path_to_selenium_test = os.path.expanduser('~/circle/circle/dashboard/tests/selenium')
+
+path_to_selenium_test = os.path.join(SITE_ROOT, "dashboard/tests/selenium")
 NOSE_ARGS = ['--stop', '--with-doctest', '--with-selenium-driver', '--selenium-driver=firefox', '-w%s' % path_to_selenium_test]
 
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']

circle/circle/settings/test.py

@@ -56,6 +56,16 @@ LOGGING['handlers']['console'] = {'level': level,
                                   'formatter': 'simple'}
 for i in LOCAL_APPS:
     LOGGING['loggers'][i] = {'handlers': ['console'], 'level': level}
+
+# don't print SQL queries
+LOGGING['handlers']['null'] = {'level': "DEBUG",
+                               'class': "django.utils.log.NullHandler"}
+LOGGING['loggers']['django.db.backends'] = {
+    'handlers': ['null'],
+    'propagate': False,
+    'level': 'DEBUG',
+}
+
 # Forbid store usage
 STORE_URL = ""
 

circle/circle/urls.py

@@ -38,6 +38,7 @@ urlpatterns = patterns(
     url(r'^network/', include('network.urls')),
     url(r'^blacklist-add/', add_blacklist_item),
     url(r'^dashboard/', include('dashboard.urls')),
+    url(r'^request/', include('request.urls')),
 
     # django/contrib/auth/urls.py (care when new version)
     url((r'^accounts/reset/(?P<uidb64>[0-9A-Za-z_\-]+)/'
@@ -87,3 +88,4 @@ if get_env_variable('DJANGO_SAML', 'FALSE') == 'TRUE':
     )
 
 handler500 = 'common.views.handler500'
+handler403 = 'common.views.handler403'

circle/common/backends.py

+# -*- coding: utf-8 -*-
+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+
+from djangosaml2.backends import Saml2Backend as Saml2BackendBase
+
+
+class Saml2Backend(Saml2BackendBase):
+    u"""
+    >>> b = Saml2Backend()
+    >>> b.clean_user_main_attribute(u'Ékezetes Enikő')
+    u'+00c9kezetes+0020Enik+0151'
+    >>> b.clean_user_main_attribute(u'Cé++')
+    u'C+00e9+002b+002b'
+    >>> b.clean_user_main_attribute(u'test')
+    u'test'
+    >>> b.clean_user_main_attribute(u'3+4')
+    u'3+002b4'
+    """
+    def clean_user_main_attribute(self, main_attribute):
+        def replace(match):
+            match = match.group()
+            return '+%04x' % ord(match)
+
+        if isinstance(main_attribute, str):
+            main_attribute = main_attribute.decode('UTF-8')
+        assert isinstance(main_attribute, unicode)
+        return re.sub(r'[^\w.@-]', replace, main_attribute)
+
+    def _set_attribute(self, obj, attr, value):
+        if attr == 'username':
+            value = self.clean_user_main_attribute(value)
+        return super(Saml2Backend, self)._set_attribute(obj, attr, value)

circle/common/operations.py

@@ -170,8 +170,8 @@ class Operation(object):
             raise ImproperlyConfigured(
                 "Set required_perms to () if none needed.")
         if not user.has_perms(cls.required_perms):
-            raise PermissionDenied("%s doesn't have the required permissions."
-                                   % user)
+            raise PermissionDenied(
+                u"%s doesn't have the required permissions." % user)
         if cls.superuser_required and not user.is_superuser:
             raise humanize_exception(ugettext_noop(
                 "Superuser privileges are required."), PermissionDenied())

circle/common/views.py

@@ -19,32 +19,42 @@ from sys import exc_info
 
 import logging
 
-from django.template import RequestContext
 from django.shortcuts import render_to_response
+from django.template import RequestContext
 
 from .models import HumanReadableException
 
 logger = logging.getLogger(__name__)
 
 
-def handler500(request):
-    cls, exception, traceback = exc_info()
-    logger.exception("unhandled exception")
+def get_context(request, exception):
     ctx = {}
-    if isinstance(exception, HumanReadableException):
+    if issubclass(exception.__class__, HumanReadableException):
         try:
-            ctx['error'] = exception.get_user_text()
+            if request.user.is_superuser:
+                ctx['error'] = exception.get_admin_text()
+            else:
+                ctx['error'] = exception.get_user_text()
         except:
             pass
-        else:
-            try:
-                if request.user.is_superuser():
-                    ctx['error'] = exception.get_admin_text()
-            except:
-                pass
+    return ctx
+
+
+def handler500(request):
+    cls, exception, traceback = exc_info()
+    logger.exception("unhandled exception")
+    ctx = get_context(request, exception)
     try:
         resp = render_to_response("500.html", ctx, RequestContext(request))
     except:
         resp = render_to_response("500.html", ctx)
     resp.status_code = 500
     return resp
+
+
+def handler403(request):
+    cls, exception, traceback = exc_info()
+    ctx = get_context(request, exception)
+    resp = render_to_response("403.html", ctx)
+    resp.status_code = 403
+    return resp

circle/dashboard/fixtures/test-vm-fixture.json

@@ -1395,6 +1395,7 @@
     "vnc_port": 1234, 
     "num_cores": 2, 
     "status": "RUNNING",
+    "system": "system pls",
     "modified": "2013-10-14T07:27:38.192Z"
   }
 },

circle/dashboard/forms.py

@@ -739,6 +739,7 @@ class LeaseForm(forms.ModelForm):
 
     class Meta:
         model = Lease
+        exclude = ()
 
 
 class VmRenewForm(OperationForm):
@@ -1604,6 +1605,7 @@ class DataStoreForm(ModelForm):
 
     class Meta:
         model = DataStore
+        fields = ("name", "path", "hostname", )
 
 
 class DiskForm(ModelForm):
@@ -1620,3 +1622,5 @@ class DiskForm(ModelForm):
 
     class Meta:
         model = Disk
+        fields = ("name", "filename", "datastore", "type", "bus", "size",
+                  "base", "dev_num", "destroyed", "is_ready", )

circle/dashboard/models.py

@@ -309,7 +309,7 @@ if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
         attributes = kwargs.pop('attributes')
         atr = settings.SAML_ORG_ID_ATTRIBUTE
         try:
-            value = attributes[atr][0]
+            value = attributes[atr][0].upper()
         except Exception as e:
             value = None
             logger.info("save_org_id couldn't find attribute. %s", unicode(e))
@@ -339,7 +339,7 @@ if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
                              group, unicode(g))
                 g.user_set.add(sender)
 
-        for i in FutureMember.objects.filter(org_id=value):
+        for i in FutureMember.objects.filter(org_id__iexact=value):
             i.group.user_set.add(sender)
             i.delete()
 

circle/dashboard/static/dashboard/dashboard.less

@@ -1272,8 +1272,46 @@ textarea[name="new_members"] {
   margin-top: 20px;
 }
 
+#vm-renew-request-lease, #vm-request-resource-form {
+  display: none;
+}
+
+.label-100 {
+  display: block;
+  width: 100%;
+}
+
+#modify-the-resources {
+  font-size: 18px;
+  display: none;
+}
+
+#vm-request-resource-form textarea {
+  max-width: 500px;
+  height: 150px;
+}
+
 #disk-list-table {
   td:last-child {
     text-align: center;
   }
 }
+
+#request-buttons {
+ form {
+    display: inline;
+ }
+
+ textarea {
+    resize: none;
+    min-height: 80px;
+ }
+}
+
+.nowrap {
+  white-space: nowrap;
+}
+
+.little-margin-bottom {
+  margin-bottom: 5px;
+}

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

@@ -38,6 +38,13 @@ $(function() {
     e.preventDefault();
   });
 
+  /* save as (close vnc console) */
+  $('.operation-save_as_template').click(function(e) {
+    if ($('li.active > a[href$="console"]').length > 0) {
+      $('a[data-toggle$="pill"][href$="#activity"]').click();
+    }
+  });
+
   /* remove tag */
   $('.vm-details-remove-tag').click(function() {
     var to_remove =  $.trim($(this).parent('div').text());
@@ -223,4 +230,25 @@ $(function() {
     return false;
   });
 
+  $(document).on("click", "#vm-renew-request-lease-button", function(e) {
+    $("#vm-renew-request-lease").stop().slideToggle();
+    e.preventDefault();
+  });
+
+  $("#vm-request-resource").click(function(e) {
+    $(".cpu-priority-slider, .cpu-count-slider, .ram-slider").simpleSlider("setDisabled", false);
+    $(".ram-input, .cpu-count-input, .cpu-priority-input").prop("disabled", false);
+
+    $("#vm-details-resources-form").prop("action", $(this).prop("href"));
+    $("#vm-request-resource-form").show();
+    $("#modify-the-resources").show();
+    $(this).hide();
+
+    $("html, body").animate({
+      scrollTop: $("#modify-the-resources").offset().top - 60
+    });
+
+    return e.preventDefault();
+  });
+
 });

circle/dashboard/templates/dashboard/_vm-create-1.html

@@ -79,10 +79,26 @@
     </div>
   </div>
   {% empty %}
-    {% trans "You can't start new virtual machines because no templates are shared with you." %}
+    {% if not template_access_types %}
+      {% trans "You can't start new virtual machines because no templates are shared with you." %}
+    {% else %}
+      {% trans "You can't start new virtual machines because no templates are shared with you however you can request them via the form below." %}
+      <hr />
+      {% include "request/_request-template-form.html" %}
+    {% endif %}
   {% endfor %}
 </div>
 
+  {% if templates and template_access_types %}
+    {% url "request.views.request-template" as request_url %}
+    <hr />
+    <p class="text-right">
+      {% blocktrans with url=request_url %}
+        Need other templates? Submit a new <a href="{{ url }}">request</a>.
+      {% endblocktrans %}
+    </p>
+  {% endif %}
+
 <style>
   .progress {
     position: relative;

circle/dashboard/templates/dashboard/_vm-renew.html

+{% extends "dashboard/operate.html" %}
+
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block formbuttons %}
+<div class="pull-right">
+  <a class="btn btn-default" href="{{object.get_absolute_url}}" data-dismiss="modal">
+    {% trans "Cancel" %}
+  </a>
+  {% if lease_types %}
+  <a class="btn btn-primary" id="vm-renew-request-lease-button"
+   href="{% url "request.views.request-lease" vm_pk=object.pk %}">
+    <i class="fa fa-forward"></i>
+    {% trans "Request longer lease" %}
+  </a>
+  {% endif %}
+  <button class="btn btn-{{ opview.effect }} btn-op-form-send" type="submit" id="op-form-send">
+    {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ op.name|capfirst }}
+  </button>
+</div>
+{% endblock %}
+
+{% block extra %}
+<div class="clearfix"></div>
+<div id="vm-renew-request-lease">
+  <hr />
+  {% include "request/_request-lease-form.html" with form=lease_request_form vm=object %}
+</div>
+{% endblock %}

circle/dashboard/templates/dashboard/base.html

@@ -22,16 +22,29 @@
     {% if user.is_superuser %}
     {% if ADMIN_ENABLED %}
     <li>
-      <a href="/admin/"><i class="fa fa-cogs"></i> {% trans "Admin" %}</a>
+      <a href="/admin/">
+        <i class="fa fa-cogs"></i>
+        <span class="hidden-sm">{% trans "Admin" %}</span>
+      </a>
     </li>
     {% endif %}
     <li>
-      <a href="{% url "dashboard.views.storage" %}"><i class="fa fa-database"></i>
-        {% trans "Storage" %}
+      <a href="{% url "dashboard.views.storage" %}">
+        <i class="fa fa-database"></i>
+        <span class="hidden-sm">{% trans "Storage" %}</span>
       </a>
     </li>
     <li>
-      <a href="/network/"><i class="fa fa-globe"></i> {% trans "Network" %}</a>
+      <a href="{% url "network.index" %}">
+        <i class="fa fa-globe"></i>
+        <span class="hidden-sm">{% trans "Network" %}</span>
+      </a>
+    </li>
+    <li>
+      <a href="{% url "request.views.request-list" %}">
+        <i class="fa fa-phone"></i>
+        <span class="hidden-sm">{% trans "Requests" %}</span>
+      </a>
     </li>
     {% endif %}
     <li>

circle/dashboard/templates/dashboard/instanceactivity_detail.html

@@ -54,7 +54,7 @@
 
 
             <dt>{% trans "result" %}</dt>
-            <dd><textarea class="form-control">{{object.result|get_text:user}}</textarea></dd>
+            <dd><textarea class="form-control" id="activity_result_text">{{object.result|get_text:user}}</textarea></dd>
 
             <dt>{% trans "resultant state" %}</dt>
             <dd>{{object.resultant_state|default:'n/a'}}</dd>

circle/dashboard/templates/dashboard/operate.html

@@ -16,6 +16,7 @@ Do you want to perform the following operation on
       {% crispy form %}
     {% endif %}
   {% endblock %}
+  {% block formbuttons %}
   <div class="pull-right">
     <a class="btn btn-default" href="{{object.get_absolute_url}}"
         data-dismiss="modal">{% trans "Cancel" %}</a>
@@ -23,4 +24,7 @@ Do you want to perform the following operation on
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ op.name|capfirst }}
     </button>
   </div>
+  {% endblock %}
 </form>
+
+{% block extra %}{% endblock %}

circle/dashboard/templates/dashboard/profile.html

@@ -2,6 +2,7 @@
 {% load staticfiles %}
 {% load i18n %}
 {% load crispy_forms_tags %}
+{% load arrowfilter %}
 
 {% block title-page %}{{ profile.username}} | {% trans "Profile" %}{% endblock %}
 
@@ -42,6 +43,7 @@
                 {% trans "Email address" %}: {{ profile.email }}
               {% endif %}
             </p>
+            <p>{% trans "Last login" %}: <span title="{{ request.user.last_login  }}">{{ request.user.last_login|arrowfilter:LANGUAGE_CODE}}</span></p>
             {% if request.user == profile %}
             <p>
               {% trans "Use email address as Gravatar profile image" %}:

circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html

@@ -5,7 +5,7 @@
 
 {% for a in activities %}
 <div class="activity{% if a.pk == active.pk %} activity-active{%endif%}"
-  data-activity-id="{{ a.pk }}" data-activity-code="{{ a.activity_code }}">
+  data-activity-id="{{ a.pk }}" data-activity-code="{{ a.activity_code }}" data-timestamp="{{ a.started|date:"U" }}">
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-{{a.icon}}{% endif %}"></i>
 </span>

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

@@ -59,10 +59,11 @@
         {% if instance.is_expiring %}<i class="fa fa-warning-sign text-danger"></i>{% endif %}
         <span id="vm-details-renew-op">
           {% with op=op.renew %}{% if op %}
-            <a href="{{op.get_url}}" class="btn btn-success btn-xs
+            <a href="{{op.get_url}}" class="btn btn-{{op.effect}} btn-xs
                     operation operation-{{op.op}}">
               <i class="fa fa-{{op.icon}}"></i>
-                    {{op.name}} </a>
+              {{op.name}}
+            </a>
           {% endif %}{% endwith %}
         </span>
       </h4>

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

@@ -2,19 +2,42 @@
 {% load sizefieldtags %}
 {% load crispy_forms_tags %}
 
+
+<div class="label label-info label-100" id="modify-the-resources">
+  {% trans "Modify the resources" %}
+</div>
 <form method="POST" action="{{ op.resources_change.get_url }}" id="vm-details-resources-form">
   {% csrf_token %}
   {% include "dashboard/_resources-sliders.html" with field_priority=resources_form.priority field_num_cores=resources_form.num_cores field_ram_size=resources_form.ram_size %}
 
 {% if op.resources_change %}
-    <button type="submit" class="btn btn-success btn-sm change-resources-button" 
-      id="vm-details-resources-save" data-vm="{{ instance.pk }}"
-      {% if op.resources_change.disabled %}disabled{% endif %}>
-      <i class="fa fa-floppy-o"></i> {% trans "Save resources" %}
-    </button>
-    <span class="change-resources-help"
-      {% if not op.resources_change.disabled %}style="display: none;"{% endif %}
-      >{% trans "Stop your VM to change resources." %}</span>
+  <button type="submit" class="btn btn-success btn-sm change-resources-button"
+    id="vm-details-resources-save" data-vm="{{ instance.pk }}"
+    {% if not save_resources_enabled %}disabled{% endif %}>
+    <i class="fa fa-floppy-o"></i> {% trans "Save resources" %}
+  </button>
+  <span class="change-resources-help"
+    {% if save_resources_enabled %}style="display: none;"{% endif %}>
+    {% trans "Stop your VM to change resources." %}
+  </span>
+{% else %}
+  <div id="vm-request-resource-form">
+    <div class="alert alert-info text-justify">
+      {% trans "Changing resources is only possible on virtual machines with STOPPED state. We suggest to turn off the VM after submitting the request otherwise it will be automatically stopped in the future when the request is accepted." %}
+    </div>
+    <div class="form-group">
+      <label>{% trans "Message" %}*</label>
+      <textarea class="form-control" name="message">{% include "request/initials/resources.html" %}</textarea>
+    </div>
+    <input type="submit" class="btn btn-success btn-sm"/>
+  </div>
+
+  <a href="{% url "request.views.request-resource" vm_pk=object.pk %}"
+   class="btn btn-primary btn-sm" id="vm-request-resource">
+    <i class="fa fa-tasks"></i>
+    {% trans "Request resources" %}
+  </a>
+
 {% endif %}
 </form>
 

circle/dashboard/tests/selenium/config.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+import random
+
+
+class SeleniumConfig(object):
+    # How many sec can selenium wait till certain parts of a page appears
+    wait_max_sec = 10
+    # How much sec can pass before the activity is no longer happened recently
+    recently_sec = 90
+    # Name of the logger (necessary to override test logger)
+    logger_name = "selenium"
+    # File where the log should be stored
+    log_file = "selenium.log"
+    # Log file max size in Bytes
+    log_size = 1024 * 1024 * 10
+    # Format of the log file
+    log_format = "%(asctime)s: %(name)s: %(levelname)s:  %(message)s"
+    # Backup count of the logfiles
+    log_backup = 5
+
+    # Accented letters from which selenium can choose to name stuff
+    accents = u"áéíöóúűÁÉÍÖÓÜÚŰ"
+    # Non accented letters from which selenium can choose to name stuff
+    valid_chars = "0123456789abcdefghijklmnopqrstvwxyz"
+
+    # First we choose 10 random normal letters
+    random_pass = "".join([random.choice(
+        valid_chars) for n in xrange(10)])
+    # Then we append it with 5 random accented one
+    random_pass += "".join([random.choice(
+        accents) for n in xrange(5)])
+    # Then we name our client as test_%(password)s
+    client_name = 'test_%s' % random_pass
+
+    # Which webpage should selenium use (localhost is recommended)
+    host = 'https://127.0.0.1'
+    # In default the tests create a new user then delete it afteword
+    # Disable this if selenium cannot acces the database
+    create_user = True
+
+    """
+    Note: It's possible to setup that selenium uses a distant web server
+    for testing. If you choose this method you must provide a distant superuser
+    account info for that server by overriding random_pass and client_name by
+    uncommenting the lines below.
+    """
+    # client_name = "user name here"
+    # random_pass = "password here"

circle/dashboard/tests/test_views.py

@@ -20,8 +20,7 @@ import json
 # 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.contrib.auth.models import Permission
+from django.contrib.auth.models import User, Group, Permission
 from django.contrib.auth import authenticate
 
 from common.tests.celery_mock import MockCeleryMixin

circle/dashboard/urls.py

@@ -228,7 +228,6 @@ urlpatterns = patterns(
     url(r'^vm/opensearch.xml$', OpenSearchDescriptionView.as_view(),
         name="dashboard.views.vm-opensearch"),
 
-
     url(r'^storage/$', StorageDetail.as_view(),
         name="dashboard.views.storage"),
     url(r'^disk/(?P<pk>\d+)/$', DiskDetail.as_view(),

circle/dashboard/views/__init__.py

@@ -13,3 +13,4 @@ from util import *
 from vm import *
 from graph import *
 from storage import *
+from request import *

circle/dashboard/views/group.py

@@ -63,6 +63,8 @@ class GroupCodeMixin(object):
             client = Saml2Client(conf, state_cache=state,
                                  identity_cache=IdentityCache(request.session))
             subject_id = _get_subject_id(request.session)
+            if not subject_id:
+                return newgroups
             identity = client.users.get_identity(subject_id,
                                                  check_not_on_or_after=False)
             if identity:
@@ -144,7 +146,7 @@ class GroupDetailView(CheckedDetailView):
             self.object.user_set.add(entity)
         except User.DoesNotExist:
             if saml_available:
-                FutureMember.objects.get_or_create(org_id=name,
+                FutureMember.objects.get_or_create(org_id=name.upper(),
                                                    group=self.object)
             else:
                 messages.warning(request, _('User "%s" not found.') % name)

circle/dashboard/views/template.py

@@ -441,7 +441,7 @@ class TransferTemplateOwnershipView(TransferOwnershipView):
     confirm_view = TransferTemplateOwnershipConfirmView
     model = InstanceTemplate
     notification_msg = ugettext_noop(
-        '%(user)s offered you to take the ownership of '
+        '%(owner)s offered you to take the ownership of '
         'his/her template called %(instance)s. '
         '<a href="%(token)s" '
         'class="btn btn-success btn-small">Accept</a>')

circle/dashboard/views/util.py

@@ -70,7 +70,7 @@ def search_user(keyword):
         return User.objects.get(username=keyword)
     except User.DoesNotExist:
         try:
-            return User.objects.get(profile__org_id=keyword)
+            return User.objects.get(profile__org_id__iexact=keyword)
         except User.DoesNotExist:
             return User.objects.get(email=keyword)
 
@@ -610,7 +610,7 @@ class TransferOwnershipView(CheckedDetailView, DetailView):
             new_owner.profile.notify(
                 ugettext_noop('Ownership offer'),
                 self.notification_msg,
-                {'instance': obj, 'token': token_path})
+                {'instance': obj, 'token': token_path, 'owner': request.user})
         except Profile.DoesNotExist:
             messages.error(request, _('Can not notify selected user.'))
         else:
@@ -665,8 +665,8 @@ class TransferOwnershipConfirmView(LoginRequiredMixin, View):
             old.profile.notify(
                 ugettext_noop('Ownership accepted'),
                 ugettext_noop('Your ownership offer of %(instance)s has been '
-                              'accepted by %(user)s.'),
-                {'instance': instance})
+                              'accepted by %(owner)s.'),
+                {'instance': instance, 'owner': request.user})
         return redirect(instance.get_absolute_url())
 
     def get_instance(self, key, user):

circle/dashboard/views/vm.py

@@ -66,6 +66,8 @@ from ..forms import (
     VmPortRemoveForm, VmPortAddForm,
     VmRemoveInterfaceForm,
 )
+from request.models import TemplateAccessType, LeaseType
+from request.forms import LeaseRequestForm, TemplateRequestForm
 from ..models import Favourite
 from manager.scheduler import has_traits
 
@@ -171,6 +173,10 @@ class VmDetailView(GraphMixin, CheckedDetailView):
         context['is_operator'] = is_operator
         context['is_owner'] = is_owner
 
+        # operation also allows RUNNING (if with_shutdown is present)
+        context['save_resources_enabled'] = instance.status not in ("RUNNING",
+                                                                    "PENDING")
+
         return context
 
     def post(self, request, *args, **kwargs):
@@ -651,10 +657,12 @@ class VmRenewView(FormOperationMixin, TokenOperationView, VmOperationView):
 
     op = 'renew'
     icon = 'calendar'
-    effect = 'info'
+    effect = 'success'
     show_in_toolbar = False
     form_class = VmRenewForm
     wait_for_result = 0.5
+    template_name = 'dashboard/_vm-renew.html'
+    with_reload = True
 
     def get_form_kwargs(self):
         choices = Lease.get_objects_with_level("user", self.request.user)