X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fpg_rspec.py;fp=sfa%2Frspecs%2Fpg_rspec.py;h=a998f86cf53aa3c7000f09bcec99ffc05c119a54;hb=27091c5dbe38674fee5e91d153315449027d3061;hp=a2033cdc2746e4f4bdbc27f3b19b2a2737e564f4;hpb=3244a98433c769a9c8df52f5a493edc157372dc2;p=sfa.git

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index a2033cdc..a998f86c 100755
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -4,19 +4,26 @@ from StringIO import StringIO
 from sfa.rspecs.rspec import RSpec 
 from sfa.util.xrn import *
 from sfa.util.plxrn import hostname_to_urn
-from sfa.util.config import Config  
+from sfa.util.config import Config 
+from sfa.rspecs.rspec_version import RSpecVersion 
+
+_version = {'type':  'protogeni',
+            'version': '2',
+            'schema': 'http://www.protogeni.net/resources/rspec/2/request.xsd',
+            'namespace': 'http://www.protogeni.net/resources/rspec/2',
+            'extenstions':  [
+                'http://www.protogeni.net/resources/rspec/ext/gre-tunnel/1',
+                'http://www.protogeni.net/resources/rspec/ext/other-ext/3'
+            ]
+}
+pg_rspec_version = RSpecVersion(_version)
 
 class PGRSpec(RSpec):
+    xml = None
     header = '<?xml version="1.0"?>\n'
     template = """<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/0.2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd"></rspec>"""
-    namespaces = {'rspecv2':'http://www.protogeni.net/resources/rspec/0.2',
-                  'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
-                 }
-    schemas =  {'xsi': 'http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd'
-            }
-    format = 'pg'
-    format = 'protogeni'
-    xml = None
+    version = pg_rspec_version
+    namespaces = {'rspecv2': version['namespace']}
 
     def get_network(self):
         network = None