projects
/
osm
/
LW-UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new django app packagehandler
[osm/LW-UI.git]
/
lib
/
osm
/
osm_rdcl_parser.py
diff --git
a/lib/osm/osm_rdcl_parser.py
b/lib/osm/osm_rdcl_parser.py
index
84814f2
..
a6c6f0f
100644
(file)
--- a/
lib/osm/osm_rdcl_parser.py
+++ b/
lib/osm/osm_rdcl_parser.py
@@
-267,9
+267,27
@@
class OsmParser(RdclGraph):
"layer": {
"vnfd": {
"nodes": {
"layer": {
"vnfd": {
"nodes": {
- "vdu": {},
- "cp": {},
- "int_cp": {},
+ "vdu": {
+ "addable": {
+ "callback": "addNode"
+ },
+ "removable": {
+ "callback": "removeNode"
+ }
+ },
+ "cp": {
+ "addable": {
+ "callback": "addNode"
+ },
+ "removable": {
+ "callback": "removeNode"
+ }
+ },
+ "int_cp": {
+ "removable": {
+ "callback": "removeNode"
+ }
+ },
"vnf_vl": {
"addable": {
"callback": "addNode"
"vnf_vl": {
"addable": {
"callback": "addNode"
@@
-283,37
+301,45
@@
class OsmParser(RdclGraph):
"vdu": {
"destination": {
"cp": {
"vdu": {
"destination": {
"cp": {
+ "callback": "addLink",
"direct_edge": False,
"direct_edge": False,
- },
- "int_cp": {
- "direct_edge": False,
+ "removable": {}
},
"vnf_vl": {
},
"vnf_vl": {
+ "callback": "addLink",
"direct_edge": False,
"direct_edge": False,
+ "removable": {}
}
}
},
"cp": {
"destination": {
"vdu": {
}
}
},
"cp": {
"destination": {
"vdu": {
+ "callback": "addLink",
"direct_edge": False,
"direct_edge": False,
+ "removable": {}
}
}
},
}
}
},
- "int_cp": {
- "destination": {
- "vdu": {
- "direct_edge": False,
- },
- "vnf_vl": {
- "direct_edge": False,
- }
- }
- },
+
#
"int_cp": {
+
#
"destination": {
+
#
"vdu": {
+
#
"direct_edge": False,
+
#
},
+
#
"vnf_vl": {
+
#
"direct_edge": False,
+
#
}
+
#
}
+
#
},
"vnf_vl": {
"destination": {
"vnf_vl": {
"destination": {
- "
vdu
": {
+ "
int_cp
": {
"direct_edge": False
"direct_edge": False
+ },
+ "vdu": {
+ "callback": "addLink",
+ "direct_edge": False,
+ "removable": {}
}
}
}
}
}
}
@@
-322,7
+348,8
@@
class OsmParser(RdclGraph):
"name": "OSM",
"version": 1,
"description": "osm"
"name": "OSM",
"version": 1,
"description": "osm"
- }, "callback": {"addNode": {"class": "OSMController"}, "removeNode": {"class": "OSMController"}}
+ }, "callback": {"addNode": {"class": "OSMController"}, "removeNode": {"class": "OSMController"},
+ "removeLink": {"class": "OSMController"}, "addLink": {"class": "OSMController"}}
}, 'graph_parameters': {'view': {'vnfd': {}}}}
if 'vnfd-catalog' in vnfd_catalog:
vnfd = vnfd_catalog['vnfd-catalog']['vnfd'][0]
}, 'graph_parameters': {'view': {'vnfd': {}}}}
if 'vnfd-catalog' in vnfd_catalog:
vnfd = vnfd_catalog['vnfd-catalog']['vnfd'][0]
@@
-369,12
+396,10
@@
class OsmParser(RdclGraph):
"layer": {
"nsd": {
"nodes": {
"layer": {
"nsd": {
"nodes": {
- "vnf": {"addable": {
- "callback": "addNode"
- },
- "removable": {
- "callback": "removeNode"
- }},
+ "vnf": {
+ "addable": {"callback": "addNode"},
+ "removable": {"callback": "removeNode"}
+ },
"cp": {},
"ns_vl": {
"addable": {
"cp": {},
"ns_vl": {
"addable": {