firewall: random fixes

circle/firewall/iptables.py

@@ -89,7 +89,7 @@ class IptChain(object):
             self.rules.add(rule)
             self.rules.add(rule)
 
 
     def sort(self):
     def sort(self):
-        return sorted(list(self.rules))
+        return sorted(list(self.rules), reverse=True)
 
 
     def __len__(self):
     def __len__(self):
         return len(self.rules)
         return len(self.rules)

circle/firewall/migrations/0045_auto__del_field_host_pub_ipv4__add_field_host_external_ipv4__del_field.py

@@ -32,8 +32,8 @@ class Migration(SchemaMigration):
             if rule.nat:
             if rule.nat:
                 # swap
                 # swap
                 tmp = rule.dport
                 tmp = rule.dport
-#                rule.dport = rule.nat_external_port
-#                rule.nat_external_port = tmp
+                rule.dport = rule.nat_external_port
+                rule.nat_external_port = tmp
             if rule.direction == '0':
             if rule.direction == '0':
                 rule.direction = 'out'
                 rule.direction = 'out'
             elif rule.direction == '1':
             elif rule.direction == '1':