Merge pull request #151 from stevenvanrossem/master

keep mgmt interface + add priority option for flowrules

diff --git a/src/emuvim/api/rest/network.py b/src/emuvim/api/rest/network.py
index 3c0062e..e3945b0 100755 (executable)
--- a/src/emuvim/api/rest/network.py
+++ b/src/emuvim/api/rest/network.py
@@ -85,6 +85,7 @@ class NetworkAction(Resource):
             match = data.get("match")
             bidirectional = data.get("bidirectional")
             cookie = data.get("cookie")
+            priority = data.get("priority")
             c = net.setChain(
                 vnf_src_name, vnf_dst_name,
                 vnf_src_interface=vnf_src_interface,
@@ -93,7 +94,8 @@ class NetworkAction(Resource):
                 weight=weight,
                 match=match,
                 bidirectional=bidirectional,
-                cookie=cookie)
+                cookie=cookie,
+                priority=priority)
             # return setChain response
             return str(c), 200
         except Exception as ex:

diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py
index bea0a01..0fb3aa0 100755 (executable)
--- a/src/emuvim/api/sonata/dummygatekeeper.py
+++ b/src/emuvim/api/sonata/dummygatekeeper.py
@@ -225,9 +225,7 @@ class Service(object):
             # 3. do the dc.startCompute(name="foobar") call to run the container
             # TODO consider flavors, and other annotations
             intfs = vnfd.get("connection_points")
-            # mgmt connection points can be skipped, this is considered to be the connection the default docker0 bridge
-            intfs = [intf for intf in intfs if 'mgmt' not in intf['id']]
-            
+
             # use the vnf_id in the nsd as docker name
             # so deployed containers can be easily mapped back to the nsd
             vnf_name2id = defaultdict(lambda: "NotExistingNode",

diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
index cbe668f..bca20b2 100755 (executable)
--- a/src/emuvim/dcemulator/net.py
+++ b/src/emuvim/dcemulator/net.py
@@ -405,6 +405,7 @@ class DCNetwork(Containernet):
         path = kwargs.get('path')
         current_hop = kwargs.get('current_hop')
         vlan = kwargs.get('vlan')
+        priority = kwargs.get('priority')
 
         s = ','
         if match_input:
@@ -415,7 +416,8 @@ class DCNetwork(Containernet):
 
         if cookie:
             flow['cookie'] = int(cookie)
-
+        if priority:
+            flow['priority'] = int(priority)
 
         flow['actions'] = []