Skip to content
Snippets Groups Projects
Commit e2bb2149 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

SW-658: removed obsolete datetime conversions now that these are automagically... 

SW-658: removed obsolete datetime conversions now that these are automagically converted in the from/tobus
parent 7fc0c9a6
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
LTA/LTAIngest/LTAIngestClient/lib/rpc.py
+ 1
− 9
View file @ e2bb2149
......@@ -20,15 +20,7 @@ class IngestRPC(RPCWrapper):
return self.rpc('SetExportJobPriority', export_id=export_group_id, priority=priority)
def getStatusReport(self):
report = self.rpc('GetStatusReport')
for export_id, status_dict in list(report.items()):
if 'series' in status_dict:
for series_dict in list(status_dict['series'].values()):
if 'timestamps' in series_dict:
#convert qpid timestamp to python datetime
series_dict['timestamps'] = [t.datetime() for t in series_dict['timestamps']]
return report
return self.rpc('GetStatusReport')
def getJobStatus(self, job_id):
return self.rpc('GetJobStatus', job_id=job_id)[job_id]
......
SAS/MoM/MoMQueryService/MoMQueryServiceClient/momqueryrpc.py
+ 0
− 3
View file @ e2bb2149
......@@ -237,9 +237,6 @@ class MoMQueryRPC(RPCWrapper):
:rtype dict with all projects'''
logger.info("Requesting all projects")
projects = self.rpc('GetProjects')
for project in projects:
project['statustime'] = project['statustime'].datetime()
logger.info("Received %s projects", (len(projects)))
return projects
......
SAS/OTDB_Services/otdbrpc.py
+ 0
− 2
View file @ e2bb2149
......@@ -60,8 +60,6 @@ class OTDBRPC(RPCWrapper):
def taskGetTreeInfo(self, otdb_id):
info = self.rpc('TaskGetTreeInfo', otdb_id=otdb_id)
for key in ['creationtime', 'modificationtime', 'starttime', 'stoptime']:
info[key] = info[key].datetime()
return info
def taskGetStatus(self, otdb_id):
......
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/changeshandler.py
+ 0
− 8
View file @ e2bb2149
......@@ -138,16 +138,12 @@ class ChangesHandler:
def onTaskUpdated(self, updated_task):
'''onTaskUpdated is called upon receiving a TaskUpdated message.'''
updated_task['starttime'] = updated_task['starttime'].datetime()
updated_task['endtime'] = updated_task['endtime'].datetime()
task_change = {'changeType':CHANGE_UPDATE_TYPE, 'objectType':'task', 'value':updated_task}
self._handleChange(task_change)
def onTaskInserted(self, new_task):
'''onTaskInserted is called upon receiving a TaskInserted message.
:param new_task: dictionary with the inserted task'''
new_task['starttime'] = new_task['starttime'].datetime()
new_task['endtime'] = new_task['endtime'].datetime()
updateTaskMomDetails(new_task, self._momqueryrpc)
task_change = {'changeType':CHANGE_INSERT_TYPE, 'objectType':'task', 'value':new_task}
self._handleChange(task_change)
......@@ -161,16 +157,12 @@ class ChangesHandler:
def onResourceClaimUpdated(self, updated_claim):
'''onResourceClaimUpdated is called upon receiving a ResourceClaimUpdated message.
:param updated_claim: dictionary with the updated claim'''
updated_claim['starttime'] = updated_claim['starttime'].datetime()
updated_claim['endtime'] = updated_claim['endtime'].datetime()
claim_change = {'changeType':CHANGE_UPDATE_TYPE, 'objectType':'resourceClaim', 'value':updated_claim}
self._handleChange(claim_change)
def onResourceClaimInserted(self, new_claim):
'''onResourceClaimInserted is called upon receiving a ResourceClaimInserted message.
:param new_claim: dictionary with the inserted claim'''
new_claim['starttime'] = new_claim['starttime'].datetime()
new_claim['endtime'] = new_claim['endtime'].datetime()
claim_change = {'changeType':CHANGE_INSERT_TYPE, 'objectType':'resourceClaim', 'value':new_claim}
self._handleChange(claim_change)
......
SAS/ResourceAssignment/ResourceAssignmentService/service.py
+ 24
− 27
View file @ e2bb2149
......@@ -126,8 +126,8 @@ class RADBHandler(MessageHandlerInterface):
def _getResourceClaims(self, **kwargs):
return self.radb.getResourceClaims(claim_ids=kwargs.get('claim_ids'),
lower_bound=kwargs.get('lower_bound').datetime() if kwargs.get('lower_bound') else None,
upper_bound=kwargs.get('upper_bound').datetime() if kwargs.get('upper_bound') else None,
lower_bound=kwargs.get('lower_bound'),
upper_bound=kwargs.get('upper_bound'),
resource_ids=kwargs.get('resource_ids'),
task_ids=kwargs.get('task_ids'),
status=kwargs.get('status'),
......@@ -142,9 +142,6 @@ class RADBHandler(MessageHandlerInterface):
def _insertResourceClaims(self, **kwargs):
logger.info('InsertResourceClaims: %s' % dict({k:v for k,v in list(kwargs.items()) if v != None}))
claims = kwargs['claims']
for claim in claims:
claim['starttime'] = claim['starttime'].datetime()
claim['endtime'] = claim['endtime'].datetime()
ids = self.radb.insertResourceClaims(kwargs['task_id'],
claims,
......@@ -156,8 +153,8 @@ class RADBHandler(MessageHandlerInterface):
logger.info('InsertResourceClaim: %s' % dict({k:v for k,v in list(kwargs.items()) if v != None}))
id = self.radb.insertResourceClaim(kwargs['resource_id'],
kwargs['task_id'],
kwargs['starttime'].datetime(),
kwargs['endtime'].datetime(),
kwargs['starttime'],
kwargs['endtime'],
kwargs.get('status_id', kwargs.get('status')),
kwargs['claim_size'],
kwargs['username'],
......@@ -178,8 +175,8 @@ class RADBHandler(MessageHandlerInterface):
updated = self.radb.updateResourceClaim(id,
resource_id=kwargs.get('resource_id'),
task_id=kwargs.get('task_id'),
starttime=kwargs.get('starttime').datetime() if kwargs.get('starttime') else None,
endtime=kwargs.get('endtime').datetime() if kwargs.get('endtime') else None,
starttime=kwargs.get('starttime'),
endtime=kwargs.get('endtime'),
status=kwargs.get('status_id', kwargs.get('status')),
claim_size=kwargs.get('claim_size'),
username=kwargs.get('username'),
......@@ -195,8 +192,8 @@ class RADBHandler(MessageHandlerInterface):
where_resource_types=kwargs.get('where_resource_types'),
resource_id=kwargs.get('resource_id'),
task_id=kwargs.get('task_id'),
starttime=kwargs.get('starttime').datetime() if kwargs.get('starttime') else None,
endtime=kwargs.get('endtime').datetime() if kwargs.get('endtime') else None,
starttime=kwargs.get('starttime'),
endtime=kwargs.get('endtime'),
status=kwargs.get('status_id', kwargs.get('status')),
claim_size=kwargs.get('status'),
username=kwargs.get('username'),
......@@ -213,8 +210,8 @@ class RADBHandler(MessageHandlerInterface):
task_id = kwargs['task_id']
updated = self.radb.updateTaskAndResourceClaims(task_id,
starttime=kwargs.get('starttime').datetime() if kwargs.get('starttime') else None,
endtime=kwargs.get('endtime').datetime() if kwargs.get('endtime') else None,
starttime=kwargs.get('starttime'),
endtime=kwargs.get('endtime'),
task_status=kwargs.get('task_status_id', kwargs.get('task_status')),
claim_status=kwargs.get('claim_status_id', kwargs.get('claim_status')),
username=kwargs.get('username'),
......@@ -227,8 +224,8 @@ class RADBHandler(MessageHandlerInterface):
'updated': updated}
def _getResourceUsages(self, **kwargs):
usages = self.radb.getResourceUsages(lower_bound=kwargs.get('lower_bound').datetime() if kwargs.get('lower_bound') else None,
upper_bound=kwargs.get('upper_bound').datetime() if kwargs.get('upper_bound') else None,
usages = self.radb.getResourceUsages(lower_bound=kwargs.get('lower_bound'),
upper_bound=kwargs.get('upper_bound'),
resource_ids=kwargs.get('resource_ids'),
claim_statuses=kwargs.get('status'))
return convertIntKeysToString(usages)
......@@ -270,8 +267,8 @@ class RADBHandler(MessageHandlerInterface):
def _getTasks(self, **kwargs):
logger.info('GetTasks: %s' % dict({k:v for k,v in list(kwargs.items()) if v != None}))
return self.radb.getTasks(lower_bound=kwargs.get('lower_bound').datetime() if kwargs.get('lower_bound') else None,
upper_bound=kwargs.get('upper_bound').datetime() if kwargs.get('upper_bound') else None,
return self.radb.getTasks(lower_bound=kwargs.get('lower_bound'),
upper_bound=kwargs.get('upper_bound'),
task_ids=kwargs.get('task_ids'),
task_status=kwargs.get('task_status'),
task_type=kwargs.get('task_type'),
......@@ -349,15 +346,15 @@ class RADBHandler(MessageHandlerInterface):
kwargs['otdb_id'],
kwargs['task_status'],
kwargs['task_type'],
kwargs.get('starttime').datetime() if kwargs.get('starttime') else None,
kwargs.get('endtime').datetime() if kwargs.get('endtime') else None,
kwargs.get('starttime'),
kwargs.get('endtime'),
kwargs['content'],
kwargs['cluster'])
def _insertSpecification(self, **kwargs):
logger.info('InsertSpecification: %s' % dict({k:v for k,v in list(kwargs.items()) if v != None}))
specification_id = self.radb.insertSpecification(kwargs.get('starttime').datetime() if kwargs.get('starttime') else None,
kwargs.get('endtime').datetime() if kwargs.get('endtime') else None,
specification_id = self.radb.insertSpecification(kwargs.get('starttime'),
kwargs.get('endtime'),
kwargs['content'],
kwargs['cluster'])
return {'id':specification_id}
......@@ -372,8 +369,8 @@ class RADBHandler(MessageHandlerInterface):
logger.info('UpdateSpecification: %s' % dict({k:v for k,v in list(kwargs.items()) if v != None}))
id = kwargs['id']
updated = self.radb.updateSpecification(id,
starttime=kwargs['starttime'].datetime() if 'starttime' in kwargs else None,
endtime=kwargs['endtime'].datetime() if 'endtime' in kwargs else None,
starttime=kwargs['starttime'],
endtime=kwargs['endtime'],
content=kwargs.get('content'),
cluster=kwargs.get('cluster'))
return {'id': id, 'updated': updated}
......@@ -393,16 +390,16 @@ class RADBHandler(MessageHandlerInterface):
def _get_max_resource_usage_between(self, **kwargs):
logger.info('get_max_resource_usage_between: %s' % kwargs)
return self.radb.get_max_resource_usage_between(resource_id=kwargs.get('resource_id'),
lower_bound=kwargs['lower_bound'].datetime() if kwargs.get('lower_bound') else None,
upper_bound=kwargs['upper_bound'].datetime() if kwargs.get('upper_bound') else None,
lower_bound=kwargs['lower_bound'],
upper_bound=kwargs['upper_bound'],
claim_status=kwargs.get('claim_status', 'claimed'))
def _get_resource_claimable_capacity(self, **kwargs):
logger.info('get_resource_claimable_capacity: %s' % kwargs)
resource_claimable_capacity = self.radb.get_resource_claimable_capacity(
resource_id=kwargs.get('resource_id'),
lower_bound=kwargs['lower_bound'].datetime() if kwargs.get('lower_bound') else None,
upper_bound=kwargs['upper_bound'].datetime() if kwargs.get('upper_bound') else None)
lower_bound=kwargs['lower_bound'],
upper_bound=kwargs['upper_bound'])
return { 'resource_claimable_capacity': resource_claimable_capacity}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment