X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Fnetwork.py;h=48ff33a6a3697a91797e80d1261672c43ed31271;hb=895477dd7ea7969bfc42d4e70e090d2be8c31382;hp=8d4219b662275b6972b4bd66a9c781b17f8de624;hpb=7f89ec08278873d335e15a9cf39034692c666bff;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/cli/network.py b/src/emuvim/cli/network.py
index 8d4219b..48ff33a 100755
--- a/src/emuvim/cli/network.py
+++ b/src/emuvim/cli/network.py
@@ -1,6 +1,7 @@
 """
 son-emu network CLI
 (c) 2016 by Manuel Peuster <manuel.peuster@upb.de>
+Steven Van Rossem <steven.vanrossem@intec.ugent.be>
 """
 
 import argparse
@@ -25,27 +26,67 @@ class ZeroRpcClient(object):
             # call the local method with the same name as the command arg
             getattr(self, args["command"])(args)
         else:
-            print "Command not implemented."
+            print("Command not implemented.")
 
     def add(self, args):
+        vnf_src_name = self._parse_vnf_name(args.get("source"))
+        vnf_dst_name = self._parse_vnf_name(args.get("destination"))
+
+        params = self._create_dict(
+            vnf_src_interface=self._parse_vnf_interface(args.get("source")),
+            vnf_dst_interface=self._parse_vnf_interface(args.get("destination")),
+            weight=args.get("weight"),
+            match=args.get("match"),
+            bidirectional=args.get("bidirectional"),
+            cookie=args.get("cookie"))
+
+        # note zerorpc does not support named arguments
         r = self.c.network_action_start(
             #args.get("datacenter"),
-            args.get("source"),
-            args.get("destination"))
+            vnf_src_name,
+            vnf_dst_name,
+            params)
         pp.pprint(r)
 
     def remove(self, args):
+        vnf_src_name = self._parse_vnf_name(args.get("source"))
+        vnf_dst_name = self._parse_vnf_name(args.get("destination"))
+
+        params = self._create_dict(
+            vnf_src_interface=self._parse_vnf_interface(args.get("source")),
+            vnf_dst_interface=self._parse_vnf_interface(args.get("destination")),
+            weight=args.get("weight"),
+            match=args.get("match"),
+            bidirectional=args.get("bidirectional"),
+            cookie=args.get("cookie"))
+
         r = self.c.network_action_stop(
             #args.get("datacenter"),
-            args.get("source"),
-            args.get("destination"))
+            vnf_src_name,
+            vnf_dst_name,
+            params)
         pp.pprint(r)
 
+    def _parse_vnf_name(self, vnf_name_str):
+        vnf_name = vnf_name_str.split(':')[0]
+        return vnf_name
+
+    def _parse_vnf_interface(self, vnf_name_str):
+        try:
+            vnf_interface = vnf_name_str.split(':')[1]
+        except:
+            vnf_interface = None
+
+        return vnf_interface
+
+    def _create_dict(self, **kwargs):
+        return kwargs
 
 parser = argparse.ArgumentParser(description='son-emu network')
 parser.add_argument(
     "command",
-    help="Action to be executed: add|remove")
+    choices=['add', 'remove'],
+    help="Action to be executed.")
 parser.add_argument(
     "--datacenter", "-d", dest="datacenter",
     help="Data center to in which the network action should be initiated")
@@ -55,6 +96,19 @@ parser.add_argument(
 parser.add_argument(
     "--destination", "-dst", dest="destination",
     help="vnf name of the destination of the chain")
+parser.add_argument(
+    "--weight", "-w", dest="weight",
+    help="weight metric to calculate the path")
+parser.add_argument(
+    "--match", "-m", dest="match",
+    help="string holding extra matches for the flow entries")
+parser.add_argument(
+    "--bidirectional", "-b", dest="bidirectional",
+    action='store_true',
+    help="add/remove the flow entries from src to dst and back")
+parser.add_argument(
+    "--cookie", "-c", dest="cookie",
+    help="cookie for this flow, as easy to use identifier (eg. per tenant/service)")
 
 def main(argv):
     args = vars(parser.parse_args(argv))