From 658da4bc128e776d210b28141194cb63e46660a6 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 18 May 2011 19:36:28 -0400 Subject: [PATCH] rspec version type should be case sensitive --- sfa/managers/slice_manager_pl.py | 4 +--- sfa/rspecs/rspec_converter.py | 10 ++++++---- sfa/rspecs/sfa_rspec.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 065687d8..13124d79 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -391,17 +391,15 @@ def ListResources(api, creds, options, call_id): results = threads.get_results() #results.append(open('/root/protogeni.rspec', 'r').read()) rspec_version = RSpecVersion(my_opts.get('rspec_version')) - if rspec_version['type'].lower() == 'protogeni': + if rspec_version['type'] == pg_rspec_version['type']: rspec = PGRSpec() else: rspec = SfaRSpec() for result in results: - print "RESULT" try: rspec.merge(result) except: - raise api.logger.info("SM.ListResources: Failed to merge aggregate rspec") # cache the result diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py index 5301c2d8..8a661089 100755 --- a/sfa/rspecs/rspec_converter.py +++ b/sfa/rspecs/rspec_converter.py @@ -2,6 +2,8 @@ from sfa.rspecs.pg_rspec_converter import PGRSpecConverter from sfa.rspecs.sfa_rspec_converter import SfaRSpecConverter +from sfa.rspecs.sfa_rspec import sfa_rspec_version +from sfa.rspecs.pg_rspec import pg_rspec_version from sfa.rspecs.rspec_parser import parse_rspec @@ -10,9 +12,9 @@ class RSpecConverter: @staticmethod def to_sfa_rspec(in_rspec): rspec = parse_rspec(in_rspec) - if rspec.version['type'].lower() == 'sfa': + if rspec.version['type'] == sfa_rspec_version['type']: return in_rspec - elif rspec.version['type'].lower() == 'protogeni': + elif rspec.version['type'] == pg_rspec_version['type']: return PGRSpecConverter.to_sfa_rspec(in_rspec) else: return in_rspec @@ -20,9 +22,9 @@ class RSpecConverter: @staticmethod def to_pg_rspec(in_rspec): rspec = parse_rspec(in_rspec) - if rspec.version['type'].lower() == 'protogeni': + if rspec.version['type'] == pg_rspec_version['type']: return in_rspec - elif rspec.version['type'].lower() == 'sfa': + elif rspec.version['type'] == sfa_rspec_version['type']: return SfaRSpecConverter.to_pg_rspec(in_rspec) else: return in_rspec diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py index 830c8535..6ffc54c8 100755 --- a/sfa/rspecs/sfa_rspec.py +++ b/sfa/rspecs/sfa_rspec.py @@ -8,7 +8,7 @@ from sfa.util.config import Config from sfa.rspecs.rspec_version import RSpecVersion -_version = { 'type': 'sfa', +_version = { 'type': 'SFA', 'version': '1' } -- 2.47.0