Skip to content

Commit d2e5eeb

Browse files
belthurkirankipartha
authored and
FredericHeem
committed
fix execution details correctness - S360. (Azure#18721)
* fix execution details correctness - S360. * Add x-ms-identifiers to runInformation arrays. * fix prettier format. Co-authored-by: kipartha <kipartha@microsoft.com>
1 parent 3fa1191 commit d2e5eeb

File tree

3 files changed

+65
-56
lines changed

3 files changed

+65
-56
lines changed

‎specification/chaos/resource-manager/Microsoft.Chaos/preview/2021-09-15-preview/examples/GetAExperimentExecutionDetails.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,45 @@
1414
"id": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Chaos/experiments/exampleExperiment/executionDetails/f24500ad-744e-4a26-864b-b76199eac333",
1515
"name": "f24500ad-744e-4a26-864b-b76199eac333",
1616
"properites": {
17-
"createdDateUtc": "2020-12-14T21:52:42.917983Z",
18-
"lastActionDateUtc": "2020-12-14T21:52:52.2552574Z",
19-
"startDateUtc": "2020-12-14T21:52:52.2552574Z",
20-
"stopDateUtc": "2020-12-14T21:56:18.9281956Z",
17+
"createdDateTime": "2020-12-14T21:52:42.917983Z",
18+
"lastActionDateTime": "2020-12-14T21:52:52.2552574Z",
19+
"startDateTime": "2020-12-14T21:52:52.2552574Z",
20+
"stopDateTime": "2020-12-14T21:56:18.9281956Z",
21+
"experimentId": "f24500ad-744e-4a26-864b-b76199eac333",
2122
"status": "failed",
2223
"failureReason": "Dependency failure",
2324
"runInformation": {
2425
"steps": [
2526
{
26-
"name": "FirstStep",
27-
"id": "FirstStep",
27+
"stepName": "FirstStep",
28+
"stepId": "FirstStep",
2829
"status": "failed",
2930
"branches": [
3031
{
31-
"name": "FirstBranch",
32-
"id": "FirstBranch",
32+
"branchName": "FirstBranch",
33+
"branchId": "FirstBranch",
3334
"status": "failed",
3435
"actions": [
3536
{
36-
"name": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
37-
"id": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
37+
"actionName": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
38+
"actionId": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
3839
"status": "failed",
3940
"startTime": "2020-12-14T13:56:13.6270153-08:00",
4041
"endTime": "2020-12-14T13:56:13.6270153-08:00",
4142
"targets": [
4243
{
4344
"status": "succeeded",
4445
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
45-
"failedDateUtc": "2021-04-02T16:30:55+00:00",
46-
"completedDateUtc": "2021-04-02T17:30:55+00:00"
46+
"targetFailedTime": "2021-04-02T16:30:55+00:00",
47+
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
4748
},
4849
{
4950
"status": "failed",
5051
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
51-
"failedDateUtc": "2021-04-02T16:30:55+00:00",
52-
"completedDateUtc": "2021-04-02T17:30:55+00:00"
52+
"targetFailedTime": "2021-04-02T16:30:55+00:00",
53+
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
5354
}
54-
],
55-
"lastUpdatedDateUtc": "2020-12-14T13:56:13.6270153-08:00"
55+
]
5656
}
5757
]
5858
}

‎specification/chaos/resource-manager/Microsoft.Chaos/preview/2021-09-15-preview/examples/ListExperimentExecutionsDetails.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,39 @@
1515
"id": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Chaos/experiments/exampleExperiment/executionDetails/f24500ad-744e-4a26-864b-b76199eac333",
1616
"name": "f24500ad-744e-4a26-864b-b76199eac333",
1717
"properties": {
18-
"createdDateUtc": "2020-12-14T21:52:42.917983Z",
19-
"lastActionDateUtc": "2020-12-14T21:52:52.2552574Z",
20-
"startDateUtc": "2020-12-14T21:52:52.2552574Z",
21-
"stopDateUtc": "2020-12-14T21:56:18.9281956Z",
18+
"createdDateTime": "2020-12-14T21:52:42.917983Z",
19+
"lastActionDateTime": "2020-12-14T21:52:52.2552574Z",
20+
"startDateTime": "2020-12-14T21:52:52.2552574Z",
21+
"stopDateTime": "2020-12-14T21:56:18.9281956Z",
2222
"status": "failed",
2323
"failureReason": "Dependency failure",
24+
"experimentId": "f24500ad-744e-4a26-864b-b76199eac333",
2425
"runInformation": {
2526
"steps": [
2627
{
27-
"name": "FirstStep",
28-
"id": "FirstStep",
28+
"stepName": "FirstStep",
29+
"stepId": "FirstStep",
2930
"status": "failed",
3031
"branches": [
3132
{
32-
"name": "FirstBranch",
33-
"id": "FirstBranch",
33+
"branchName": "FirstBranch",
34+
"branchId": "FirstBranch",
3435
"status": "failed",
3536
"actions": [
3637
{
37-
"name": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
38-
"id": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
38+
"actionName": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
39+
"actionId": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
3940
"status": "failed",
4041
"startTime": "2020-12-14T13:56:13.6270153-08:00",
4142
"endTime": "2020-12-14T13:56:13.6270153-08:00",
4243
"targets": [
4344
{
4445
"status": "succeeded",
4546
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
46-
"failedDateUtc": "2021-04-02T16:30:55+00:00",
47-
"completedDateUtc": "2021-04-02T17:30:55+00:00"
47+
"targetFailedTime": "2021-04-02T16:30:55+00:00",
48+
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
4849
}
49-
],
50-
"lastUpdatedDateUtc": "2020-12-14T13:56:13.6270153-08:00"
50+
]
5151
}
5252
]
5353
}
@@ -62,39 +62,39 @@
6262
"id": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Chaos/experiments/exampleExperiment/executionDetails/14d98367-52ef-4596-be4f-53fc81bbfc33",
6363
"name": "14d98367-52ef-4596-be4f-53fc81bbfc33",
6464
"properties": {
65-
"createdDateUtc": "2020-12-14T21:52:42.917983Z",
66-
"lastActionDateUtc": "2020-12-14T21:52:52.2552574Z",
67-
"startDateUtc": "2020-12-14T21:52:52.2552574Z",
68-
"stopDateUtc": "2020-12-14T21:56:18.9281956Z",
65+
"createdDateTime": "2020-12-14T21:52:42.917983Z",
66+
"lastActionDateTime": "2020-12-14T21:52:52.2552574Z",
67+
"startDateTime": "2020-12-14T21:52:52.2552574Z",
68+
"stopDateTime": "2020-12-14T21:56:18.9281956Z",
6969
"status": "success",
7070
"failureReason": "",
71+
"experimentId": "14d98367-52ef-4596-be4f-53fc81bbfc33",
7172
"runInformation": {
7273
"steps": [
7374
{
74-
"name": "FirstStep",
75-
"id": "FirstStep",
75+
"stepName": "FirstStep",
76+
"stepId": "FirstStep",
7677
"status": "success",
7778
"branches": [
7879
{
79-
"name": "FirstBranch",
80-
"id": "FirstBranch",
80+
"branchName": "FirstBranch",
81+
"branchId": "FirstBranch",
8182
"status": "success",
8283
"actions": [
8384
{
84-
"name": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
85-
"id": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
85+
"actionName": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
86+
"actionId": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
8687
"status": "success",
8788
"startTime": "2020-12-14T13:56:13.6270153-08:00",
8889
"endTime": "2020-12-14T13:56:13.6270153-08:00",
8990
"targets": [
9091
{
9192
"status": "succeeded",
9293
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
93-
"failedDateUtc": "2021-04-02T16:30:55+00:00",
94-
"completedDateUtc": "2021-04-02T17:30:55+00:00"
94+
"targetFailedTime": "2021-04-02T16:30:55+00:00",
95+
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
9596
}
96-
],
97-
"lastUpdatedDateUtc": "2020-12-14T13:56:13.6270153-08:00"
97+
]
9898
}
9999
]
100100
}

‎specification/chaos/resource-manager/Microsoft.Chaos/preview/2021-09-15-preview/types/experiments.json‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -498,14 +498,14 @@
498498
"type": "string",
499499
"readOnly": true
500500
},
501-
"failedDateUtc": {
501+
"targetFailedTime": {
502502
"type": "string",
503503
"format": "date-time",
504504
"description": "String that represents the failed date time.",
505505
"readOnly": true,
506506
"x-nullable": true
507507
},
508-
"completedDateUtc": {
508+
"targetCompletedTime": {
509509
"type": "string",
510510
"format": "date-time",
511511
"description": "String that represents the completed date time.",
@@ -602,25 +602,25 @@
602602
"type": "string",
603603
"readOnly": true
604604
},
605-
"createdDateUtc": {
605+
"createdDateTime": {
606606
"type": "string",
607607
"format": "date-time",
608608
"description": "String that represents the created date time.",
609609
"readOnly": true
610610
},
611-
"lastActionDateUtc": {
611+
"lastActionDateTime": {
612612
"type": "string",
613613
"format": "date-time",
614614
"description": "String that represents the last action date time.",
615615
"readOnly": true
616616
},
617-
"startDateUtc": {
617+
"startDateTime": {
618618
"type": "string",
619619
"format": "date-time",
620620
"description": "String that represents the start date time.",
621621
"readOnly": true
622622
},
623-
"stopDateUtc": {
623+
"stopDateTime": {
624624
"type": "string",
625625
"format": "date-time",
626626
"description": "String that represents the stop date time.",
@@ -636,6 +636,9 @@
636636
"items": {
637637
"$ref": "#/definitions/stepStatus"
638638
},
639+
"x-ms-identifiers": [
640+
"stepName"
641+
],
639642
"readOnly": true
640643
}
641644
},
@@ -647,12 +650,12 @@
647650
"description": "Model that represents the a list of branches and branch statuses.",
648651
"type": "object",
649652
"properties": {
650-
"name": {
653+
"stepName": {
651654
"description": "The name of the step.",
652655
"type": "string",
653656
"readOnly": true
654657
},
655-
"id": {
658+
"stepId": {
656659
"description": "The id of the step.",
657660
"type": "string",
658661
"readOnly": true
@@ -668,6 +671,9 @@
668671
"items": {
669672
"$ref": "#/definitions/branchStatus"
670673
},
674+
"x-ms-identifiers": [
675+
"branchName"
676+
],
671677
"readOnly": true
672678
}
673679
}
@@ -676,12 +682,12 @@
676682
"description": "Model that represents the a list of actions and action statuses.",
677683
"type": "object",
678684
"properties": {
679-
"name": {
685+
"branchName": {
680686
"description": "The name of the branch status.",
681687
"type": "string",
682688
"readOnly": true
683689
},
684-
"id": {
690+
"branchId": {
685691
"description": "The id of the branch status.",
686692
"type": "string",
687693
"readOnly": true
@@ -697,6 +703,9 @@
697703
"items": {
698704
"$ref": "#/definitions/actionStatus"
699705
},
706+
"x-ms-identifiers": [
707+
"actionId"
708+
],
700709
"readOnly": true
701710
}
702711
}
@@ -705,12 +714,12 @@
705714
"type": "object",
706715
"description": "Model that represents the an action and its status.",
707716
"properties": {
708-
"name": {
717+
"actionName": {
709718
"description": "The name of the action status.",
710719
"type": "string",
711720
"readOnly": true
712721
},
713-
"id": {
722+
"actionId": {
714723
"description": "The id of the action status.",
715724
"type": "string",
716725
"readOnly": true

0 commit comments

Comments
 (0)