zuul
/
nodepool
Code Issues Proposed changes

Merge "Add requestor_data field to node request"

This commit is contained in:
Zuul 2021-07-07 16:45:16 +00:00 committed by Gerrit Code Review
parent c85472be6c 405beba83a
commit 9757e3f1ce
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodepool/zk.py
View File

@ -469,7 +469,10 @@ class NodeRequest(BaseModel):
self.node_types = [] self.node_types = []
self.nodes = [] self.nodes = []
self.reuse = True self.reuse = True
# The identity of the requestor; used in reporting statistics
self.requestor = None self.requestor = None
# Opaque data for use by the requestor (unused by Nodepool)
self.requestor_data = None
self.provider = None self.provider = None
self.relative_priority = 0 self.relative_priority = 0
self.event_id = None self.event_id = None
@ -488,6 +491,7 @@ class NodeRequest(BaseModel):
self.nodes == other.nodes and self.nodes == other.nodes and
self.reuse == other.reuse and self.reuse == other.reuse and
self.requestor == other.requestor and self.requestor == other.requestor and
self.requestor_data == other.requestor_data and
self.provider == other.provider and self.provider == other.provider and
self.relative_priority == other.relative_priority) self.relative_priority == other.relative_priority)
else: else:
@ -511,6 +515,7 @@ class NodeRequest(BaseModel):
d['nodes'] = self.nodes d['nodes'] = self.nodes
d['reuse'] = self.reuse d['reuse'] = self.reuse
d['requestor'] = self.requestor d['requestor'] = self.requestor
d['requestor_data'] = self.requestor_data
d['provider'] = self.provider d['provider'] = self.provider
d['relative_priority'] = self.relative_priority d['relative_priority'] = self.relative_priority
d['event_id'] = self.event_id d['event_id'] = self.event_id
@ -538,6 +543,7 @@ class NodeRequest(BaseModel):
self.nodes = d.get('nodes', []) self.nodes = d.get('nodes', [])
self.reuse = d.get('reuse', True) self.reuse = d.get('reuse', True)
self.requestor = d.get('requestor') self.requestor = d.get('requestor')
self.requestor_data = d.get('requestor_data')
self.provider = d.get('provider') self.provider = d.get('provider')
self.relative_priority = d.get('relative_priority', 0) self.relative_priority = d.get('relative_priority', 0)
self.event_id = d.get('event_id') self.event_id = d.get('event_id')