dataclass changes

iceprod/core/dataclasses.py

@@ -311,6 +311,7 @@ def __init__(self,*args,**kwargs):
         self['trays'] = []
         self['requirements'] = Requirement()
         self['task_files'] = False
+        self['container'] = None
         super(Task,self).__init__(*args,**kwargs)
 
     def output(self):
@@ -363,6 +364,7 @@ def valid(self):
                 and isinstance(self['requirements'],Requirement)
                 and self['requirements'].valid()
                 and isinstance(self['task_files'],bool)
+                and self['container'] is None or isinstance(self['container'], str)
             )
         except Exception:
             return False

iceprod/server/plugins/condor_direct.py

@@ -19,7 +19,6 @@
 from iceprod.core.exe_json import ServerComms
 from iceprod.server import grid
 from iceprod.server.globus import SiteGlobusProxy
-from iceprod.server.plugins.condor import condor_os_reqs
 
 logger = logging.getLogger('plugin-condor_direct')
 
@@ -85,6 +84,15 @@ def __init__(self, **kwargs):
         super(TaskInfo, self).__init__(**kwargs)
 
 
+def condor_os_reqs(os_arch):
+    """Convert from OS_ARCH to Condor OS requirements"""
+    os_arch = os_arch.rsplit('_',2)[0].rsplit('.',1)[0]
+    reqs = 'OpSysAndVer =?= "{}"'.format(os_arch.replace('RHEL','CentOS').replace('_',''))
+    reqs = reqs + '|| OpSysAndVer =?= "{}"'.format(os_arch.replace('RHEL','SL').replace('_',''))
+    reqs = reqs + ' || OSGVO_OS_STRING =?= "{}"'.format(os_arch.replace('_',' '))
+    return '('+reqs+')'
+
+
 def run_async(func,*args,**kwargs):
     async def myfunc():
         return_obj = {'args':args,'kwargs':kwargs}