From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 8 Feb 2010 20:43:08 +0000 (+0000)
Subject: Cleanup
X-Git-Tag: sfa-0.9-11~137
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=0f5cfbd2274ed92824d2a291e52295cb095d50dc

Cleanup
---

diff --git a/sfa/plc/network.py b/sfa/plc/network.py
index c2c3043e..89ecdd13 100644
--- a/sfa/plc/network.py
+++ b/sfa/plc/network.py
@@ -39,7 +39,7 @@ class Iface:
 
 
 class Node:
-    def __init__(self, network, node, bps = 1000 * 1000000):
+    def __init__(self, network, node):
         self.network = network
         self.id = node['node_id']
         self.idtag = "n%s" % self.id
@@ -366,10 +366,6 @@ class Network:
     Annotate the objects in the Network with information from the RSpec
     """
     def addRSpec(self, xml, schema=None):
-        nodedict = {}
-        for node in self.getNodes():
-            nodedict[node.idtag] = node
-            
         try:
             tree = etree.parse(StringIO(xml))
         except etree.XMLSyntaxError:
@@ -387,6 +383,7 @@ class Network:
                 raise InvalidRSpec(message)
 
         rspec = tree.getroot()
+        self.rspec = rspec
 
         defaults = rspec.find("./network/sliver_defaults")
         self.__process_attributes(defaults)