rename type to format

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index 2d59bd4..c3bda95 100755 (executable)
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -14,7 +14,7 @@ class PGRSpec(RSpec):
                  }
     schemas =  {'xsi': 'http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd'
             }
-    type = 'pg'
+    format = 'pg'
 
     def create(self, type="advertisement"):
         RSpec.create(self)

diff --git a/sfa/rspecs/rspec_manager.py b/sfa/rspecs/rspec_manager.py
deleted file mode 100755 (executable)
index 8fa2f7e..0000000
--- a/sfa/rspecs/rspec_manager.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/python
-from sfa.rspecs.sfa_rspec import SfaRSpec
-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
-    # TODO: check against schema instead
-    out_rspec = None 
-    if rspec.xml.xpath('//network'):
-        #out_rspec = SfaRSpec(in_rspec)
-        out_rspec = SfaRSpec()
-        out_rspec.xml = rspec.xml
-    else:
-        #out_rspec = PGRSpec(in_rspec)
-        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.type
-    rspec = parse_rspec('protogeni.rspec')
-    print "Parsing ProtoGENI RSpec:", 
-    print rspec.type
-    
-    
-

diff --git a/sfa/rspecs/rspec_parser.py b/sfa/rspecs/rspec_parser.py
index 6e1d65a..3d96860 100755 (executable)
--- a/sfa/rspecs/rspec_parser.py
+++ b/sfa/rspecs/rspec_parser.py
@@ -26,10 +26,10 @@ 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
     
     
 

diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py
index 2202158..5ff743e 100755 (executable)
--- a/sfa/rspecs/sfa_rspec.py
+++ b/sfa/rspecs/sfa_rspec.py
@@ -11,7 +11,7 @@ class SfaRSpec(RSpec):
     xml = None
     header = '<?xml version="1.0"?>\n'
     namespaces = {}
-    type = 'sfa'
+    format = 'sfa'
     ###################
     # Parser
     ###################