From e80938ac5d16ea580d19a77932e20964e521cdd1 Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Wed, 19 Jun 2019 13:06:45 +0000
Subject: [PATCH] SW-720: Change args to kwargs for rpc and remove incorrect
busname (merge from trunk)
---
.../ResourceAssigner/lib/resource_assigner.py | 2 +-
SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py
index 1caf7f74af2..7e2f1990937 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_assigner.py
@@ -233,7 +233,7 @@ class ResourceAssigner(object):
otdb_id = specification_tree['otdb_id']
- estimates = self.rerpc.execute("get_estimated_resources", {"specification_tree": specification_tree})
+ estimates = self.rerpc.execute("get_estimated_resources", specification_tree=specification_tree)
logger.info('Resource Estimator reply = %s', estimates)
if estimates['errors']:
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py b/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py
index a760cac6651..b3c4f238fba 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/schedulers.py
@@ -462,6 +462,7 @@ class StationScheduler(BasicScheduler):
# Schedule all resources
super(StationScheduler, self)._schedule_task(available_resources)
+
class PriorityScheduler(StationScheduler):
""" A Scheduler that searches for an allocation with a fixed start time, but flexible resources.
Conflict resolution is done by killing jobs with lower priority. """
@@ -482,7 +483,7 @@ class PriorityScheduler(StationScheduler):
super(PriorityScheduler, self).__init__(task_id, specification_tree, resource_estimator, resource_availability_checker, radbcreds)
- self.momqueryservice = MoMQueryRPC(busname=busname, broker=broker, timeout=180)
+ self.momqueryservice = MoMQueryRPC.create(broker=broker, timeout=180)
# Time needed in between tasks to setup the stations
self.STATION_SETUP_TIME_MINUTES = 1
--
GitLab