Changed Rspec --> RSpec throughout.

[sfa.git] / sfa / rspecs / aggregates / vini / rspec.py

diff --git a/sfa/rspecs/aggregates/vini/rspec.py b/sfa/rspecs/aggregates/vini/rspec.py
index 9ee3602..fb08c1a 100644 (file)
--- a/sfa/rspecs/aggregates/vini/rspec.py
+++ b/sfa/rspecs/aggregates/vini/rspec.py
@@ -1,12 +1,12 @@
-from sfa.util.rspec import Rspec
+from sfa.util.rspec import RSpec
 from sfa.rspecs.aggregates.vini.utils import *
 import sys
 
 SFA_VINI_DEFAULT_RSPEC = '/etc/sfa/vini.rspec'
 
-class ViniRspec(Rspec):
+class ViniRSpec(RSpec):
     def __init__(self, xml = None, xsd = None, NSURL = None):
-        Rspec.__init__(self, xml, xsd, NSURL)
+        RSpec.__init__(self, xml, xsd, NSURL)
         if not xml:
             self.parseFile(SFA_VINI_DEFAULT_RSPEC)
         
@@ -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)