extra match field for SDN chaining commands

diff --git a/src/emuvim/api/zerorpc/network.py b/src/emuvim/api/zerorpc/network.py
index b1e5d41..e5d5ca0 100644 (file)
--- a/src/emuvim/api/zerorpc/network.py
+++ b/src/emuvim/api/zerorpc/network.py
@@ -64,7 +64,7 @@ class DCNetworkApi(object):
     def __init__(self, net):
         self.net = net
 
     def __init__(self, net):
         self.net = net
 

-    def network_action_start(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, weight=None):
+    def network_action_start(self, vnf_src_name, vnf_dst_name, kwargs):

         # call DCNetwork method, not really datacenter specific API for now...
         # provided dc name needs to be part of API endpoint
         # no check if vnfs are really connected to this datacenter...
         # call DCNetwork method, not really datacenter specific API for now...
         # provided dc name needs to be part of API endpoint
         # no check if vnfs are really connected to this datacenter...


@@ -72,9 +72,10 @@ class DCNetworkApi(object):
         try:
             c = self.net.setChain(
                 vnf_src_name, vnf_dst_name,
         try:
             c = self.net.setChain(
                 vnf_src_name, vnf_dst_name,

-                vnf_src_interface=vnf_src_interface,
-                vnf_dst_interface=vnf_dst_interface,
-                weight=weight)
+                vnf_src_interface=kwargs.get('vnf_src_interface'),
+                vnf_dst_interface=kwargs.get('vnf_dst_interface'),
+                weight=kwargs.get('weight'),
+                match=kwargs.get('match'))

             return str(c)
         except Exception as ex:
             logging.exception("RPC error.")
             return str(c)
         except Exception as ex:
             logging.exception("RPC error.")

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
 \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_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
         # 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
         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
         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
         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
         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
 \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
 \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
     "--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
 \r
 def main(argv):\r
     args = vars(parser.parse_args(argv))\r

diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
index ac44d57..ec42b66 100755 (executable)
--- a/src/emuvim/dcemulator/net.py
+++ b/src/emuvim/dcemulator/net.py
@@ -221,7 +221,8 @@ class DCNetwork(Dockernet):
         CLI(self)
 
     # to remove chain do setChain( src, dst, cmd='del-flows')
         CLI(self)
 
     # to remove chain do setChain( src, dst, cmd='del-flows')

-    def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow', weight=None):
+    def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow',
+                 weight=None, **kwargs):

 
         logging.info('vnf_src_if: {0}'.format(vnf_src_interface))
         #check if port is specified (vnf:port)
 
         logging.info('vnf_src_if: {0}'.format(vnf_src_interface))
         #check if port is specified (vnf:port)


@@ -306,6 +307,12 @@ class DCNetwork(Dockernet):
             # TODO need multiple matches to do this (VLAN tags)
             if isinstance( current_node, OVSSwitch ):
                 match = 'in_port=%s' % switch_inport_nr
             # TODO need multiple matches to do this (VLAN tags)
             if isinstance( current_node, OVSSwitch ):
                 match = 'in_port=%s' % switch_inport_nr

+                #add additional match entries from the argument
+                match_input = kwargs.get('match')
+                logging.info('match input:{0}'.format(match_input))
+                if match_input:
+                    s = ','
+                    match = s.join([match,match_input])

 
                 if cmd=='add-flow':
                     action = 'action=%s' % switch_outport_nr
 
                 if cmd=='add-flow':
                     action = 'action=%s' % switch_outport_nr