X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fpl_rspec_version.py;h=281850155b3999d7d4697c158c361fab83b438f2;hb=27091c5dbe38674fee5e91d153315449027d3061;hp=fb96f74cc3f17a00fbbc4fd77efcc365ca8177f6;hpb=3244a98433c769a9c8df52f5a493edc157372dc2;p=sfa.git diff --git a/sfa/rspecs/pl_rspec_version.py b/sfa/rspecs/pl_rspec_version.py index fb96f74c..28185015 100644 --- a/sfa/rspecs/pl_rspec_version.py +++ b/sfa/rspecs/pl_rspec_version.py @@ -1,20 +1,11 @@ +from sfa.rspecs.sfa_rspec import sfa_rspec_version +from sfa.rspecs.pg_rspec import pg_rspec_version + ad_rspec_versions = [ - { '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'] - }, - { 'type': 'SFA', - 'version': '1', - 'schema': [], - 'namespace': [], - 'extensions': [] - } -] + pg_rspec_vesion, + sfa_rspec_version + ] request_rspec_versions = ad_rspec_versions