From ef099bdaa9bd058c57f27d088579c52acd275327 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 2 Sep 2011 16:52:08 -0400 Subject: [PATCH] renamed some class variables --- sfa/rspecs/versions/pgv2.py | 6 ++++-- sfa/rspecs/versions/sfav1.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index 9504d3a9..b4a9deaf 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -1,8 +1,8 @@ from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements class PGv2: - format = 'ProtoGENI' - type = '*' + type = 'ProtoGENI' + content_type = '*' version = '2' schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd' namespaces = { @@ -19,9 +19,11 @@ class PGv2: class PGv2Ad(PGv2): schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd' + content_type = 'advertisement' class PGv2Manifest(PGv2): schema = 'http://www.protogeni.net/resources/rspec/2/manifest.xsd' + content_type = 'manifest' if __name__ == '__main__': from sfa.rspecs.rspec import RSpec diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 05538cce..69038712 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -1,8 +1,8 @@ from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements class SFAv1: - format = 'SFA' - type = '*' + type = 'SFA' + content_type = '*' version = '1' schema = None namespaces = {} -- 2.47.0