Skip to content

Commit

Permalink
[YUNIKORN-2589] Web: Convert AllocationID to AllocationKey (apache#190)
Browse files Browse the repository at this point in the history
Remove references to AllocationID, and replace with AllocationKey where
appropriate as the REST API no longer produces objects with AllocationID
fields.

Closes: apache#190
craigcondit committed Apr 25, 2024
1 parent a7a8362 commit 9f43880
Showing 3 changed files with 1 addition and 12 deletions.
10 changes: 1 addition & 9 deletions json-db.json
Original file line number Diff line number Diff line change
@@ -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 @@
}
]
}
}
}
1 change: 0 additions & 1 deletion src/app/models/alloc-info.model.ts
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 0 additions & 2 deletions src/app/services/scheduler/scheduler.service.ts
Original file line number Diff line number Diff line change
@@ -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'],

0 comments on commit 9f43880

Please sign in to comment.