Merge branch 'master' into feature-request

circle/circle/settings/selenium_test.py

+# 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 os# noqa
+from .base import *  # noqa
+# flake8: noqa
+os.environ['REUSE_DB'] = "1"
+os.environ['DJANGO_TEST_DB_NAME'] = "circle"
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.' +
+        get_env_variable('DJANG_DB_TYPE', 'postgresql_psycopg2'),
+        'NAME':  get_env_variable('DJANGO_DB_NAME', 'circle'),
+        'TEST_NAME': get_env_variable('DJANGO_TEST_DB_NAME', 'circle'),
+        'USER':  get_env_variable('DJANGO_DB_USER', 'circle'),
+        'PASSWORD':  get_env_variable('DJANGO_DB_PASSWORD'),
+        'HOST': get_env_variable('DJANGO_DB_HOST', ''),
+        'PORT': get_env_variable('DJANGO_DB_PORT', ''),
+    }
+}
+SOUTH_TESTS_MIGRATE = False
+
+INSTALLED_APPS += (
+        'acl.tests',
+        'django_nose',
+        'django_jenkins',
+)
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
+path_to_selenium_test = os.path.expanduser('~/circle/circle/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']
+
+CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.dummy.DummyCache'
+        }
+}
+
+LOGGING['loggers']['djangosaml2'] = {'handlers': ['console'],
+                                     'level': 'CRITICAL'}
+
+level = environ.get('LOGLEVEL', 'CRITICAL')
+LOGGING['handlers']['console'] = {'level': level,
+                                  'class': 'logging.StreamHandler',
+                                  'formatter': 'simple'}
+for i in LOCAL_APPS:
+        LOGGING['loggers'][i] = {'handlers': ['console'], 'level': level}

circle/circle/settings/test.py

@@ -38,7 +38,7 @@ INSTALLED_APPS += (
     'django_nose',
 )
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = ['--with-doctest']
+NOSE_ARGS = ['--with-doctest', '--exclude-dir=dashboard/tests/selenium']
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 
 CACHES = {

circle/common/models.py

@@ -69,7 +69,8 @@ def activitycontextimpl(act, on_abort=None, on_commit=None):
             # system-exiting exceptions, e.g. KeyboardInterrupt
             result = create_readable(
                 ugettext_noop("Failure."),
-                ugettext_noop("Unhandled exception: %(error)s"),
+                ugettext_noop("Unhandled exception: %(e)s: %(error)s"),
+                e=str(e.__class__.__name__),
                 error=get_error_msg(e))
             raise
     except:

circle/common/tests/celery_mock.py

+# 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/>.
+
+from mock import patch
+
+
+class MockCeleryMixin(object):
+    def _pre_setup(self):
+        self.reloadtask_patcher = patch(
+            'firewall.tasks.local_tasks.reloadtask.apply_async', spec=True)
+        self.reloadtask_patcher.start()
+
+        self.kombu_patcher = patch('kombu.connection.Connection.ensure',
+                                   side_effect=RuntimeError())
+        self.kombu_patcher.start()
+
+        self.check_queue_patcher = patch('vm.tasks.vm_tasks.check_queue',
+                                         return_value=True)
+        self.check_queue_patcher.start()
+
+        super(MockCeleryMixin, self)._pre_setup()
+
+    def _post_teardown(self):
+        self.reloadtask_patcher.stop()
+        self.kombu_patcher.stop()
+
+        super(MockCeleryMixin, self)._post_teardown()

circle/common/tests/test_models.py

@@ -20,12 +20,13 @@ from collections import deque
 from django.test import TestCase
 from mock import MagicMock
 
+from .celery_mock import MockCeleryMixin
 from .models import TestClass
 from ..models import HumanSortField
 from ..models import activitycontextimpl
 
 
-class MethodCacheTestCase(TestCase):
+class MethodCacheTestCase(MockCeleryMixin, TestCase):
     def test_cache(self):
         t1 = TestClass(1)
         t2 = TestClass(2)

circle/dashboard/management/commands/init.py

@@ -17,6 +17,7 @@
 
 from __future__ import unicode_literals, absolute_import
 
+import logging
 from optparse import make_option
 
 from django.contrib.auth.models import User
@@ -28,6 +29,9 @@ from storage.models import DataStore
 from vm.models import Lease
 
 
+logger = logging.getLogger(__name__)
+
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--force', action="store_true"),
@@ -49,18 +53,18 @@ class Command(BaseCommand):
         qs = model.objects.filter(**{field: value})[:1]
         if not qs.exists():
             obj = model.objects.create(**kwargs)
-            self.changed.append('New %s: %s' % (model, obj))
+            logger.info('New %s: %s', model, obj)
+            self.changed = True
             return obj
         else:
             return qs[0]
 
 # http://docs.saltstack.com/en/latest/ref/states/all/salt.states.cmd.html
     def print_state(self):
-        changed = "yes" if len(self.changed) else "no"
-        print "\nchanged=%s comment='%s'" % (changed, ", ".join(self.changed))
+        print "\nchanged=%s" % ("yes" if self.changed else "no")
 
     def handle(self, *args, **options):
-        self.changed = []
+        self.changed = False
 
         if (DataStore.objects.exists() and Vlan.objects.exists()
                 and not options['force']):

circle/dashboard/migrations/0002_auto_20150318_1317.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='connectcommand',
+            options={'ordering': ('id',)},
+        ),
+        migrations.AlterModelOptions(
+            name='futuremember',
+            options={'ordering': ('id',)},
+        ),
+        migrations.AlterModelOptions(
+            name='groupprofile',
+            options={'ordering': ('id',)},
+        ),
+        migrations.AlterModelOptions(
+            name='profile',
+            options={'ordering': ('id',), 'permissions': (('use_autocomplete', 'Can use autocomplete.'),)},
+        ),
+    ]

circle/dashboard/models.py

@@ -128,6 +128,9 @@ class ConnectCommand(Model):
                                      'host, port.'),
                          validators=[connect_command_template_validator])
 
+    class Meta:
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.template
 
@@ -218,6 +221,7 @@ class Profile(Model):
         super(Profile, self).save(*args, **kwargs)
 
     class Meta:
+        ordering = ('id', )
         permissions = (
             ('use_autocomplete', _('Can use autocomplete.')),
         )
@@ -229,6 +233,7 @@ class FutureMember(Model):
     group = ForeignKey(Group)
 
     class Meta:
+        ordering = ('id', )
         unique_together = ('org_id', 'group')
 
     def __unicode__(self):
@@ -247,6 +252,9 @@ class GroupProfile(AclBase):
         help_text=_('Unique identifier of the group at the organization.'))
     description = TextField(blank=True)
 
+    class Meta:
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.group.name
 

circle/dashboard/tables.py

@@ -149,6 +149,7 @@ class GroupListTable(Table):
         attrs = {'class': ('table table-bordered table-striped table-hover '
                            'group-list-table')}
         fields = ('pk', 'name', )
+        order_by = ('pk', )
 
 
 class UserListTable(Table):
@@ -176,6 +177,7 @@ class UserListTable(Table):
         attrs = {'class': ('table table-bordered table-striped table-hover')}
         fields = ('username', 'last_name', 'first_name', 'profile__org_id',
                   'email', 'is_active', 'is_superuser')
+        order_by = ('username', )
 
 
 class TemplateListTable(Table):

circle/dashboard/templates/dashboard/_client-check.html

@@ -22,7 +22,7 @@
         {% csrf_token %}
         <a class="btn btn-default" href="{%  url "dashboard.views.detail" pk=instance.pk %}" data-dismiss="modal">{% trans "Cancel" %}</a>
         <a class="btn btn-info" href="{{ client_download_url }}" traget="_blank">{% trans "Download the Client" %}</a>
-        <button data-dismiss="modal" id="client-check-button" type="submit" class="btn btn-success" title="{% trans "I downloaded and installed the client and I want to connect using it. This choice will be saved to your compuer" %}">
+        <button data-dismiss="modal" id="client-check-button" type="submit" class="btn btn-success modal-accept" title="{% trans "I downloaded and installed the client and I want to connect using it. This choice will be saved to your compuer" %}">
             <i class="fa fa-external-link"></i> {% trans "I have the Client installed" %}
         </button>
         <input id="connect-uri" name="connect-uri" type="hidden" value="{% if instance.get_connect_uri %}{{ instance.get_connect_uri}}{% endif %}" />

circle/dashboard/templates/dashboard/confirm/ajax-delete.html

@@ -18,7 +18,7 @@
             {% csrf_token %}
             <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
             <input type="hidden" name="next" value="{{ request.GET.next }}"/>
-            <button class="btn btn-danger"
+            <button class="btn btn-danger modal-accept"
               {% if disable_submit %}disabled{% endif %}
               >{% trans "Delete" %}</button>
           </form>

circle/dashboard/templates/dashboard/mass-operate.html

@@ -31,7 +31,7 @@ Do you want to perform the <strong>{{op}}</strong> operation on the following {{
   <div class="pull-right">
     <a class="btn btn-default" href="{% url "dashboard.views.vm-list" %}"
      data-dismiss="modal">{% trans "Cancel" %}</a>
-    <button class="btn btn-{{ opview.effect }}" type="submit" id="mass-op-form-send">
+    <button class="btn btn-{{ opview.effect }} modal-accept" type="submit" id="mass-op-form-send">
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ opview.name|capfirst }}
     </button>
   </div>

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

@@ -39,3 +39,15 @@
 </div>
 {% endfor %}
 </div>
+
+{% if show_show_all %}
+<div id="show-all-activities-container">
+  <a id="show-all-activities" href="#">
+    {% if activities|length > 10 %}
+      {% trans "Show less activities" %} <i class="fa fa-angle-double-up"></i>
+    {% else %}
+      {% trans "Show all activities" %} <i class="fa fa-angle-double-down"></i>
+    {% endif %}
+  </a>
+</div>
+{% endif %}

circle/dashboard/templates/dashboard/operate.html

@@ -20,7 +20,7 @@ Do you want to perform the following operation on
   <div class="pull-right">
     <a class="btn btn-default" href="{{object.get_absolute_url}}"
         data-dismiss="modal">{% trans "Cancel" %}</a>
-    <button class="btn btn-{{ opview.effect }} btn-op-form-send" type="submit" id="op-form-send">
+    <button class="btn btn-{{ opview.effect }} btn-op-form-send modal-accept" type="submit" id="op-form-send">
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ op.name|capfirst }}
     </button>
   </div>

circle/dashboard/templates/dashboard/storage/detail.html

@@ -89,10 +89,10 @@
               <div class="input-group">
                 <input type="text" name="s" class="form-control"
                 value="{{ request.GET.s }}" placeholder="{% trans "Search..." %}"/>
+                <input type="hidden" name="filter" value="{{ request.GET.filter }}"/>
                 <span class="input-group-btn">
                   <button class="btn btn-primary"><i class="fa fa-search"></i></button>
                 </span>
-                <input type="hidden" name="filter" value="{{ request.GET.filter }}"/>
               </div>
             </form>
           </div>

circle/dashboard/tests/test_views.py

@@ -24,10 +24,12 @@ from django.contrib.auth.models import User, Group
 from django.contrib.auth.models import Permission
 from django.contrib.auth import authenticate
 
+from common.tests.celery_mock import MockCeleryMixin
 from dashboard.views import VmAddInterfaceView
 from vm.models import Instance, InstanceTemplate, Lease, Node, Trait
 from vm.operations import (WakeUpOperation, AddInterfaceOperation,
-                           AddPortOperation, RemoveInterfaceOperation)
+                           AddPortOperation, RemoveInterfaceOperation,
+                           DeployOperation)
 from ..models import Profile
 from firewall.models import Vlan, Host, VlanGroup
 from mock import Mock, patch
@@ -44,7 +46,7 @@ class LoginMixin(object):
         self.assertNotEqual(response.status_code, 403)
 
 
-class VmDetailTest(LoginMixin, TestCase):
+class VmDetailTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -217,21 +219,25 @@ class VmDetailTest(LoginMixin, TestCase):
         self.login(c, 'user1')
         InstanceTemplate.objects.get(id=1).set_level(self.u1, 'user')
         Vlan.objects.get(id=1).set_level(self.u1, 'user')
-        response = c.post('/dashboard/vm/create/',
-                          {'template': 1,
-                           'system': "bubi",
-                           'cpu_priority': 1, 'cpu_count': 1,
-                           'ram_size': 1000})
+        with patch.object(DeployOperation, 'async') as async:
+            response = c.post('/dashboard/vm/create/',
+                              {'template': 1,
+                               'system': "bubi",
+                               'cpu_priority': 1, 'cpu_count': 1,
+                               'ram_size': 1000})
+        assert async.called
         self.assertEqual(response.status_code, 302)
 
     def test_use_permitted_template_superuser(self):
         c = Client()
         self.login(c, 'superuser')
-        response = c.post('/dashboard/vm/create/',
-                          {'template': 1,
-                           'system': "bubi",
-                           'cpu_priority': 1, 'cpu_count': 1,
-                           'ram_size': 1000})
+        with patch.object(DeployOperation, 'async') as async:
+            response = c.post('/dashboard/vm/create/',
+                              {'template': 1,
+                               'system': "bubi",
+                               'cpu_priority': 1, 'cpu_count': 1,
+                               'ram_size': 1000})
+        assert async.called
         self.assertEqual(response.status_code, 302)
 
     def test_edit_unpermitted_template(self):
@@ -537,15 +543,17 @@ class VmDetailTest(LoginMixin, TestCase):
         self.login(c, "superuser")
 
         instance_count = Instance.objects.all().count()
-        response = c.post("/dashboard/vm/create/", {
-            'name': 'vm',
-            'amount': 2,
-            'customized': 1,
-            'template': 1,
-            'cpu_priority': 10, 'cpu_count': 1, 'ram_size': 128,
-            'network': [],
-        })
+        with patch.object(DeployOperation, 'async') as async:
+            response = c.post("/dashboard/vm/create/", {
+                'name': 'vm',
+                'amount': 2,
+                'customized': 1,
+                'template': 1,
+                'cpu_priority': 10, 'cpu_count': 1, 'ram_size': 128,
+                'network': [],
+            })
 
+        assert async.called
         self.assertEqual(response.status_code, 302)
         self.assertEqual(instance_count + 2, Instance.objects.all().count())
 
@@ -585,7 +593,7 @@ class VmDetailTest(LoginMixin, TestCase):
         self.assertEqual(Instance.objects.get(pk=1).description, "naonyo")
 
 
-class NodeDetailTest(LoginMixin, TestCase):
+class NodeDetailTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -756,7 +764,7 @@ class NodeDetailTest(LoginMixin, TestCase):
         self.assertEqual(len(Node.objects.get(pk=1).traits.all()), trait_count)
 
 
-class GroupCreateTest(LoginMixin, TestCase):
+class GroupCreateTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -858,7 +866,7 @@ class GroupCreateTest(LoginMixin, TestCase):
         self.assertTrue(newgroup.profile.has_level(self.u0, 'owner'))
 
 
-class GroupDeleteTest(LoginMixin, TestCase):
+class GroupDeleteTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -948,7 +956,7 @@ class GroupDeleteTest(LoginMixin, TestCase):
         self.assertEqual(Group.objects.count(), groupnum - 1)
 
 
-class GroupDetailTest(LoginMixin, TestCase):
+class GroupDetailTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -1332,7 +1340,7 @@ class GroupDetailTest(LoginMixin, TestCase):
         self.assertEqual(response.status_code, 302)
 
 
-class GroupListTest(LoginMixin, TestCase):
+class GroupListTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -1375,7 +1383,7 @@ class GroupListTest(LoginMixin, TestCase):
         self.g2.delete()
 
 
-class VmDetailVncTest(LoginMixin, TestCase):
+class VmDetailVncTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -1408,7 +1416,7 @@ class VmDetailVncTest(LoginMixin, TestCase):
         self.assertEqual(response.status_code, 403)
 
 
-class TransferOwnershipViewTest(LoginMixin, TestCase):
+class TransferOwnershipViewTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json']
 
     def setUp(self):
@@ -1446,7 +1454,7 @@ class TransferOwnershipViewTest(LoginMixin, TestCase):
         self.assertEqual(self.u2.notification_set.count(), c2 + 1)
 
 
-class IndexViewTest(LoginMixin, TestCase):
+class IndexViewTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -1548,7 +1556,7 @@ class ProfileViewTest(LoginMixin, TestCase):
         self.assertIsNone(authenticate(username="user1", password="asd"))
 
 
-class AclViewTest(LoginMixin, TestCase):
+class AclViewTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):
@@ -1666,7 +1674,7 @@ class AclViewTest(LoginMixin, TestCase):
         self.assertEqual(resp.status_code, 302)
 
 
-class VmListTest(LoginMixin, TestCase):
+class VmListTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):

circle/dashboard/views/node.py

@@ -102,7 +102,8 @@ class NodeDetailView(LoginRequiredMixin,
         ).order_by('-started').select_related()
         context['ops'] = get_operations(self.object, self.request.user)
         context['op'] = {i.op: i for i in context['ops']}
-        context['activities'] = na
+        context['show_show_all'] = len(na) > 10
+        context['activities'] = na[:10]
         context['trait_form'] = form
         context['graphite_enabled'] = (
             settings.GRAPHITE_URL is not None)
@@ -294,15 +295,21 @@ class NodeAddTraitView(SuperuserRequiredMixin, DetailView):
 
 class NodeActivityView(LoginRequiredMixin, SuperuserRequiredMixin, View):
     def get(self, request, pk):
+        show_all = request.GET.get("show_all", "false") == "true"
         node = Node.objects.get(pk=pk)
 
         activities = NodeActivity.objects.filter(
             node=node, parent=None).order_by('-started').select_related()
 
+        show_show_all = len(activities) > 10
+        if not show_all:
+            activities = activities[:10]
+
         response = {
             'activities': render_to_string(
                 "dashboard/node-detail/_activity-timeline.html",
-                RequestContext(request, {'activities': activities}))
+                RequestContext(request, {'activities': activities,
+                                         'show_show_all': show_show_all}))
         }
 
         return HttpResponse(

circle/fabfile.py

@@ -135,6 +135,18 @@ def test(test=""):
         run("./manage.py test --settings=circle.settings.test %s" % test)
 
 
+@roles('portal')
+def selenium(test=""):
+    "Run selenium tests"
+    with _workon("circle"), cd("~/circle/circle"):
+        if test == "f":
+            test = "--failed"
+        else:
+            test += " --with-id"
+        run("xvfb-run ./manage.py test "
+            "--settings=circle.settings.selenium_test %s" % test)
+
+
 def pull(dir="~/circle/circle"):
     "Pull from upstream branch (stash any changes)"
     now = unicode(datetime.datetime.now())

circle/firewall/migrations/0004_auto_20150318_1317.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('firewall', '0003_auto_20150226_1927'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='blacklistitem',
+            options={'ordering': ('id',), 'verbose_name': 'blacklist item', 'verbose_name_plural': 'blacklist items'},
+        ),
+        migrations.AlterModelOptions(
+            name='domain',
+            options={'ordering': ('id',), 'verbose_name': 'domain', 'verbose_name_plural': 'domains'},
+        ),
+        migrations.AlterModelOptions(
+            name='ethernetdevice',
+            options={'ordering': ('id',), 'verbose_name': 'ethernet device', 'verbose_name_plural': 'ethernet devices'},
+        ),
+        migrations.AlterModelOptions(
+            name='firewall',
+            options={'ordering': ('id',), 'verbose_name': 'firewall', 'verbose_name_plural': 'firewalls'},
+        ),
+        migrations.AlterModelOptions(
+            name='group',
+            options={'ordering': ('id',), 'verbose_name': 'host group', 'verbose_name_plural': 'host groups'},
+        ),
+        migrations.AlterModelOptions(
+            name='record',
+            options={'ordering': ('domain', 'name'), 'verbose_name': 'record', 'verbose_name_plural': 'records'},
+        ),
+        migrations.AlterModelOptions(
+            name='switchport',
+            options={'ordering': ('id',), 'verbose_name': 'switch port', 'verbose_name_plural': 'switch ports'},
+        ),
+        migrations.AlterModelOptions(
+            name='vlan',
+            options={'ordering': ('vid',), 'verbose_name': 'vlan', 'verbose_name_plural': 'vlans'},
+        ),
+        migrations.AlterModelOptions(
+            name='vlangroup',
+            options={'ordering': ('id',), 'verbose_name': 'vlan group', 'verbose_name_plural': 'vlan groups'},
+        ),
+    ]

circle/firewall/models.py

@@ -391,6 +391,11 @@ class Vlan(AclBase, models.Model):
     modified_at = models.DateTimeField(auto_now=True,
                                        verbose_name=_('modified at'))
 
+    class Meta:
+        verbose_name = _("vlan")
+        verbose_name_plural = _("vlans")
+        ordering = ('vid', )
+
     def clean(self):
         super(Vlan, self).clean()
         if self.ipv6_template:
@@ -540,6 +545,11 @@ class VlanGroup(models.Model):
     modified_at = models.DateTimeField(auto_now=True,
                                        verbose_name=_('modified at'))
 
+    class Meta:
+        verbose_name = _("vlan group")
+        verbose_name_plural = _("vlan groups")
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.name
 
@@ -562,6 +572,11 @@ class Group(models.Model):
     modified_at = models.DateTimeField(auto_now=True,
                                        verbose_name=_('modified at'))
 
+    class Meta:
+        verbose_name = _("host group")
+        verbose_name_plural = _("host groups")
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.name
 
@@ -935,6 +950,11 @@ class Firewall(models.Model):
     name = models.CharField(max_length=20, unique=True,
                             verbose_name=_('name'))
 
+    class Meta:
+        verbose_name = _("firewall")
+        verbose_name_plural = _("firewalls")
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.name
 
@@ -981,6 +1001,11 @@ class Domain(models.Model):
     ttl = models.IntegerField(default=600, verbose_name=_('ttl'))
     description = models.TextField(blank=True, verbose_name=_('description'))
 
+    class Meta:
+        verbose_name = _("domain")
+        verbose_name_plural = _("domains")
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.name
 
@@ -1058,6 +1083,8 @@ class Record(models.Model):
         return reverse('network.record', kwargs={'pk': self.pk})
 
     class Meta:
+        verbose_name = _("record")
+        verbose_name_plural = _("records")
         ordering = (
             'domain',
             'name',
@@ -1077,6 +1104,11 @@ class SwitchPort(models.Model):
     modified_at = models.DateTimeField(auto_now=True,
                                        verbose_name=_('modified_at'))
 
+    class Meta:
+        verbose_name = _("switch port")
+        verbose_name_plural = _("switch ports")
+        ordering = ('id', )
+
     def __unicode__(self):
         devices = ','.join(self.ethernet_devices.values_list('name',
                                                              flat=True))
@@ -1104,6 +1136,11 @@ class EthernetDevice(models.Model):
     modified_at = models.DateTimeField(auto_now=True,
                                        verbose_name=_('modified_at'))
 
+    class Meta:
+        verbose_name = _("ethernet device")
+        verbose_name_plural = _("ethernet devices")
+        ordering = ('id', )
+
     def __unicode__(self):
         return self.name
 
@@ -1136,7 +1173,8 @@ class BlacklistItem(models.Model):
 
     class Meta(object):
         verbose_name = _('blacklist item')
-        verbose_name_plural = _('blacklist')
+        verbose_name_plural = _('blacklist items')
+        ordering = ('id', )
 
     def get_absolute_url(self):
         return reverse('network.blacklist', kwargs={'pk': self.pk})

circle/firewall/tests/test_firewall.py

@@ -15,20 +15,22 @@
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
+from mock import patch
 from netaddr import IPSet, AddrFormatError
 
-from django.test import TestCase
+import django.conf
 from django.contrib.auth.models import User
-from ..admin import HostAdmin
+from django.forms import ValidationError
+from django.test import TestCase
+
+from common.tests.celery_mock import MockCeleryMixin
+from firewall.admin import HostAdmin
+from firewall.fw import dns, ipv6_to_octal
+from firewall.iptables import IptRule, IptChain, InvalidRuleExcepion
 from firewall.models import (Vlan, Domain, Record, Host, VlanGroup, Group,
                              Rule, Firewall)
-from firewall.fw import dns, ipv6_to_octal
 from firewall.tasks.local_tasks import reloadtask_worker, reloadtask
-from django.forms import ValidationError
-from ..iptables import IptRule, IptChain, InvalidRuleExcepion
-from mock import patch
 
-import django.conf
 settings = django.conf.settings.FIREWALL_SETTINGS
 
 
@@ -68,7 +70,7 @@ class HostAdminTestCase(TestCase):
         self.assertEqual(l, "alma, korte, szilva")
 
 
-class GetNewAddressTestCase(TestCase):
+class GetNewAddressTestCase(MockCeleryMixin, TestCase):
     def setUp(self):
         self.u1 = User.objects.create(username='user1')
         self.u1.save()
@@ -105,7 +107,7 @@ class GetNewAddressTestCase(TestCase):
         assert self.vlan.get_new_address()['ipv4'] not in used_v4
 
 
-class HostGetHostnameTestCase(TestCase):
+class HostGetHostnameTestCase(MockCeleryMixin, TestCase):
     def setUp(self):
         self.u1 = User.objects.create(username='user1')
         self.u1.save()
@@ -187,7 +189,7 @@ class IptablesTestCase(TestCase):
         self.assertEqual(len(compiled_v6.splitlines()), 0)
 
 
-class ReloadTestCase(TestCase):
+class ReloadTestCase(MockCeleryMixin, TestCase):
     def setUp(self):
         self.u1 = User.objects.create(username='user1')
         self.u1.save()
@@ -313,7 +315,22 @@ class ReloadTestCase(TestCase):
 
     def test_periodic_task(self):
         # TODO
-        with patch('firewall.tasks.local_tasks.cache') as cache:
+        cache = patch('firewall.tasks.local_tasks.cache')
+        grqn = patch('firewall.models.Firewall.get_remote_queue_name',
+                     return_value='fw.firewall')
+        worker = patch(
+            'firewall.tasks.local_tasks.reloadtask_worker.apply_async')
+
+        dns = patch('firewall.tasks.remote_tasks.reload_dns.apply_async')
+        fw = patch(
+            'firewall.tasks.remote_tasks.reload_firewall.apply_async')
+        fw_vlan = patch(
+            'firewall.tasks.remote_tasks.reload_firewall_vlan.apply_async')
+        blacklist = patch(
+            'firewall.tasks.remote_tasks.reload_blacklist.apply_async')
+        dhcp = patch('firewall.tasks.remote_tasks.reload_dhcp.apply_async')
+
+        with cache as cache, grqn, dns, fw, fw_vlan, blacklist, dhcp, worker:
             self.test_host_add_port()
             self.test_host_add_port2()
             reloadtask_worker()

circle/network/tests/test_views.py

@@ -20,6 +20,7 @@ from django.test.client import Client
 from django.contrib.auth.models import User, Group
 from mock import Mock
 
+from common.tests.celery_mock import MockCeleryMixin
 from dashboard.tests.test_views import LoginMixin
 
 from vm.models import Instance
@@ -29,7 +30,7 @@ import django.conf
 settings = django.conf.settings.FIREWALL_SETTINGS
 
 
-class VlanAclTest(LoginMixin, TestCase):
+class VlanAclTest(LoginMixin, MockCeleryMixin, TestCase):
     fixtures = ['test-vm-fixture.json', 'node.json']
 
     def setUp(self):

circle/vm/models/instance.py

@@ -56,7 +56,7 @@ pre_state_changed = Signal(providing_args=["new_state"])
 post_state_changed = Signal(providing_args=["new_state"])
 pwgen = partial(User.objects.make_random_password,
                 allowed_chars='abcdefghijklmnopqrstuvwx'
-                              'ABCDEFGHIJKLMNOPQRSTUVWX0123456789')
+                              'ABCDEFGHIJKLMNOPQRSTUVWX123456789')
 scheduler = import_module(name=django.conf.settings.VM_SCHEDULER)
 
 ACCESS_PROTOCOLS = django.conf.settings.VM_ACCESS_PROTOCOLS
@@ -818,7 +818,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
         return acts
 
     def get_merged_activities(self, user=None):
-        whitelist = ("create_disk", "download_disk", "add_port", "remove_port")
+        whitelist = ("create_disk", "download_disk", "remove_disk",
+                     "add_port", "remove_port",
+                     "add_interface", "remove_interface")
         acts = self.get_activities(user)
         merged_acts = []
         latest = None

circle/vm/operations.py

@@ -377,7 +377,12 @@ class DeployOperation(InstanceOperation):
             self.instance.allocate_node()
 
         # Deploy virtual images
-        self.instance._deploy_disks(parent_activity=activity)
+        try:
+            self.instance._deploy_disks(parent_activity=activity)
+        except:
+            self.instance.yield_node()
+            self.instance.yield_vnc_port()
+            raise
 
         # Deploy VM on remote machine
         if self.instance.state not in ['PAUSED']:
@@ -452,6 +457,9 @@ class DestroyOperation(InstanceOperation):
     required_perms = ()
     resultant_state = 'DESTROYED'
 
+    def on_abort(self, activity, error):
+        activity.resultant_state = None
+
     def _operation(self, activity, system):
         # Destroy networks
         with activity.sub_activity(
@@ -1093,16 +1101,17 @@ class ResetNodeOperation(NodeOperation):
                 "You cannot reset a disabled or online node."), Exception())
 
     def _operation(self, activity, user):
-        if self.node.enabled:
-            DisableOperation(self.node).call(parent_activity=activity,
-                                             user=user)
         for i in self.node.instance_set.all():
             name = create_readable(ugettext_noop(
-                "migrate %(instance)s (%(pk)s)"), instance=i.name, pk=i.pk)
+                "redeploy %(instance)s (%(pk)s)"), instance=i.name, pk=i.pk)
             with activity.sub_activity('migrate_instance_%d' % i.pk,
                                        readable_name=name):
                 i.redeploy(user=user)
 
+        self.node.enabled = False
+        self.node.schedule_enabled = False
+        self.node.save()
+
 
 @register_operation
 class FlushOperation(NodeOperation):

circle/vm/tests/test_models.py

@@ -24,6 +24,8 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 from django.utils.translation import ugettext_lazy as _
 
+from common.tests.celery_mock import MockCeleryMixin
+
 from ..models import (
     Lease, Node, Interface, Instance, InstanceTemplate, InstanceActivity,
 )
@@ -166,7 +168,7 @@ class InstanceTestCase(TestCase):
         self.assertEqual(Instance.get_status_icon(inst), 'fa-play')
 
 
-class InterfaceTestCase(TestCase):
+class InterfaceTestCase(MockCeleryMixin, TestCase):
 
     def test_interface_create(self):
         from firewall.models import Vlan, Domain

requirements/test.txt

@@ -3,5 +3,9 @@
 coverage==3.7.1
 factory-boy==2.4.1
 mock==1.0.1
-django-nose==1.2
+django-nose==1.3
 nose==1.3.4
+nose-exclude==0.2.0
+selenium==2.45.0
+selenose==1.3
+-e git+https://github.com/kmmbvnr/django-jenkins.git@019774dc2f668bc66b66f90f97eb8e14ae9566a4#egg=django_jenkins-dev