pretty print rules

firewall/admin.py

@@ -14,7 +14,7 @@ class VlanAdmin(admin.ModelAdmin):
     ordering = ('vid',)
     ordering = ('vid',)
 
 
 class RuleAdmin(admin.ModelAdmin):
 class RuleAdmin(admin.ModelAdmin):
-    list_display = ('r_type', 'desc', 'description', 'vlan_l', 'owner', 'extra', 'direction', 'accept', 'proto', 'sport', 'dport', 'nat', 'nat_dport')
+    list_display = ('r_type', 'color_desc', 'description', 'vlan_l', 'owner', 'extra', 'direction', 'accept', 'proto', 'sport', 'dport', 'nat', 'nat_dport')
     list_filter = ('r_type', 'vlan', 'owner', 'direction', 'accept', 'proto', 'nat')
     list_filter = ('r_type', 'vlan', 'owner', 'direction', 'accept', 'proto', 'nat')
 
 
 admin.site.register(Host, HostAdmin)
 admin.site.register(Host, HostAdmin)

firewall/models.py

+# -*- coding: utf8 -*-
+
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 from django.db import models
 from django.db import models
 from django.forms import fields, ValidationError
 from django.forms import fields, ValidationError
@@ -25,15 +27,28 @@ class Rule(models.Model):
 
 
      def __unicode__(self):
      def __unicode__(self):
         return self.desc()
         return self.desc()
+
+     def color_desc(self):
+	para = '</span>'
+	if(self.dport):
+		para = "dport=%s %s" % (self.dport, para)
+	if(self.sport):
+		para = "sport=%s %s" % (self.sport, para)
+	if(self.proto):
+		para = "proto=%s %s" % (self.proto, para)
+	para= '<span style="color: #00FF00;">' + para
+	return '<span style="color: #FF0000;">[' + self.r_type + ']</span> ' + (self.vlan_l() + '<span style="color: #0000FF;">&#8594;</span>' + self.r_type if self.direction=='1' else self.r_type + '<span style="color: #0000FF;">&#8594;</span>' + self.vlan_l()) + ' ' + para + ' ' +self.description
+     color_desc.allow_tags = True
+
      def desc(self):
      def desc(self):
 	para = ""
 	para = ""
 	if(self.dport):
 	if(self.dport):
 		para = "dport=%s %s" % (self.dport, para)
 		para = "dport=%s %s" % (self.dport, para)
 	if(self.sport):
 	if(self.sport):
-		para = "dport=%s %s" % (self.sport, para)
+		para = "sport=%s %s" % (self.sport, para)
 	if(self.proto):
 	if(self.proto):
-		para = "dport=%s %s" % (self.proto, para)
-	return '[' + self.r_type + '] ' + (self.vlan_l() + '->' + self.r_type if self.direction else self.r_type + '->' + self.vlan_l()) + ' ' + para + ' ' +self.description
+		para = "proto=%s %s" % (self.proto, para)
+	return '[' + self.r_type + '] ' + (self.vlan_l() + '&#8594;' + self.r_type if self.direction=='1' else self.r_type + '&#8594;' + self.vlan_l()) + ' ' + para + ' ' +self.description
      def vlan_l(self):
      def vlan_l(self):
 	retval = []
 	retval = []
 	for vl in self.vlan.all():
 	for vl in self.vlan.all():
@@ -113,9 +128,9 @@ class Host(models.Model):
     def rules_l(self):
     def rules_l(self):
 	retval = []
 	retval = []
 	for rl in self.rules.all():
 	for rl in self.rules.all():
-		retval.append(str(rl))
-	return ', '.join(retval)
-
+		retval.append(str(rl.color_desc()))
+	return '<br>'.join(retval)
+    rules_l.allow_tags = True
     def enable_net(self):
     def enable_net(self):
 	self.groups.add(Group.objects.get(name="netezhet"))
 	self.groups.add(Group.objects.get(name="netezhet"))
 
 
@@ -126,7 +141,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, description="%s %s %s->%s" % (self.hostname, proto, public, private), dport=public, proto=proto, nat=True, accept=True, r_type="host", nat_dport=private)
+	rule = Rule(direction='1', owner=self.owner, description="%s %s %s&#8594;%s" % (self.hostname, proto, public, private), dport=public, proto=proto, nat=True, accept=True, r_type="host", nat_dport=private)
 	rule.full_clean()
 	rule.full_clean()
 	rule.save()
 	rule.save()
 	rule.vlan.add(Vlan.objects.get(name="PUB"))
 	rule.vlan.add(Vlan.objects.get(name="PUB"))

firewall/tasks.py

@@ -36,6 +36,7 @@ class ReloadTask(Task):
 			dhcp()
 			dhcp()
 			print "vege"
 			print "vege"
 		except:
 		except:
+			raise
 			print "nem sikerult :("
 			print "nem sikerult :("
 
 
 		print "leall"
 		print "leall"