updated

diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index 162a1c4..75a7a17 100644 (file)
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -4,9 +4,9 @@ class PGv2:
     type = 'ProtoGENI'
     content_type = '*'
     version = '2'
     type = 'ProtoGENI'
     content_type = '*'
     version = '2'

-    schema = 'http://www.protogeni.net/resources/rspec/2/*.xsd' 
-    namespaces = { 
-        'default' : 'http://www.protogeni.net/resources/rspec/2',
+    schema = 'http://www.protogeni.net/resources/rspec/2/*.xsd'
+    namespace = 'http://www.protogeni.net/resources/rspec/2' 
+    extensions = { 

         'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
         'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1", 
     }
         'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
         'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1", 
     }

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index 648e8d3..e33e1c4 100644 (file)
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -1,11 +1,13 @@
+from sfa.rspecs.rspec_version import RSpecVersion

 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
 
 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
 

-class SFAv1:
+class SFAv1(RSpecVersion):

     type = 'SFA'
     content_type = '*'
     version = '1'
     schema = None
     type = 'SFA'
     content_type = '*'
     version = '1'
     schema = None

-    namespaces = {}
+    namespace = None
+    extensions = {}

     elements = [
         RSpecElement(RSpecElements.NETWORK, 'network', '//network'),
         RSpecElement(RSpecElements.NODE, 'node', '//node'),
     elements = [
         RSpecElement(RSpecElements.NETWORK, 'network', '//network'),
         RSpecElement(RSpecElements.NODE, 'node', '//node'),