Merge Master in geni-v3 conflict resolution

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

diff --git a/sfa/rspecs/rspec.py b/sfa/rspecs/rspec.py
index 38865bb..8364788 100755 (executable)
--- a/sfa/rspecs/rspec.py
+++ b/sfa/rspecs/rspec.py
@@ -18,7 +18,11 @@ class RSpec:
         self.user_options = user_options
         self.elements = {}
         if rspec:
-            self.parse_xml(rspec)
+            if version:
+                self.version = self.version_manager.get_version(version)
+                self.parse_xml(rspec, version)
+            else:
+                self.parse_xml(rspec)
         elif version:
             self.create(version)
         else:
@@ -29,7 +33,7 @@ class RSpec:
         """
         self.version = self.version_manager.get_version(version)
         self.namespaces = self.version.namespaces
-        self.parse_xml(self.version.template) 
+        self.parse_xml(self.version.template, self.version) 
         # eg. 2011-03-23T19:53:28Z 
         date_format = '%Y-%m-%dT%H:%M:%SZ'
         now = datetime.utcnow()
@@ -39,16 +43,16 @@ class RSpec:
         self.xml.set('generated', generated_ts)
 
 
-    def parse_xml(self, xml):
+    def parse_xml(self, xml, version=None):
         self.xml.parse_xml(xml)
-        self.version = None
-        if self.xml.schema:
-            self.version = self.version_manager.get_version_by_schema(self.xml.schema)
-        else:
-            #raise InvalidRSpec('unknown rspec schema: %s' % schema)
-            # TODO: Should start raising an exception once SFA defines a schema.
-            # for now we just  default to sfa 
-            self.version = self.version_manager.get_version({'type':'sfa','version': '1'})
+        if not version:
+            if self.xml.schema:
+                self.version = self.version_manager.get_version_by_schema(self.xml.schema)
+            else:
+                #raise InvalidRSpec('unknown rspec schema: %s' % schema)
+                # TODO: Should start raising an exception once SFA defines a schema.
+                # for now we just  default to sfa 
+                self.version = self.version_manager.get_version({'type':'sfa','version': '1'})
         self.version.xml = self.xml    
         self.namespaces = self.xml.namespaces