From 9f4388071dc976b98cf3912282b192d644c9a08f Mon Sep 17 00:00:00 2001 From: Craig Condit Date: Thu, 25 Apr 2024 15:01:21 -0500 Subject: [PATCH] [YUNIKORN-2589] Web: Convert AllocationID to AllocationKey (#190) Remove references to AllocationID, and replace with AllocationKey where appropriate as the REST API no longer produces objects with AllocationID fields. Closes: #190 --- json-db.json | 10 +--------- src/app/models/alloc-info.model.ts | 1 - src/app/services/scheduler/scheduler.service.ts | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/json-db.json b/json-db.json index 1517ea71..c95a332f 100644 --- a/json-db.json +++ b/json-db.json @@ -294,7 +294,6 @@ "requestTime": 1683692667426734436, "allocationTime": 1683692777012541197, "allocationDelay": 109585806761, - "allocationID": "67b34cd1-21b7-4ab4-a992-d3c1b5dc0e20-0", "resource": { "memory": 50000000, "pods": 1, @@ -368,7 +367,6 @@ "requestTime": 1683692667425480520, "allocationTime": 1683692667426304895, "allocationDelay": 824375, - "allocationID": "89196eb9-42e8-4480-9bd1-91ca0ce80854-1", "resource": { "memory": 50000000, "pods": 1, @@ -396,7 +394,6 @@ "requestTime": 1683692667426251936, "allocationTime": 1683692667426598936, "allocationDelay": 347000, - "allocationID": "20b73321-20e7-472e-af2b-f3a4da95e2d1-2", "resource": { "memory": 50000000, "pods": 1, @@ -424,7 +421,6 @@ "requestTime": 1683692667426435311, "allocationTime": 1683692667426990103, "allocationDelay": 554792, - "allocationID": "cdfa6598-dd3b-49b9-805c-ecda2a465c18-1", "resource": { "memory": 50000000, "pods": 1, @@ -660,7 +656,6 @@ "requestTime": 1683692667425480520, "allocationTime": 1683692667426304895, "allocationDelay": 824375, - "allocationID": "89196eb9-42e8-4480-9bd1-91ca0ce80854-0", "resource": { "memory": 50000000, "pods": 1, @@ -688,7 +683,6 @@ "requestTime": 1683692667426251936, "allocationTime": 1683692667426598936, "allocationDelay": 347000, - "allocationID": "20b73321-20e7-472e-af2b-f3a4da95e2d1-3", "resource": { "memory": 50000000, "pods": 1, @@ -715,7 +709,6 @@ "requestTime": 1683692667426734436, "allocationTime": 1683692777012541197, "allocationDelay": 109585806761, - "allocationID": "67b34cd1-21b7-4ab4-a992-d3c1b5dc0e20-2", "resource": { "memory": 50000000, "pods": 1, @@ -744,7 +737,6 @@ "requestTime": 1683692667426435311, "allocationTime": 1683692667426990103, "allocationDelay": 554792, - "allocationID": "cdfa6598-dd3b-49b9-805c-ecda2a465c18-0", "resource": { "memory": 50000000, "pods": 1, @@ -1503,4 +1495,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/app/models/alloc-info.model.ts b/src/app/models/alloc-info.model.ts index 376e9eab..9822819b 100644 --- a/src/app/models/alloc-info.model.ts +++ b/src/app/models/alloc-info.model.ts @@ -21,7 +21,6 @@ export class AllocationInfo { public displayName: string, public allocationKey: string, public allocationTags: null | string, - public allocationID: string, public resource: string, public priority: string, public queueName: string, diff --git a/src/app/services/scheduler/scheduler.service.ts b/src/app/services/scheduler/scheduler.service.ts index d5a74c36..9104c3c3 100644 --- a/src/app/services/scheduler/scheduler.service.ts +++ b/src/app/services/scheduler/scheduler.service.ts @@ -125,7 +125,6 @@ export class SchedulerService { alloc['displayName'], alloc['allocationKey'], alloc['allocationTags'], - alloc['allocationID'], this.formatResource(alloc['resource'] as SchedulerResourceInfo), alloc['priority'], alloc['queueName'], @@ -232,7 +231,6 @@ export class SchedulerService { alloc['displayName'], alloc['allocationKey'], alloc['allocationTags'], - alloc['allocationID'], this.formatResource(alloc['resource'] as SchedulerResourceInfo), alloc['priority'], alloc['queueName'],