Merge branch 'feature-management-commands' into 'master'

Feature management commands

See merge request !274

circle/dashboard/management/commands/init.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 __future__ import unicode_literals, absolute_import
+
+from optparse import make_option
+
+from django.contrib.auth.models import User
+from django.core.management.base import BaseCommand
+
+from firewall.models import (Vlan, VlanGroup, Domain, Firewall, Rule,
+                             SwitchPort, EthernetDevice, Host)
+from storage.models import DataStore
+from vm.models import Lease
+
+
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        make_option('--force', action="store_true"),
+        make_option('--portal-ip'),
+        make_option('--external-net'),
+        make_option('--management-net'),
+        make_option('--vm-net'),
+        make_option('--external-if'),
+        make_option('--management-if'),
+        make_option('--trunk-if'),
+        make_option('--datastore-queue'),
+        make_option('--firewall-queue'),
+        make_option('--admin-user'),
+        make_option('--admin-pass'),
+    )
+
+    def create(self, model, field, **kwargs):
+        value = kwargs[field]
+        qs = model.objects.filter(**{field: value})[:1]
+        if not qs.exists():
+            obj = model.objects.create(**kwargs)
+            self.changed.append('New %s: %s' % (model, obj))
+            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))
+
+    def handle(self, *args, **options):
+        self.changed = []
+
+        if (DataStore.objects.exists() and Vlan.objects.exists()
+                and not options['force']):
+            return self.print_state()
+
+        admin = self.create(User, 'username', username=options['admin_user'],
+                            is_superuser=True, is_staff=True)
+        admin.set_password(options['admin_pass'])
+        admin.save()
+
+        self.create(DataStore, 'path', path='/datastore', name='default',
+                    hostname=options['datastore_queue'])
+
+        # leases
+        self.create(Lease, 'name', name='lab',
+                    suspend_interval_seconds=3600 * 5,
+                    delete_interval_seconds=3600 * 24 * 7)
+
+        self.create(Lease, 'name', name='project',
+                    suspend_interval_seconds=3600 * 24 * 30,
+                    delete_interval_seconds=3600 * 24 * 30 * 6)
+
+        self.create(Lease, 'name', name='server',
+                    suspend_interval_seconds=3600 * 24 * 365,
+                    delete_interval_seconds=3600 * 24 * 365 * 3)
+
+        domain = self.create(Domain, 'name', name='example.com', owner=admin)
+
+        # vlans
+        net = self.create(Vlan, 'name', name='net', vid=4,
+                          network4=options['external_net'], domain=domain)
+
+        man = self.create(Vlan, 'name', name='man', vid=3, dhcp_pool='manual',
+                          network4=options['management_net'], domain=domain,
+                          snat_ip=options['external_net'].split('/')[0])
+        man.snat_to.add(net)
+        man.snat_to.add(man)
+
+        vm = self.create(Vlan, 'name', name='vm', vid=2, dhcp_pool='manual',
+                         network4=options['vm_net'], domain=domain,
+                         snat_ip=options['external_net'].split('/')[0])
+        vm.snat_to.add(net)
+        vm.snat_to.add(vm)
+
+        # default vlan groups
+        vg_all = self.create(VlanGroup, 'name', name='all')
+        vg_all.vlans.add(vm, man, net)
+
+        vg_pf = self.create(VlanGroup, 'name', name='portforward')
+        vg_pf.vlans.add(vm, man, net)
+
+        vg_net = self.create(VlanGroup, 'name', name='net')
+        vg_net.vlans.add(net)
+
+        # portal host
+        portal = self.create(Host, 'hostname', hostname='portal', vlan=man,
+                             mac='11:22:33:44:55:66', owner=admin,
+                             shared_ip=True, external_ipv4=man.snat_ip,
+                             ipv4=options['portal_ip'])
+        portal.add_port(proto='tcp', public=443, private=443)
+        portal.add_port(proto='tcp', public=22, private=22)
+
+        # firewall rules
+        fw = self.create(Firewall, 'name', name=options['firewall_queue'])
+
+        self.create(Rule, 'description', description='default output rule',
+                    direction='out', action='accept',
+                    foreign_network=vg_all, firewall=fw)
+
+        self.create(Rule, 'description', description='default input rule',
+                    direction='in', action='accept',
+                    foreign_network=vg_all, firewall=fw)
+
+        # vlan rules
+        self.create(Rule, 'description', description='allow vm->net',
+                    direction='out', action='accept',
+                    foreign_network=vg_net, vlan=vm)
+
+        self.create(Rule, 'description', description='allow man->net',
+                    direction='out', action='accept',
+                    foreign_network=vg_net, vlan=man)
+
+        # switch
+        # uplink interface
+        sp_net = self.create(SwitchPort, 'untagged_vlan', untagged_vlan=net)
+        self.create(EthernetDevice, 'switch_port', switch_port=sp_net,
+                    name=options['external_if'])
+
+        # management interface
+        if options['management_if']:
+            sp_man = self.create(
+                SwitchPort, 'untagged_vlan', untagged_vlan=man)
+            self.create(EthernetDevice, 'switch_port', switch_port=sp_man,
+                        name=options['management_if'])
+
+        # vm interface
+        sp_trunk = self.create(
+            SwitchPort, 'tagged_vlans', untagged_vlan=man, tagged_vlans=vg_all)
+        self.create(EthernetDevice, 'switch_port', switch_port=sp_trunk,
+                    name=options['trunk_if'])
+
+        return self.print_state()

circle/firewall/management/commands/reload_firewall.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 __future__ import unicode_literals, absolute_import
+
+from django.core.management.base import BaseCommand
+
+from firewall.tasks.local_tasks import reloadtask
+
+
+class Command(BaseCommand):
+    def handle(self, *args, **options):
+        reloadtask('Vlan')

circle/firewall/models.py

@@ -824,9 +824,6 @@ class Host(models.Model):
                         proto=proto, nat=False, action='accept',
                         host=self, foreign_network=vg)
             if self.behind_nat:
-                if public < 1024:
-                    raise ValidationError(
-                        _("Only ports above 1024 can be used."))
                 rule.nat_external_port = public
                 rule.nat = True
             rule.full_clean()

circle/firewall/tests/test_firewall.py

@@ -311,11 +311,6 @@ class ReloadTestCase(TestCase):
         new_rules = h.rules.count()
         self.assertEqual(new_rules, old_rules)
 
-    def test_host_add_port_w_validationerror(self):
-        h = self.h1
-        self.assertRaises(ValidationError, h.add_port,
-                          'tcp', public=1000, private=22)
-
     def test_periodic_task(self):
         # TODO
         with patch('firewall.tasks.local_tasks.cache') as cache: