Rspec to RSpec
authorAndy Bavier <acb@cs.princeton.edu>
Thu, 15 Oct 2009 17:44:09 +0000 (17:44 +0000)
committerAndy Bavier <acb@cs.princeton.edu>
Thu, 15 Oct 2009 17:44:09 +0000 (17:44 +0000)
sfa/rspecs/aggregates/vini/rspec.py
sfa/rspecs/aggregates/vini/utils.py

index 9ee3602..12b7b44 100644 (file)
@@ -38,8 +38,8 @@ class ViniRspec(Rspec):
                     sldict['bw'] = [format_tc_rate(sl.bps)]
                     sitelinkspecs.append(sldict)
                     
-        d['Rspec']['Capacity'][0]['NetSpec'][0]['SiteSpec'] = sitespecs
-        d['Rspec']['Capacity'][0]['NetSpec'][0]['SiteLinkSpec'] = sitelinkspecs
+        d['RSpec']['Capacity'][0]['NetSpec'][0]['SiteSpec'] = sitespecs
+        d['RSpec']['Capacity'][0]['NetSpec'][0]['SiteLinkSpec'] = sitelinkspecs
         self.parseDict(d)
 
 
@@ -52,6 +52,6 @@ class ViniRspec(Rspec):
             linkspecs.append(edict)
 
         d = self.toDict()
-        d['Rspec']['Request'][0]['NetSpec'][0]['LinkSpec'] = linkspecs
-        d['Rspec']['Request'][0]['NetSpec'][0]['name'] = slice.hrn
-        self.parseDict(d)
\ No newline at end of file
+        d['RSpec']['Request'][0]['NetSpec'][0]['LinkSpec'] = linkspecs
+        d['RSpec']['Request'][0]['NetSpec'][0]['name'] = slice.hrn
+        self.parseDict(d)
index c5fa4dc..e67e041 100644 (file)
@@ -490,7 +490,7 @@ class Topology:
         for node in self.getNodes():
             nodedict[node.tag] = node
             
-        linkspecs = rspecdict['Rspec']['Request'][0]['NetSpec'][0]['LinkSpec']    
+        linkspecs = rspecdict['RSpec']['Request'][0]['NetSpec'][0]['LinkSpec']    
         for l in linkspecs:
             n1 = nodedict[l['endpoint'][0]]
             n2 = nodedict[l['endpoint'][1]]