firewall: add openvswitch support

circle/firewall/fw.py

@@ -436,3 +436,11 @@ def dhcp():
                     })
 
     return DHCP
+
+
+def vlan():
+    obj = models.Vlan.objects.values('vid', 'name', 'network4', 'network6')
+    return {x['name']: {'tag': x['vid'],
+                        'addresses': [str(x['network4']),
+                                      str(x['network6'])]}
+            for x in obj}

circle/firewall/tasks/local_tasks.py

@@ -29,6 +29,12 @@ def periodic_task():
                                                      queue='firewall')
             print "firewall ujratoltese kesz"
 
+        if cache.get('firewall_vlan_lock'):
+            cache.delete("firewall_vlan_lock")
+            remote_tasks.reload_firewall_vlan.apply_async(args=[vlan()],
+                                                          queue='firewall')
+            print "firewall_vlan ujratoltese kesz"
+
         if cache.get('blacklist_lock'):
             cache.delete("blacklist_lock")
             remote_tasks.reload_blacklist.apply_async(args=[list(ipset())],
@@ -50,4 +56,7 @@ def reloadtask(type='Host'):
         if type == "Blacklist":
             cache.add("blacklist_lock", "true", 30)
 
+        if type == "Vlan":
+            cache.add("firewall_vlan_lock", "true", 30)
+
         print type

circle/firewall/tasks/remote_tasks.py

@@ -11,6 +11,11 @@ def reload_firewall(data4, data6):
     pass
 
 
+@celery.task(name='firewall.reload_firewall_vlan')
+def reload_firewall_vlan(data):
+    pass
+
+
 @celery.task(name='firewall.reload_dhcp')
 def reload_dhcp(data):
     pass