Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud

firewall/admin.py

@@ -12,13 +12,19 @@ class RuleInline(contrib.admin.TabularInline):
     model = Rule
     model = Rule
 
 
 class HostAdmin(admin.ModelAdmin):
 class HostAdmin(admin.ModelAdmin):
-    list_display = ('hostname', 'vlan', 'ipv4', 'ipv6', 'pub_ipv4', 'mac', 'shared_ip', 'owner', 'description', 'reverse')
+    list_display = ('hostname', 'vlan', 'ipv4', 'ipv6', 'pub_ipv4', 'mac', 'shared_ip', 'owner', 'description', 'reverse', 'groups_l')
     ordering = ('hostname', )
     ordering = ('hostname', )
     list_filter = ('owner', 'vlan', 'groups')
     list_filter = ('owner', 'vlan', 'groups')
     search_fields = ('hostname', 'description', 'ipv4', 'ipv6', 'mac')
     search_fields = ('hostname', 'description', 'ipv4', 'ipv6', 'mac')
     filter_horizontal = ('groups', )
     filter_horizontal = ('groups', )
     inlines = (AliasInline, RuleInline)
     inlines = (AliasInline, RuleInline)
 
 
+    def groups_l(self, instance):
+        retval = []
+        for i in instance.groups.all():
+            retval.append(i.name)
+        return u', '.join(retval)
+
 class HostInline(contrib.admin.TabularInline):
 class HostInline(contrib.admin.TabularInline):
     model = Host
     model = Host
     fields = ('hostname', 'ipv4', 'ipv6', 'pub_ipv4', 'mac', 'shared_ip', 'owner', 'reverse')
     fields = ('hostname', 'ipv4', 'ipv6', 'pub_ipv4', 'mac', 'shared_ip', 'owner', 'reverse')
@@ -26,7 +32,7 @@ class HostInline(contrib.admin.TabularInline):
 class VlanAdmin(admin.ModelAdmin):
 class VlanAdmin(admin.ModelAdmin):
     list_display = ('vid', 'name', 'ipv4', 'net_ipv4', 'ipv6', 'net_ipv6', 'description', 'domain', 'snat_ip', )
     list_display = ('vid', 'name', 'ipv4', 'net_ipv4', 'ipv6', 'net_ipv6', 'description', 'domain', 'snat_ip', )
     ordering = ('vid', )
     ordering = ('vid', )
-    inlines = (HostInline, RuleInline)
+    inlines = (RuleInline, )
 
 
 class RuleAdmin(admin.ModelAdmin):
 class RuleAdmin(admin.ModelAdmin):
     list_display = ('r_type', 'color_desc', 'owner', 'extra', 'direction', 'accept', 'proto', 'sport', 'dport', 'nat', 'nat_dport', 'used_in')
     list_display = ('r_type', 'color_desc', 'owner', 'extra', 'direction', 'accept', 'proto', 'sport', 'dport', 'nat', 'nat_dport', 'used_in')

firewall/models.py

@@ -163,7 +163,7 @@ class Host(models.Model):
         for host in Host.objects.filter(pub_ipv4=self.pub_ipv4):
         for host in Host.objects.filter(pub_ipv4=self.pub_ipv4):
             if host.rules.filter(nat=True, proto=proto, dport=public):
             if host.rules.filter(nat=True, proto=proto, dport=public):
                 raise ValidationError("A %s %s port mar hasznalva" % (proto, public))
                 raise ValidationError("A %s %s port mar hasznalva" % (proto, public))
-        rule = Rule(direction='1', owner=self.owner, dport=public, proto=proto, nat=True, accept=True, r_type="host", nat_dport=private, host=host, foreign_network=VlanGroup.objects.get(name=settings["default_vlangroup"]))
+        rule = Rule(direction='1', owner=self.owner, dport=public, proto=proto, nat=True, accept=True, r_type="host", nat_dport=private, host=self, foreign_network=VlanGroup.objects.get(name=settings["default_vlangroup"]))
         rule.full_clean()
         rule.full_clean()
         rule.save()
         rule.save()
 
 

firewall/views.py

@@ -17,8 +17,6 @@ import sys
 def reload_firewall(request):
 def reload_firewall(request):
     if request.user.is_authenticated():
     if request.user.is_authenticated():
         if(request.user.is_superuser):
         if(request.user.is_superuser):
-            ipv4 = firewall()
-            return HttpResponse(ipv4.show())
             html = u"Be vagy jelentkezve es admin is vagy, kedves %s!" % request.user.username
             html = u"Be vagy jelentkezve es admin is vagy, kedves %s!" % request.user.username
             html += "<br> 10 masodperc mulva ujratoltodik"
             html += "<br> 10 masodperc mulva ujratoltodik"
             ReloadTask.delay()
             ReloadTask.delay()

one/models.py

@@ -183,7 +183,7 @@ class Network(models.Model):
             cls.objects.exclude(id__in=l).delete()
             cls.objects.exclude(id__in=l).delete()
 
 
     def __unicode__(self):
     def __unicode__(self):
-        return u"%s (vlan%03d)" % (self.name, self.id)
+        return self.name
     class Meta:
     class Meta:
         ordering = ['name']
         ordering = ['name']