Changed Rspec --> RSpec throughout.

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

diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py
index c5fa4dc..c311887 100644 (file)
--- a/sfa/rspecs/aggregates/vini/utils.py
+++ b/sfa/rspecs/aggregates/vini/utils.py
@@ -481,7 +481,7 @@ class Topology:
                 return link
         return None
     
-    def nodeTopoFromRspec(self, rspec):
+    def nodeTopoFromRSpec(self, rspec):
         if self.nodelinks:
             raise Error("virtual topology already present")
             
@@ -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]]
@@ -560,7 +560,7 @@ class Topology:
     """
     def toxml(self, hrn = None):
         xml = """<?xml version="1.0"?>
-<Rspec xmlns="http://www.planet-lab.org/sfa/rspec/" name="vini">
+<RSpec xmlns="http://www.planet-lab.org/sfa/rspec/" name="vini">
     <Capacity>
         <NetSpec name="physical_topology">"""
 
@@ -616,7 +616,7 @@ class Topology:
         xml += """
         </NetSpec>
     </Request>
-</Rspec>"""
+</RSpec>"""
 
         # Remove all leading whitespace and newlines
         lines = xml.split("\n")