Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / sfa / rspecs / versions / pgv2.py

diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index 75a7a17..c98cf99 100644 (file)
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -1,32 +1,53 @@
+from sfa.rspecs.rspec_version import BaseVersion
 from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
 
-class PGv2:
+class PGv2Ad(PGv2):
+    enabled = True
     type = 'ProtoGENI'
-    content_type = '*'
+    content_type = 'ad'
     version = '2'
-    schema = 'http://www.protogeni.net/resources/rspec/2/*.xsd'
+    schema = 'http://www.protogeni.net/resources/rspec/2/ad.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", 
     }
+    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/ad.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'      
+
+class PGv2Request(PGv2):
+    enabled = True
+    type = 'ProtoGENI'
+    content_type = 'request'
+    version = '2'
+    schema = 'http://www.protogeni.net/resources/rspec/2/request.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",
+    }
+    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/request.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'
+
+class PGv2Manifest(PGv2):
+    enabled = True
+    type = 'ProtoGENI'
+    content_type = 'manifest'
+    version = '2'
+    schema = 'http://www.protogeni.net/resources/rspec/2/manifest.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",
+    }
+    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/manifest.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'
+
+class PGv2(BaseVersion):
     elements = [
         RSpecElement(RSpecElements.NETWORK, 'network', '//default:node[@component_manager_id][1]'),
         RSpecElement(RSpecElements.NODE, 'node', '//default:node | //node'),
         RSpecElement(RSpecElements.SLIVER, 'sliver', '//default:node/default:sliver_type | //node/sliver_type'),
     ]
-    template = '<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/2 http://www.protogeni.net/resources/rspec/2/%s.xsd" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" />'      
-
-
-class PGv2Ad(PGv2):
-    schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd'
-    content_type = 'ad'
-    template = PGv2.template % content_type
+ 
 
-class PGv2Manifest(PGv2):
-    schema = 'http://www.protogeni.net/resources/rspec/2/manifest.xsd'
-    content_type = 'manifest'
-    template = PGv2.template % content_type
 
 if __name__ == '__main__':
     from sfa.rspecs.rspec import RSpec