diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
index f4a25802cdb14070b414d3e7f106ff8df7b42e7c..5ac07ccb90c4183302f0e023deeae056f92a5599 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
@@ -179,5 +179,5 @@ PL611 RSP_0 cbt004-10GB04 10.220.41.104 A0:36:9F:1F:7A:06
PL612 RSP_0 cbt005-10GB04 10.220.61.105 A0:36:9F:1F:79:E2
-# TO BE ADAPTED!
-IE613 RSP_0 cbt005-10GB04 10.220.61.105 A0:36:9F:1F:79:E2
+IE613 RSP_0 cbt002-10GB04 10.220.81.102 A0:36:9F:1F:79:A2
+
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
index 609c155de742b6d325935b36798e2babb6ee0e67..046055700687759387ac0223036c5d33c21d03f7 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
@@ -219,10 +219,10 @@ PIC.Core.FR606HBA.RSP.ports = [udp:10.211.1.105:16060, udp:10.212.1.105:1606
PIC.Core.FR606HBA.RSP.receiver = cbt005_1
PIC.Core.FR606LBA.RSP.ports = [udp:10.211.1.105:16060, udp:10.212.1.105:16061, udp:10.213.1.105:16062, udp:10.214.1.105:16063]
PIC.Core.FR606LBA.RSP.receiver = cbt005_1
-PIC.Core.IE613HBA.RSP.ports = [udp:10.220.61.105:16130, udp:10.220.61.105:16131, udp:10.220.61.105:16132, udp:10.220.61.105:16133]
-PIC.Core.IE613HBA.RSP.receiver = cbt005_1
-PIC.Core.IE613LBA.RSP.ports = [udp:10.220.61.105:16130, udp:10.220.61.105:16131, udp:10.220.61.105:16132, udp:10.220.61.105:16133]
-PIC.Core.IE613LBA.RSP.receiver = cbt005_1
+PIC.Core.IE613HBA.RSP.ports = [udp:10.220.81.102:16130, udp:10.220.81.102:16131, udp:10.220.81.102:16132, udp:10.220.81.102:16133]
+PIC.Core.IE613HBA.RSP.receiver = cbt002_1
+PIC.Core.IE613LBA.RSP.ports = [udp:10.220.81.102:16130, udp:10.220.81.102:16131, udp:10.220.81.102:16132, udp:10.220.81.102:16133]
+PIC.Core.IE613LBA.RSP.receiver = cbt002_1
PIC.Core.PL610HBA.RSP.ports = [udp:10.220.11.103:16100, udp:10.220.11.103:16101, udp:10.220.11.103:16102, udp:10.220.11.103:16103]
PIC.Core.PL610HBA.RSP.receiver = cbt003_1
PIC.Core.PL610LBA.RSP.ports = [udp:10.220.11.103:16100, udp:10.220.11.103:16101, udp:10.220.11.103:16102, udp:10.220.11.103:16103]
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
index d283ec746840fb5f14d936bb739b538dbcaab6f7..80475ecd80b6da65e85cab232579439e76df18fa 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
@@ -235,13 +235,17 @@ class ResourceAssigner():
try:
startTime = parseDatetime(mainParset.getString('Observation.startTime'))
except Exception:
+ startTime = None
+
+ # If we don't have a valid startTime, use the current time
+ if startTime is None or startTime < datetime.utcnow():
startTime = datetime.utcnow() + timedelta(minutes=3)
maxPredecessorEndTime = self.getMaxPredecessorEndTime(specification_tree)
if maxPredecessorEndTime and maxPredecessorEndTime > startTime:
startTime = maxPredecessorEndTime + timedelta(minutes=3)
- taskDuration = mainParset.getInt('ObsSW.Observation.Scheduler.taskDuration', -1)
+ taskDuration = mainParset.getInt('Observation.Scheduler.taskDuration', -1)
taskDuration = timedelta(seconds=taskDuration) if taskDuration > 0 else timedelta(hours=1)
endTime = startTime + taskDuration
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_resource_allocation_statics.sql b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_resource_allocation_statics.sql
index 9031269c24df3efc0884de2dd445e8e455ae63af..e56bd04d19edfee931c0222d488011d4c306fd92 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_resource_allocation_statics.sql
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/add_resource_allocation_statics.sql
@@ -7,7 +7,7 @@ INSERT INTO resource_allocation.task_status VALUES (200, 'prepared'), (300, 'app
(1150, 'error'), (1200, 'obsolete'); -- This is the list from OTDB, we'll need to merge it with the list from MoM in the future, might use different indexes?
INSERT INTO resource_allocation.task_type VALUES (0, 'observation'),(1, 'pipeline'),(2, 'reservation'); -- We'll need more types
INSERT INTO resource_allocation.resource_claim_status VALUES (0, 'tentative'), (1, 'claimed'), (2, 'conflict');
-INSERT INTO resource_allocation.resource_claim_property_type VALUES (0, 'nr_of_is_files'),(1, 'nr_of_cs_files'),(2, 'nr_of_uv_files'),(3, 'nr_of_im_files'),(4, 'nr_of_img_files'),(5, 'nr_of_pulp_files'),(6, 'nr_of_cs_stokes'),(7, 'nr_of_is_stokes'),(8, 'is_file_size'),(9, 'cs_file_size'),(10, 'uv_file_size'),(11, 'im_file_size'),(12, 'img_file_size'),(13, 'nr_of_pulp_files'),(14, 'nr_of_cs_parts'),(15, 'start_sb_nr'),(16,'uv_otdb_id'),(17,'cs_otdb_id'),(18,'is_otdb_id'),(19,'im_otdb_id'),(20,'img_otdb_id'),(21,'pulp_otdb_id'),(22, 'is_tab_nr'),(23, 'start_sbg_nr'),(24, 'pulp_file_size');
+INSERT INTO resource_allocation.resource_claim_property_type VALUES (0, 'nr_of_is_files'),(1, 'nr_of_cs_files'),(2, 'nr_of_uv_files'),(3, 'nr_of_im_files'),(4, 'nr_of_img_files'),/*(5, 'nr_of_pulp_files'),unused duplicate #10869*/(6, 'nr_of_cs_stokes'),(7, 'nr_of_is_stokes'),(8, 'is_file_size'),(9, 'cs_file_size'),(10, 'uv_file_size'),(11, 'im_file_size'),(12, 'img_file_size'),(13, 'nr_of_pulp_files'),(14, 'nr_of_cs_parts'),(15, 'start_sb_nr'),(16,'uv_otdb_id'),(17,'cs_otdb_id'),(18,'is_otdb_id'),(19,'im_otdb_id'),(20,'img_otdb_id'),(21,'pulp_otdb_id'),(22, 'is_tab_nr'),(23, 'start_sbg_nr'),(24, 'pulp_file_size');
INSERT INTO resource_allocation.resource_claim_property_io_type VALUES (0, 'output'),(1, 'input');
INSERT INTO resource_allocation.config VALUES (0, 'max_fill_ratio_CEP4_storage', '0.85'), (1, 'claim_timeout', '172800'), (2, 'min_inter_task_delay', '60'), (3, 'max_fill_ratio_CEP4_bandwidth', '0.75'); -- Just some values 172800 is two days in seconds
INSERT INTO resource_allocation.conflict_reason