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

@@ -9,6 +9,7 @@
 from xcpngutils import configure_logging, error_wrapped, run_command, raise_plugin_error
 
 OPENFLOW_PROTOCOL = "OpenFlow11"
+OVS_OFCTL_CMD = "ovs-ofctl"
 VALID_PROTOCOLS = {"tcp", "udp", "icmp", "ip", "arp"}
 PROTOCOLS_WITH_PORTS = {"tcp", "udp"}
 
@@ -139,7 +140,6 @@ def parse_priority(args):
     except ValueError:
         return None, "'{}' is not a valid priority".format(priority)
 
-    return priority, None
 
 class Parser:
     def __init__(self, args):
@@ -253,7 +253,7 @@ def add_rule(_session, args):
     if rule_args["protocol"] in PROTOCOLS_WITH_PORTS and not rule_args["port"]:
         log_and_raise_error(E_PARAMS, "add_rule: No port provided, tcp and udp requires one")
 
-    ofctl_cmd = ["ovs-ofctl", "-O", OPENFLOW_PROTOCOL, "add-flow", rule_args["bridge"]]
+    ofctl_cmd = [OVS_OFCTL_CMD, "-O", OPENFLOW_PROTOCOL, "add-flow", rule_args["bridge"]]
 
     # We can now build the open flow rule
     rules = build_rules_string(rule_args)
@@ -294,7 +294,7 @@ def del_rule(_session, args):
     if rule_args["protocol"] in PROTOCOLS_WITH_PORTS and not rule_args["port"]:
         log_and_raise_error(E_PARAMS, "del_rule: No port provided, tcp and udp requires one")
 
-    ofctl_cmd = ["ovs-ofctl", "-O", OPENFLOW_PROTOCOL, "del-flows", rule_args["bridge"]]
+    ofctl_cmd = [OVS_OFCTL_CMD, "-O", OPENFLOW_PROTOCOL, "del-flows", rule_args["bridge"]]
 
     # We can now build the open flow rule
     rules = build_rules_string(rule_args)
@@ -316,7 +316,7 @@ def dump_flows(_session, args):
     if err:
         log_and_raise_error(E_PARSER, "dump flows: {}".format(err))
 
-    ofctl_cmd = ["ovs-ofctl", "-O", OPENFLOW_PROTOCOL, "dump-flows", bridge]
+    ofctl_cmd = [OVS_OFCTL_CMD, "-O", OPENFLOW_PROTOCOL, "dump-flows", bridge]
     cmd = run_command(ofctl_cmd, check=False)
     if cmd['returncode']:
         log_and_raise_error(E_OVSCALL, "Error dumping flows: %s: %s" % (format(ofctl_cmd), cmd['stderr']))