extra match field for SDN chaining commands

[osm/vim-emu.git] / src / emuvim / cli / network.py

diff --git a/src/emuvim/cli/network.py b/src/emuvim/cli/network.py
index c524226..5fa9993 100755 (executable)
--- a/src/emuvim/cli/network.py
+++ b/src/emuvim/cli/network.py
@@ -29,18 +29,20 @@ class ZeroRpcClient(object):
 \r
     def add(self, args):\r
         vnf_src_name = self._parse_vnf_name(args.get("source"))\r
-        vnf_src_interface = self._parse_vnf_interface(args.get("source"))\r
         vnf_dst_name = self._parse_vnf_name(args.get("destination"))\r
-        vnf_dst_interface = self._parse_vnf_interface(args.get("destination"))\r
-        weight = args.get("weight")\r
+\r
+        params = self._create_dict(\r
+            vnf_src_interface=self._parse_vnf_interface(args.get("source")),\r
+            vnf_dst_interface=self._parse_vnf_interface(args.get("destination")),\r
+            weight=args.get("weight"),\r
+            match=args.get("match"))\r
+\r
         # note zerorpc does not support named arguments\r
         r = self.c.network_action_start(\r
             #args.get("datacenter"),\r
             vnf_src_name,\r
             vnf_dst_name,\r
-            vnf_src_interface,\r
-            vnf_dst_interface,\r
-            weight)\r
+            params)\r
         pp.pprint(r)\r
 \r
     def remove(self, args):\r
@@ -49,13 +51,15 @@ class ZeroRpcClient(object):
         vnf_dst_name = self._parse_vnf_name(args.get("destination"))\r
         vnf_dst_interface = self._parse_vnf_interface(args.get("destination"))\r
         weight = args.get("weight")\r
+        match = args.get("match")\r
         r = self.c.network_action_stop(\r
             #args.get("datacenter"),\r
             vnf_src_name,\r
             vnf_dst_name,\r
             vnf_src_interface,\r
             vnf_dst_interface,\r
-            weight)\r
+            weight,\r
+            match)\r
         pp.pprint(r)\r
 \r
     def _parse_vnf_name(self, vnf_name_str):\r
@@ -70,6 +74,8 @@ class ZeroRpcClient(object):
 \r
         return vnf_interface\r
 \r
+    def _create_dict(self, **kwargs):\r
+        return kwargs\r
 \r
 parser = argparse.ArgumentParser(description='son-emu network')\r
 parser.add_argument(\r
@@ -87,6 +93,9 @@ parser.add_argument(
 parser.add_argument(\r
     "--weight", "-w", dest="weight",\r
     help="weight metric to calculate the path")\r
+parser.add_argument(\r
+    "--match", "-m", dest="match",\r
+    help="string holding extra matches for the flow entries")\r
 \r
 def main(argv):\r
     args = vars(parser.parse_args(argv))\r