From b73672be26d29bfbd53afe09cf5700b366cc0523 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 26 Aug 2016 14:16:03 +0000
Subject: [PATCH] Task #9607: cluster arg for specification
---
.../ResourceAssignmentService/service.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/service.py b/SAS/ResourceAssignment/ResourceAssignmentService/service.py
index d33fadea6f7..25b8cbd8ba2 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentService/service.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/service.py
@@ -284,13 +284,15 @@ class RADBHandler(MessageHandlerInterface):
kwargs['task_type'],
kwargs.get('starttime').datetime() if kwargs.get('starttime') else None,
kwargs.get('endtime').datetime() if kwargs.get('endtime') else None,
- kwargs['content'])
+ kwargs['content'],
+ kwargs['cluster'])
def _insertSpecification(self, **kwargs):
logger.info('InsertSpecification: %s' % dict({k:v for k,v in 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,
- kwargs['content'])
+ kwargs['content'],
+ kwargs['cluster'])
return {'id':specification_id}
def _deleteSpecification(self, **kwargs):
@@ -305,7 +307,8 @@ class RADBHandler(MessageHandlerInterface):
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,
- content=kwargs.get('content'))
+ content=kwargs.get('content'),
+ cluster=kwargs.get('cluster'))
return {'id': id, 'updated': updated}
def _getUnits(self):
--
GitLab