X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec_converter.py;h=0c058577e4c975c334fb8df71de84042e3726fdc;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=7dff2f0b7863b3235f10fd051b4de3f9249984b1;hpb=18317236953434dfa9ea41328fc21731039e55f1;p=sfa.git diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py index 7dff2f0b..0c058577 100755 --- a/sfa/rspecs/rspec_converter.py +++ b/sfa/rspecs/rspec_converter.py @@ -1,10 +1,13 @@ -#!/usr/bin/python +#!/usr/bin/env python3 + + from sfa.rspecs.pg_rspec_converter import PGRSpecConverter from sfa.rspecs.sfa_rspec_converter import SfaRSpecConverter from sfa.rspecs.rspec import RSpec from sfa.rspecs.version_manager import VersionManager + class RSpecConverter: @staticmethod @@ -13,34 +16,34 @@ class RSpecConverter: version_manager = VersionManager() sfa_version = version_manager._get_version('sfa', '1') pg_version = version_manager._get_version('protogeni', '2') - if rspec.version.type.lower() == sfa_version.type.lower(): - return in_rspec - elif rspec.version.type.lower() == pg_version.type.lower(): + if rspec.version.type.lower() == sfa_version.type.lower(): + return in_rspec + elif rspec.version.type.lower() == pg_version.type.lower(): return PGRSpecConverter.to_sfa_rspec(in_rspec, content_type) else: - return in_rspec + return in_rspec - @staticmethod + @staticmethod def to_pg_rspec(in_rspec, content_type=None): rspec = RSpec(in_rspec) version_manager = VersionManager() sfa_version = version_manager._get_version('sfa', '1') pg_version = version_manager._get_version('protogeni', '2') - if rspec.version.type.lower() == pg_version.type.lower(): + if rspec.version.type.lower() == pg_version.type.lower(): return in_rspec - elif rspec.version.type.lower() == sfa_version.type.lower(): + elif rspec.version.type.lower() == sfa_version.type.lower(): return SfaRSpecConverter.to_pg_rspec(in_rspec, content_type) else: - return in_rspec + return in_rspec if __name__ == '__main__': pg_rspec = 'test/protogeni.rspec' - sfa_rspec = 'test/nodes.rspec' + sfa_rspec = 'test/nodes.rspec' + + print("converting pg rspec to sfa rspec") + print(RSpecConverter.to_sfa_rspec(pg_rspec)) - print "converting pg rspec to sfa rspec" - print RSpecConverter.to_sfa_rspec(pg_rspec) - - print "converting sfa rspec to pg rspec" - print RSpecConverter.to_pg_rspec(sfa_rspec) + print("converting sfa rspec to pg rspec") + print(RSpecConverter.to_pg_rspec(sfa_rspec))