zuul
/
zuul
Code Issues Proposed changes

Fix autohold RPC protocol 

Do not use _name suffix in parameter names in the RPC protocol,
for consistency.

Change-Id: I221ec29260cd0a632b0c56b2d192537afc931b02
This commit is contained in:
David Shrewsbury 2017-07-31 16:16:36 -04:00
parent 36b2adf52a
commit cc6d2fdcd1
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/cmd/client.py
View File

@ -155,9 +155,9 @@ class Client(zuul.cmd.ZuulApp):
def autohold(self): def autohold(self):
client = zuul.rpcclient.RPCClient( client = zuul.rpcclient.RPCClient(
self.server, self.port, self.ssl_key, self.ssl_cert, self.ssl_ca) self.server, self.port, self.ssl_key, self.ssl_cert, self.ssl_ca)
r = client.autohold(tenant_name=self.args.tenant, r = client.autohold(tenant=self.args.tenant,
project_name=self.args.project, project=self.args.project,
job_name=self.args.job, job=self.args.job,
reason=self.args.reason, reason=self.args.reason,
count=self.args.count) count=self.args.count)
return r return r

8
zuul/rpcclient.py
View File

@ -48,10 +48,10 @@ class RPCClient(object):
self.log.debug("Job complete, success: %s" % (not job.failure)) self.log.debug("Job complete, success: %s" % (not job.failure))
return job return job
def autohold(self, tenant_name, project_name, job_name, reason, count): def autohold(self, tenant, project, job, reason, count):
data = {'tenant_name': tenant_name, data = {'tenant': tenant,
'project_name': project_name, 'project': project,
'job_name': job_name, 'job': job,
'reason': reason, 'reason': reason,
'count': count} 'count': count}
return not self.submitJob('zuul:autohold', data).failure return not self.submitJob('zuul:autohold', data).failure

12
zuul/rpclistener.py
View File

@ -94,23 +94,23 @@ class RPCListener(object):
args = json.loads(job.arguments) args = json.loads(job.arguments)
params = {} params = {}
tenant = self.sched.abide.tenants.get(args['tenant_name']) tenant = self.sched.abide.tenants.get(args['tenant'])
if tenant: if tenant:
params['tenant_name'] = args['tenant_name'] params['tenant_name'] = args['tenant']
else: else:
error = "Invalid tenant: %s" % args['tenant_name'] error = "Invalid tenant: %s" % args['tenant']
job.sendWorkException(error.encode('utf8')) job.sendWorkException(error.encode('utf8'))
return return
(trusted, project) = tenant.getProject(args['project_name']) (trusted, project) = tenant.getProject(args['project'])
if project: if project:
params['project_name'] = project.canonical_name params['project_name'] = project.canonical_name
else: else:
error = "Invalid project: %s" % args['project_name'] error = "Invalid project: %s" % args['project']
job.sendWorkException(error.encode('utf8')) job.sendWorkException(error.encode('utf8'))
return return
params['job_name'] = args['job_name'] params['job_name'] = args['job']
params['reason'] = args['reason'] params['reason'] = args['reason']
if args['count'] < 0: if args['count'] < 0: