git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding dce ccn example with topology generator
[nepi.git]
/
src
/
nepi
/
util
/
parsers
/
xml_parser.py
diff --git
a/src/nepi/util/parsers/xml_parser.py
b/src/nepi/util/parsers/xml_parser.py
index
af57cf1
..
ca68be1
100644
(file)
--- a/
src/nepi/util/parsers/xml_parser.py
+++ b/
src/nepi/util/parsers/xml_parser.py
@@
-345,8
+345,8
@@
class ECXMLParser(object):
if name == "net":
net = xmldecode(annonode.getAttribute("value"), eval) # dict
if name == "net":
net = xmldecode(annonode.getAttribute("value"), eval) # dict
- netgraph.annotate_edge_net(n
et[nid1], net[nid2], net["ip1"],
- net["
ip2"], net["
mask"], net["network"], net["prefix"])
+ netgraph.annotate_edge_net(n
id1, nid2, net[nid1], net[nid2],
+ net["mask"], net["network"], net["prefix"])
else:
value = xmldecode(annonode.getAttribute("value"))
tipe = xmldecode(annonode.getAttribute("type"))
else:
value = xmldecode(annonode.getAttribute("value"))
tipe = xmldecode(annonode.getAttribute("type"))