X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversion_manager.py;h=8c00664f414034fdba3f7ef6a15650553efe945d;hb=66af88fe4acfdf333930643ffc8184ad948ecd5f;hp=fb857a1909c03563d8ec6913c895cacc04f721d0;hpb=1f9359ab44191e0996802a015a013c7f24484f0d;p=sfa.git

diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py
index fb857a19..8c00664f 100644
--- a/sfa/rspecs/version_manager.py
+++ b/sfa/rspecs/version_manager.py
@@ -1,9 +1,9 @@
 import os
+from sfa.util.faults import InvalidRSpec, UnsupportedRSpecVersion
+from sfa.rspecs.baseversion import BaseVersion 
+from sfa.util.sfalogging import logger    
 
 class VersionManager:
-    default_type = 'SFA'
-    default_version_num = '1'     
-        
     def __init__(self):
         self.versions = []
         self.load_versions()
@@ -21,24 +21,27 @@ class VersionManager:
             module = __import__(module_path, fromlist=module_path)
             for attr_name in dir(module):
                 attr = getattr(module, attr_name)
-                if hasattr(attr, 'version'):
-                    self.versions.append(attr)
+                if hasattr(attr, 'version') and hasattr(attr, 'enabled') and attr.enabled == True:
+                    self.versions.append(attr())
 
     def _get_version(self, type, version_num=None, content_type=None):
         retval = None
         for version in self.versions:
             if type is None or type.lower() == version.type.lower():
-                if version_num is None or version_num == version.version:
-                    if content_type is None or content_type.lower() == version.content_type.lower():
+                if version_num is None or str(version_num) == version.version:
+                    if content_type is None or content_type.lower() == version.content_type.lower() \
+                      or version.content_type == '*':
                         retval = version
+                        ### sounds like we should be glad with the first match, not the last one
+                        break
         if not retval:
-            raise InvalidRSpec("No such version format: %s version: %s type:%s "% (type, version_num, content_type))
+            raise UnsupportedRSpecVersion("[%s %s %s] is not suported here"% (type, version_num, content_type))
         return retval
 
-    def get_version(self, version):
+    def get_version(self, version=None):
         retval = None
         if isinstance(version, dict):
-            retval =  self._get_version(version.get('type'), version.get('version_num'), version.get('content_type'))
+            retval =  self._get_version(version.get('type'), version.get('version'), version.get('content_type'))
         elif isinstance(version, basestring):
             version_parts = version.split(' ')     
             num_parts = len(version_parts)
@@ -50,9 +53,10 @@ class VersionManager:
             if num_parts > 2:
                 content_type = version_parts[2]
             retval = self._get_version(type, version_num, content_type) 
+        elif isinstance(version, BaseVersion):
+            retval = version
         else:
-            logger.info("Unable to parse rspec version, using default")
-            retval = self._get_version(self.default_type, self.default_version_num)   
+            raise UnsupportedRSpecVersion("No such version: %s "% str(version))
  
         return retval
 
@@ -65,11 +69,23 @@ class VersionManager:
             raise InvalidRSpec("Unkwnown RSpec schema: %s" % schema)
         return retval
 
+def show_by_string(string):
+    try:
+        print v.get_version(string)
+    except Exception,e:
+        print e
+def show_by_schema(string):
+    try:
+        print v.get_version_by_schema(string)
+    except Exception,e:
+        print e
+
 if __name__ == '__main__':
     v = VersionManager()
     print v.versions
-    print v.get_version('sfa 1') 
-    print v.get_version('protogeni 2') 
-    print v.get_version('protogeni 2 advertisement') 
-    print v.get_version_by_schema('http://www.protogeni.net/resources/rspec/2/ad.xsd') 
+    show_by_string('sfa 1') 
+    show_by_string('protogeni 2') 
+    show_by_string('protogeni 2 advertisement') 
+    show_by_schema('http://www.protogeni.net/resources/rspec/2/ad.xsd') 
+    show_by_schema('http://sorch.netmode.ntua.gr/ws/RSpec/ad.xsd')