merge in rspec_extensions branch

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

diff --git a/sfa/rspecs/rspec_parser.py b/sfa/rspecs/rspec_parser.py
index 3d96860..8e3bced 100755 (executable)
--- a/sfa/rspecs/rspec_parser.py
+++ b/sfa/rspecs/rspec_parser.py
@@ -4,7 +4,6 @@ from sfa.rspecs.pg_rspec import PGRSpec
 from sfa.rspecs.rspec import RSpec
 from lxml import etree 
 
-
 def parse_rspec(in_rspec):
     rspec = RSpec(rspec=in_rspec)
     # really simple check
@@ -16,20 +15,19 @@ def parse_rspec(in_rspec):
         out_rspec.xml = rspec.xml
     else:
         #out_rspec = PGRSpec(in_rspec)
+        # TODO: determine if this is an ad or request
         out_rspec = PGRSpec()
         out_rspec.xml = rspec.xml
     return out_rspec
 
-
-
 if __name__ == '__main__':
     
     print "Parsing SFA RSpec:", 
     rspec = parse_rspec('nodes.rspec')
-    print rspec.format
+    print rspec.version
     rspec = parse_rspec('protogeni.rspec')
     print "Parsing ProtoGENI RSpec:", 
-    print rspec.format
+    print rspec.version