projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #152 from hadik3r/master
[osm/vim-emu.git]
/
src
/
emuvim
/
api
/
rest
/
network.py
diff --git
a/src/emuvim/api/rest/network.py
b/src/emuvim/api/rest/network.py
index
68256f5
..
e3945b0
100755
(executable)
--- a/
src/emuvim/api/rest/network.py
+++ b/
src/emuvim/api/rest/network.py
@@
-74,7
+74,9
@@
class NetworkAction(Resource):
try:
# check if json data is a dict
data = request.json
try:
# check if json data is a dict
data = request.json
- if type(data) is not dict:
+ if data is None:
+ data = {}
+ elif type(data) is not dict:
data = json.loads(request.json)
vnf_src_interface = data.get("vnf_src_interface")
data = json.loads(request.json)
vnf_src_interface = data.get("vnf_src_interface")
@@
-83,6
+85,7
@@
class NetworkAction(Resource):
match = data.get("match")
bidirectional = data.get("bidirectional")
cookie = data.get("cookie")
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,
c = net.setChain(
vnf_src_name, vnf_dst_name,
vnf_src_interface=vnf_src_interface,
@@
-91,7
+94,8
@@
class NetworkAction(Resource):
weight=weight,
match=match,
bidirectional=bidirectional,
weight=weight,
match=match,
bidirectional=bidirectional,
- cookie=cookie)
+ cookie=cookie,
+ priority=priority)
# return setChain response
return str(c), 200
except Exception as ex:
# return setChain response
return str(c), 200
except Exception as ex: