fixup! Add a new sdn controller plugin

Signed-off-by: David Morel <david.morel@vates.tech>

Author: bleader

SOURCES/etc/xapi.d/plugins/sdncontroller.py

@@ -31,9 +31,9 @@ def __init__(self, args):
         self.values = {}
         self.errors = []
 
-    def parse_bridge(self, args):
+    def parse_bridge(self):
         BRIDGE_REGEX = re.compile(r"\b\w+\d+\b")
-        bridge = args.get("bridge")
+        bridge = self.args.get("bridge")
 
         if bridge is None:
             log_and_raise_error(E_PARSER, "bridge parameter is missing")
@@ -43,9 +43,9 @@ def parse_bridge(self, args):
 
         return bridge
 
-    def parse_mac(self, args):
+    def parse_mac(self):
         MAC_REGEX = re.compile(r"^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$")
-        mac_addr = args.get("mac")
+        mac_addr = self.args.get("mac")
 
         if mac_addr is None:
             return None
@@ -55,12 +55,12 @@ def parse_mac(self, args):
 
         return mac_addr
 
-    def parse_iprange(self, args):
+    def parse_iprange(self):
         IPRANGE_REGEX = re.compile(
             r"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}"
             r"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(/\d{1,2})?$"
         )
-        ip_range = args.get("iprange")
+        ip_range = self.args.get("iprange")
 
         if ip_range is None:
             log_and_raise_error(E_PARSER, "ip range parameter is missing")
@@ -70,8 +70,8 @@ def parse_iprange(self, args):
 
         return ip_range
 
-    def parse_direction(self, args):
-        direction = args.get("direction")
+    def parse_direction(self):
+        direction = self.args.get("direction")
 
         if direction is None:
             log_and_raise_error(E_PARSER, "direction parameter is missing")
@@ -85,8 +85,8 @@ def parse_direction(self, args):
 
         return (has_to, has_from)
 
-    def parse_protocol(self, args):
-        protocol = args.get("protocol")
+    def parse_protocol(self):
+        protocol = self.args.get("protocol")
 
         if protocol is None:
             log_and_raise_error(E_PARSER, "protocol parameter is missing")
@@ -98,8 +98,8 @@ def parse_protocol(self, args):
 
         return protocol
 
-    def parse_port(self, args):
-        port = args.get("port")
+    def parse_port(self):
+        port = self.args.get("port")
         if port is None:
             return None
 
@@ -111,8 +111,8 @@ def parse_port(self, args):
         except ValueError:
             log_and_raise_error(E_PARSER, "'{}' is not a valid port".format(port))
 
-    def parse_allow(self, args):
-        allow = args.get("allow")
+    def parse_allow(self):
+        allow = self.args.get("allow")
         if allow is None:
             log_and_raise_error(E_PARSER, "allow parameter is missing")
 
@@ -124,8 +124,8 @@ def parse_allow(self, args):
 
         return False
 
-    def parse_priority(self, args):
-        priority = args.get("priority")
+    def parse_priority(self):
+        priority = self.args.get("priority")
         if priority is None:
             return None
 
@@ -141,7 +141,7 @@ def read(self, key, parse_fn, dests=None):
         # parse_fn can return a single value or a tuple of values.
         # In this case we are expecting dests to match the expected
         # returned tuple
-        val = parse_fn(self.args)
+        val = parse_fn()
 
         if dests is not None:
             if not isinstance(val, tuple):
@@ -298,7 +298,7 @@ def dump_flows(_session, args):
 
     parser = Parser(args)
     try:
-        bridge = parser.parse_bridge(args)
+        bridge = parser.parse_bridge()
     except XenAPIPlugin.Failure as e:
         log_and_raise_error(E_PARSER, "dump_flows: Failed to get parameters: {}".format(e.params[1]))
 

tests/test_sdn-controller.py

@@ -30,11 +30,11 @@ def parser_test(method, params):
     exc = params['exception']
     if exc:
         with pytest.raises(exc['type']) as e:
-            ret = method(params['input'])
+            ret = method()
         assert e.value.params[0] == exc['code']
         assert e.value.params[1] == exc['text']
     else:
-        ret = method(params['input'])
+        ret = method()
         assert ret == params['result']
 
 class TestSdnControllerParser: