Revision 734a2a7c

b/lib/luxi.py
473 473

  
474 474
  def SubmitJob(self, ops):
475 475
    ops_state = map(lambda op: op.__getstate__(), ops)
476
    return self.CallMethod(REQ_SUBMIT_JOB, ops_state)
476
    return self.CallMethod(REQ_SUBMIT_JOB, (ops_state, ))
477 477

  
478 478
  def SubmitManyJobs(self, jobs):
479 479
    jobs_state = []
480 480
    for ops in jobs:
481 481
      jobs_state.append([op.__getstate__() for op in ops])
482
    return self.CallMethod(REQ_SUBMIT_MANY_JOBS, jobs_state)
482
    return self.CallMethod(REQ_SUBMIT_MANY_JOBS, (jobs_state, ))
483 483

  
484 484
  def CancelJob(self, job_id):
485 485
    return self.CallMethod(REQ_CANCEL_JOB, (job_id, ))
b/lib/server/masterd.py
268 268

  
269 269
    if method == luxi.REQ_SUBMIT_JOB:
270 270
      logging.info("Received new job")
271
      ops = [opcodes.OpCode.LoadOpCode(state) for state in args]
271
      (job_def, ) = args
272
      ops = [opcodes.OpCode.LoadOpCode(state) for state in job_def]
272 273
      return queue.SubmitJob(ops)
273 274

  
274 275
    if method == luxi.REQ_SUBMIT_MANY_JOBS:
275 276
      logging.info("Received multiple jobs")
277
      (job_defs, ) = args
276 278
      jobs = []
277
      for ops in args:
279
      for ops in job_defs:
278 280
        jobs.append([opcodes.OpCode.LoadOpCode(state) for state in ops])
279 281
      return queue.SubmitManyJobs(jobs)
280 282

  

Also available in: Unified diff