Changeset 3543

Show
Ignore:
Timestamp:
10/15/2009 10:31:05 AM (1 month ago)
Author:
brian
Message:

Renamed the new batch_systems stuff to be inside the gip module.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gip/trunk/gip/lib/python/gip/batch_systems/forwarding.py

    r2843 r3543  
    1414from gip_ldap import read_bdii, read_ldap 
    1515from gip_sections import forwarding 
    16 from batch_system import BatchSystem 
     16from gip.batch_systems.batch_system import BatchSystem 
    1717import gip_sets as sets 
    1818 

  • gip/trunk/gip/lib/python/gip/batch_systems/pbs.py

    r3541 r3543  
    1111from gip_common import HMSToMin, getLogger, VoMapper, voList, parseRvf 
    1212from gip_testing import runCommand 
    13 from batch_system import BatchSystem 
     13from gip.batch_systems.batch_system import BatchSystem 
    1414 
    1515log = getLogger("GIP.PBS") 

  • gip/trunk/gip/lib/python/gip/providers/condor.py

    r3460 r3543  
    2323from gip_common import config, VoMapper, getLogger, addToPath, getTemplate, \ 
    2424    voList, printTemplate, cp_get, cp_getBoolean, cp_getInt, responseTimes 
    25 from gip_cluster import getClusterID 
     25from gip_cluster import getClusterID, getClusterName 
    2626from condor_common import parseNodes, getJobsInfo, getLrmsInfo, getGroupInfo 
    2727from gip_storage import getDefaultSE 
    …… 
    6666          "Production". 
    6767       * ce.globus_version.  The used Globus version.  Defaults to 4.0.6 
    68        * ce.hosting_cluster.  The attached cluster name.  Defaults to ce.name 
     68       * ce.cluster.  The attached cluster name.  Defaults to ce.name 
    6969       * ce.host_name.  The CE's host name.  Default to ce.name 
    7070       * condor.preemption.  Whether or not condor allows preemption.  Defaults 
    …… 
    225225            "ceImpl"         : "Globus", 
    226226            "ceImplVersion"  : cp_get(cp, ce, 'globus_version', '4.0.6'), 
    227             "hostingCluster" : cp_get(cp, ce, 'hosting_cluster', ce_name), 
     227            "hostingCluster" : getClusterName(cp), 
    228228            "hostName"       : cp_get(cp, ce, "host_name", ce_name), 
    229229            "gramVersion"    : '2.0', 

  • gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py

    r3541 r3543  
    99from gip_common import config, getLogger, getTemplate, \ 
    1010    printTemplate, cp_get, responseTimes 
    11 from gip_cluster import getClusterID 
     11from gip_cluster import getClusterID, getClusterName 
    1212from gip_sections import ce 
    1313from gip_storage import getDefaultSE 
    1414 
    15 from batch_systems.pbs import PbsBatchSystem 
    16 from batch_systems.forwarding import Forwarding 
     15from gip.batch_systems.pbs import PbsBatchSystem 
     16from gip.batch_systems.forwarding import Forwarding 
    1717 
    1818log = getLogger("GIP.Batch") 
    …… 
    6565        info['ert'] = ert 
    6666        info['wrt'] = wrt 
    67         info['hostingCluster'] = cp_get(cp, ce, 'hosting_cluster', ce_name) 
     67        info['hostingCluster'] = getClusterName(cp) 
    6868        info['hostName'] = cp_get(cp, ce, 'host_name', ce_name) 
    6969        info['ceImpl'] = 'Globus' 

  • gip/trunk/gip/lib/python/gip/providers/lsf.py

    r3452 r3543  
    1212from gip_common import config, VoMapper, getLogger, addToPath, getTemplate, \ 
    1313    printTemplate, cp_get, cp_getInt, responseTimes 
    14 from gip_cluster import getClusterID 
     14from gip_cluster import getClusterID, getClusterName 
    1515from lsf_common import parseNodes, getQueueInfo, getJobsInfo, getLrmsInfo, \ 
    1616    getVoQueues 
    …… 
    8989        info['ert'] = ert 
    9090        info['wrt'] = wrt 
    91         info['hostingCluster'] = cp_get(cp, ce, 'hosting_cluster', ce_name) 
     91        info['hostingCluster'] = getClusterName(cp) 
    9292        info['hostName'] = cp_get(cp, ce, 'host_name', ce_name) 
    9393        info['ceImpl'] = 'Globus' 

  • gip/trunk/gip/lib/python/gip/providers/sge.py

    r3462 r3543  
    1010 
    1111from gip_common import config, VoMapper, getLogger, addToPath, getTemplate, printTemplate, cp_get 
    12 from gip_cluster import getClusterID 
     12from gip_cluster import getClusterID, getClusterName 
    1313from gip_sections import ce 
    1414from gip_storage import getDefaultSE 
    …… 
    6666            "ert" : 3600, 
    6767            "wrt" : 3600, 
    68             "hostingCluster" : cp_get(cp, ce, 'hosting_cluster', ce_name), 
     68            "hostingCluster" : getClusterName(cp), 
    6969            "hostName" : cp_get(cp, ce, 'host_name', ce_name), 
    7070            "contact_string" : contact_string, 

  • gip/trunk/gip/lib/python/gip_cese_bind.py

    r3314 r3543  
    2929    hostnames += extraCEs 
    3030 
    31     ce_names = ['%s:2119/jobmanager-%s-%%s' % (hostname, jobman) for hostname in hostnames] 
     31    ce_names = ['%s:2119/jobmanager-%s-%%s' % (hostname, jobman) for \ 
     32        hostname in hostnames] 
    3233 
    3334    ce_list = [] 
    …… 
    4546        for ce_name in ce_names: 
    4647            ce_list.append(ce_name % queue) 
    47     return ce_list 
     48    return list(Set(ce_list)) 
    4849 
    4950def getClassicSEList(cp): 

  • gip/trunk/test/pbs_test.py

    r3541 r3543  
    1010from gip_common import config, cp_get 
    1111#from pbs_common import getVoQueues, getQueueList 
    12 from batch_systems.pbs import PbsBatchSystem 
     12from gip.batch_systems.pbs import PbsBatchSystem 
    1313from gip_ldap import read_ldap 
    1414from gip_testing import runTest, streamHandler