rspec version type should be case sensitive

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index 065687d..13124d7 100644 (file)
--- 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'))
     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:
         rspec = PGRSpec()
     else:
         rspec = SfaRSpec()
 
     for result in results:

-        print "RESULT"

         try:
             rspec.merge(result)
         except:
         try:
             rspec.merge(result)
         except:

-            raise

             api.logger.info("SM.ListResources: Failed to merge aggregate rspec")
 
     # cache the result
             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 5301c2d..8a66108 100755 (executable)
--- 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.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
 
 
 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)
     @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
           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 
             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)
     @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
             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 
             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 830c853..6ffc54c 100755 (executable)
--- 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  
 
 
 from sfa.rspecs.rspec_version import RSpecVersion  
 
 

-_version = { 'type': 'sfa', 
+_version = { 'type': 'SFA', 

              'version': '1' 
 }
 
              'version': '1' 
 }