X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Frspec_converter.py;h=49555c832335a7706a7cffb16f27cf1286c71da2;hb=31cc4fa991896f000abb106916662923f37bc3a6;hp=5d7bdd61f09ceeab6a3fa3d6c54ce9765b834d5f;hpb=fad16c7d54b658b37a9b42fbee47b0d4f51cb8ec;p=sfa.git diff --git a/sfa/rspecs/rspec_converter.py b/sfa/rspecs/rspec_converter.py index 5d7bdd61..49555c83 100755 --- a/sfa/rspecs/rspec_converter.py +++ b/sfa/rspecs/rspec_converter.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 from __future__ import print_function @@ -7,6 +7,7 @@ from sfa.rspecs.sfa_rspec_converter import SfaRSpecConverter from sfa.rspecs.rspec import RSpec from sfa.rspecs.version_manager import VersionManager + class RSpecConverter: @staticmethod @@ -15,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 sfa rspec to pg rspec") - print(RSpecConverter.to_pg_rspec(sfa_rspec)) + print(RSpecConverter.to_pg_rspec(sfa_rspec))