git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3c38f44
)
Cleanup
author
Andy Bavier
<acb@cs.princeton.edu>
Fri, 5 Feb 2010 18:56:20 +0000
(18:56 +0000)
committer
Andy Bavier
<acb@cs.princeton.edu>
Fri, 5 Feb 2010 18:56:20 +0000
(18:56 +0000)
sfa/plc/network.py
patch
|
blob
|
history
diff --git
a/sfa/plc/network.py
b/sfa/plc/network.py
index
fed7c46
..
498a0a7
100644
(file)
--- a/
sfa/plc/network.py
+++ b/
sfa/plc/network.py
@@
-368,8
+368,6
@@
class Network:
for node in self.getNodes():
nodedict[node.idtag] = node
for node in self.getNodes():
nodedict[node.idtag] = node
- slicenodes = {}
-
tree = etree.parse(StringIO(xml))
if schema:
tree = etree.parse(StringIO(xml))
if schema:
@@
-391,14
+389,12
@@
class Network:
for sliver in rspec.iterfind("./network/site/node/sliver"):
elem = sliver.getparent()
node = nodedict[elem.get("id")]
for sliver in rspec.iterfind("./network/site/node/sliver"):
elem = sliver.getparent()
node = nodedict[elem.get("id")]
- slicenodes[node.id] = node
node.add_sliver()
self.__process_attributes(sliver, node)
# Find slivers that specify nodeid
for sliver in rspec.iterfind("./request/sliver[@nodeid]"):
node = nodedict[sliver.get("nodeid")]
node.add_sliver()
self.__process_attributes(sliver, node)
# Find slivers that specify nodeid
for sliver in rspec.iterfind("./request/sliver[@nodeid]"):
node = nodedict[sliver.get("nodeid")]
- slicenodes[node.id] = node
node.add_sliver()
self.__process_attributes(sliver, node)
node.add_sliver()
self.__process_attributes(sliver, node)