From 0ae6f1e2beecf53d48b7d5e049b4f54e7953a675 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 18 May 2011 14:02:29 -0400 Subject: [PATCH] cosmetic name changes --- sfa/rspecs/pg_rspec.py | 2 +- sfa/rspecs/rspec_converter.py | 8 ++++---- sfa/rspecs/rspec_version.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py index 84181204..adf81a3b 100755 --- a/sfa/rspecs/pg_rspec.py +++ b/sfa/rspecs/pg_rspec.py @@ -7,7 +7,7 @@ from sfa.util.plxrn import hostname_to_urn from sfa.util.config import Config from sfa.rspecs.rspec_version import RSpecVersion -_version = {'type': 'protogeni', +_version = {'type': 'ProtoGeni', 'version': '2', 'schema': 'http://www.protogeni.net/resources/rspec/2/request.xsd', 'namespace': 'http://www.protogeni.net/resources/rspec/2', diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py index dd7fe1f8..5301c2d8 100755 --- a/sfa/rspecs/rspec_converter.py +++ b/sfa/rspecs/rspec_converter.py @@ -10,9 +10,9 @@ class RSpecConverter: @staticmethod def to_sfa_rspec(in_rspec): rspec = parse_rspec(in_rspec) - if rspec.version['type'] == 'sfa': + if rspec.version['type'].lower() == 'sfa': return in_rspec - elif rspec.version['type'] == 'protogeni': + elif rspec.version['type'].lower() == 'protogeni': return PGRSpecConverter.to_sfa_rspec(in_rspec) else: return in_rspec @@ -20,9 +20,9 @@ class RSpecConverter: @staticmethod def to_pg_rspec(in_rspec): rspec = parse_rspec(in_rspec) - if rspec.version['type'] == 'protogeni': + if rspec.version['type'].lower() == 'protogeni': return in_rspec - elif rspec.version['type'] == 'sfa': + elif rspec.version['type'].lower() == 'sfa': return SfaRSpecConverter.to_pg_rspec(in_rspec) else: return in_rspec diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py index b96a765b..b2214475 100755 --- a/sfa/rspecs/rspec_version.py +++ b/sfa/rspecs/rspec_version.py @@ -7,7 +7,7 @@ class RSpecVersion(dict): 'version': None, 'schema': None, 'namespace': None, - 'extensions': [] + 'extenstions': [] } def __init__(self, version={}): -- 2.43.0