ListResources uses the 'rspec_version' field specified in the 'options' struct to...

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

diff --git a/sfa/rspecs/rspec_parser.py b/sfa/rspecs/rspec_parser.py
index 9ab9e7f..c3dde65 100755 (executable)
--- a/sfa/rspecs/rspec_parser.py
+++ b/sfa/rspecs/rspec_parser.py
@@ -3,6 +3,7 @@ from sfa.rspecs.sfa_rspec import SfaRSpec
 from sfa.rspecs.pg_rspec import PGRSpec
 from sfa.rspecs.rspec import RSpec
 from lxml import etree 
+from 
 
 def parse_rspec(in_rspec):
     rspec = RSpec(rspec=in_rspec)
@@ -12,22 +13,21 @@ def parse_rspec(in_rspec):
     if rspec.xml.xpath('//network'):
         #out_rspec = SfaRSpec(in_rspec)
         out_rspec = SfaRSpec()
-        out_rspec.xml = rspec
+        out_rspec.xml = rspec.xml
     else:
         #out_rspec = PGRSpec(in_rspec)
         out_rspec = PGRSpec()
-        out_rspec.xml = rspec
+        out_rspec.xml = rspec.xml
     return out_rspec
 
-
 if __name__ == '__main__':
     
     print "Parsing SFA RSpec:", 
     rspec = parse_rspec('nodes.rspec')
-    print rspec.type
+    print rspec.format
     rspec = parse_rspec('protogeni.rspec')
     print "Parsing ProtoGENI RSpec:", 
-    print rspec.type
+    print rspec.format