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
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
@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
@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
from sfa.rspecs.rspec_version import RSpecVersion
-_version = { 'type': 'sfa',
+_version = { 'type': 'SFA',
'version': '1'
}