Refactor handling of proto parameter

Author: jonathanunderwood

netjsonconfig/backends/openwrt/converters/firewall.py

@@ -168,13 +168,9 @@ def to_netjson_loop(self, block, result, index):
     def __netjson_rule(self, rule):
         if "enabled" in rule:
             rule["enabled"] = rule.pop("enabled") == "1"
+
         if "proto" in rule:
-            proto = rule.pop("proto")
-            if not isinstance(proto, list):
-                if proto == "tcpudp":
-                    rule["proto"] = ["tcp", "udp"]
-                else:
-                    rule["proto"] = [proto]
+            rule["proto"] = self.__netjson_generic_proto(rule["proto"])
 
         return self.type_cast(rule)
 
@@ -199,7 +195,7 @@ def __netjson_forwarding(self, forwarding):
 
     def __netjson_redirect(self, redirect):
         if "proto" in redirect:
-            redirect["proto"] = self.__netjson_redirect_proto(redirect["proto"])
+            redirect["proto"] = self.__netjson_generic_proto(redirect["proto"])
 
         if "weekdays" in redirect:
             redirect["weekdays"] = self.__netjson_redirect_weekdays(
@@ -225,7 +221,7 @@ def __netjson_redirect(self, redirect):
 
         return self.type_cast(redirect)
 
-    def __netjson_redirect_proto(self, proto):
+    def __netjson_generic_proto(self, proto):
         if isinstance(proto, list):
             return proto.copy()
         else: