From 7428e163f0ea46daf1d2eac3422a822dcdb25652 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 2 Sep 2011 19:42:43 -0400 Subject: [PATCH] added class variable 'template' --- sfa/rspecs/versions/pgv2.py | 5 ++++- sfa/rspecs/versions/sfav1.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index 7de06438..162a1c4a 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -15,15 +15,18 @@ class PGv2: RSpecElement(RSpecElements.NODE, 'node', '//default:node | //node'), RSpecElement(RSpecElements.SLIVER, 'sliver', '//default:node/default:sliver_type | //node/sliver_type'), ] + template = '' class PGv2Ad(PGv2): schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd' - content_type = 'advertisement' + 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 diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 69038712..648e8d38 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -11,7 +11,7 @@ class SFAv1: RSpecElement(RSpecElements.NODE, 'node', '//node'), RSpecElement(RSpecElements.SLIVER, 'sliver', '//node/sliver'), ] - + template = '' % type if __name__ == '__main__': from sfa.rspecs.rspec import RSpec -- 2.47.0