Commit 24fac74d authored by Marian Babik's avatar Marian Babik
Browse files

added support for arc6 client arguments

parent 9382b75c
......@@ -75,6 +75,12 @@ app.add_argument('--arc-gmlog', action='store_true', default=False,
help='ARC backend: request gmlog')
app.add_argument('--arc-rsl', dest='arc_rsl',
help='ARC backend: add-ons for nordugrid_rsl')
app.add_argument('--arc-sub-type', dest='arc_sub_type',
help='ARC backend: arcsub submission endpoint type (arc6 client only)')
app.add_argument('--arc-info-type', dest='arc_info_type',
help='ARC backend: arcsub information endpoint type (arc6 client only')
app.add_argument('--arc-registry', dest='arc_registry',
help='ARC backend: arcsub registry (arc6 client only)')
app.add_argument('--wnfm-config', dest='wnfm_config', help='ETF WN qFM: configuration file (json)')
app.add_argument('--wnfm-static', dest='wnfm_static',
help='ETF WN qFM: Path to the statically compiled version of ETF WN qFM')
......@@ -506,7 +512,9 @@ def test_js_state(args, io):
timer = jess.jobs.Timer(limits)
if args.backend == 'arc':
os.environ['ARC_LOCATION'] = '/usr'
jmi = jess.jobs.JMI(wd, args.backend, args.proxy, jdl, tb, resource=args.resource, arc_debug=args.arc_debug)
jmi = jess.jobs.JMI(wd, args.backend, args.proxy, jdl, tb, resource=args.resource, arc_debug=args.arc_debug,
arc_sub_type=args.arc_sub_type, arc_info_type=args.arc_info_type,
arc_registry=args.arc_registry)
tr = jess.jobs.Tracker(wd, jmi, job_schedule=args.job_schedule)
elif args.backend == 'cream':
jmi = jess.jobs.JMI(wd, args.backend, args.proxy, jdl, tb, resource=args.resource)
......
......@@ -68,7 +68,8 @@ class JMI(object):
# todo: refactor _resource business into a common uri across all backends
def __init__(self, working_dir, backend, proxy, jdl, payload, resource=None,
pool=None, schedd=None, arc_wd=None, arc_debug='INFO', excludes=['.pyc', '.pyo', '.git']):
pool=None, schedd=None, arc_wd=None, arc_debug='INFO',
arc_sub_type=None, arc_info_type=None, arc_registry=None, excludes=['.pyc', '.pyo', '.git']):
jess_log.debug('JMI init:')
self._jdl = jdl
self._working_dir = working_dir
......@@ -86,6 +87,9 @@ class JMI(object):
self._arc_wd = working_dir
self._arc_resource = None
self._arc_debug = arc_debug
self._arc_sub_type = arc_sub_type
self._arc_info_type = arc_info_type
self._arc_registry = arc_registry
self._arc_job_file = None
if self._backend == 'arc':
self._arc_job_file = os.path.join(self._arc_wd, 'jobs.dat')
......@@ -123,7 +127,16 @@ class JMI(object):
args = list()
if self._backend == 'arc':
kwargs['joblist'] = self._arc_job_file
kwargs['cluster'] = self._arc_resource
if self._arc_registry or self._arc_info_type or self._arc_sub_type:
kwargs['computing-element'] = self._arc_resource
if self._arc_registry:
kwargs['registry'] = self._arc_registry
if self._arc_sub_type:
kwargs['submission-endpoint-type'] = self._arc_sub_type
if self._arc_info_type:
kwargs['info-endpoint-type'] = self._arc_info_type
else:
kwargs['cluster'] = self._arc_resource
kwargs['timeout'] = 120
kwargs['debug'] = self._arc_debug
# kwargs['info-endpoint-type'] = 'NONE'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment