Skip to content

Commit

Permalink
fix execution details correctness - S360. (#18721)
Browse files Browse the repository at this point in the history 
* fix execution details correctness - S360.

* Add x-ms-identifiers to runInformation arrays.

* fix prettier format.

Co-authored-by: kipartha <kipartha@microsoft.com>
  • Loading branch information
@belthurkiran
belthurkiran and kipartha authored May 3, 2022
1 parent 1b2e3b9 commit 8eed9ad
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 56 deletions.
32 changes: 16 additions & 16 deletions ...r/Microsoft.Chaos/preview/2021-09-15-preview/examples/GetAExperimentExecutionDetails.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,45 +14,45 @@
"id": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Chaos/experiments/exampleExperiment/executionDetails/f24500ad-744e-4a26-864b-b76199eac333",
"name": "f24500ad-744e-4a26-864b-b76199eac333",
"properites": {
"createdDateUtc": "2020-12-14T21:52:42.917983Z",
"lastActionDateUtc": "2020-12-14T21:52:52.2552574Z",
"startDateUtc": "2020-12-14T21:52:52.2552574Z",
"stopDateUtc": "2020-12-14T21:56:18.9281956Z",
"createdDateTime": "2020-12-14T21:52:42.917983Z",
"lastActionDateTime": "2020-12-14T21:52:52.2552574Z",
"startDateTime": "2020-12-14T21:52:52.2552574Z",
"stopDateTime": "2020-12-14T21:56:18.9281956Z",
"experimentId": "f24500ad-744e-4a26-864b-b76199eac333",
"status": "failed",
"failureReason": "Dependency failure",
"runInformation": {
"steps": [
{
"name": "FirstStep",
"id": "FirstStep",
"stepName": "FirstStep",
"stepId": "FirstStep",
"status": "failed",
"branches": [
{
"name": "FirstBranch",
"id": "FirstBranch",
"branchName": "FirstBranch",
"branchId": "FirstBranch",
"status": "failed",
"actions": [
{
"name": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
"id": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
"actionName": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
"actionId": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
"status": "failed",
"startTime": "2020-12-14T13:56:13.6270153-08:00",
"endTime": "2020-12-14T13:56:13.6270153-08:00",
"targets": [
{
"status": "succeeded",
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
"failedDateUtc": "2021-04-02T16:30:55+00:00",
"completedDateUtc": "2021-04-02T17:30:55+00:00"
"targetFailedTime": "2021-04-02T16:30:55+00:00",
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
},
{
"status": "failed",
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
"failedDateUtc": "2021-04-02T16:30:55+00:00",
"completedDateUtc": "2021-04-02T17:30:55+00:00"
"targetFailedTime": "2021-04-02T16:30:55+00:00",
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
}
],
"lastUpdatedDateUtc": "2020-12-14T13:56:13.6270153-08:00"
]
}
]
}
Expand Down
56 changes: 28 additions & 28 deletions .../Microsoft.Chaos/preview/2021-09-15-preview/examples/ListExperimentExecutionsDetails.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,39 @@
"id": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Chaos/experiments/exampleExperiment/executionDetails/f24500ad-744e-4a26-864b-b76199eac333",
"name": "f24500ad-744e-4a26-864b-b76199eac333",
"properties": {
"createdDateUtc": "2020-12-14T21:52:42.917983Z",
"lastActionDateUtc": "2020-12-14T21:52:52.2552574Z",
"startDateUtc": "2020-12-14T21:52:52.2552574Z",
"stopDateUtc": "2020-12-14T21:56:18.9281956Z",
"createdDateTime": "2020-12-14T21:52:42.917983Z",
"lastActionDateTime": "2020-12-14T21:52:52.2552574Z",
"startDateTime": "2020-12-14T21:52:52.2552574Z",
"stopDateTime": "2020-12-14T21:56:18.9281956Z",
"status": "failed",
"failureReason": "Dependency failure",
"experimentId": "f24500ad-744e-4a26-864b-b76199eac333",
"runInformation": {
"steps": [
{
"name": "FirstStep",
"id": "FirstStep",
"stepName": "FirstStep",
"stepId": "FirstStep",
"status": "failed",
"branches": [
{
"name": "FirstBranch",
"id": "FirstBranch",
"branchName": "FirstBranch",
"branchId": "FirstBranch",
"status": "failed",
"actions": [
{
"name": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
"id": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
"actionName": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
"actionId": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
"status": "failed",
"startTime": "2020-12-14T13:56:13.6270153-08:00",
"endTime": "2020-12-14T13:56:13.6270153-08:00",
"targets": [
{
"status": "succeeded",
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
"failedDateUtc": "2021-04-02T16:30:55+00:00",
"completedDateUtc": "2021-04-02T17:30:55+00:00"
"targetFailedTime": "2021-04-02T16:30:55+00:00",
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
}
],
"lastUpdatedDateUtc": "2020-12-14T13:56:13.6270153-08:00"
]
}
]
}
Expand All @@ -62,39 +62,39 @@
"id": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Chaos/experiments/exampleExperiment/executionDetails/14d98367-52ef-4596-be4f-53fc81bbfc33",
"name": "14d98367-52ef-4596-be4f-53fc81bbfc33",
"properties": {
"createdDateUtc": "2020-12-14T21:52:42.917983Z",
"lastActionDateUtc": "2020-12-14T21:52:52.2552574Z",
"startDateUtc": "2020-12-14T21:52:52.2552574Z",
"stopDateUtc": "2020-12-14T21:56:18.9281956Z",
"createdDateTime": "2020-12-14T21:52:42.917983Z",
"lastActionDateTime": "2020-12-14T21:52:52.2552574Z",
"startDateTime": "2020-12-14T21:52:52.2552574Z",
"stopDateTime": "2020-12-14T21:56:18.9281956Z",
"status": "success",
"failureReason": "",
"experimentId": "14d98367-52ef-4596-be4f-53fc81bbfc33",
"runInformation": {
"steps": [
{
"name": "FirstStep",
"id": "FirstStep",
"stepName": "FirstStep",
"stepId": "FirstStep",
"status": "success",
"branches": [
{
"name": "FirstBranch",
"id": "FirstBranch",
"branchName": "FirstBranch",
"branchId": "FirstBranch",
"status": "success",
"actions": [
{
"name": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
"id": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
"actionName": "urn:provider:agent-v2:Microsoft.Azure.Chaos.Fault.CPUPressureAllProcessors",
"actionId": "59499d33-6751-4b6e-a1f6-58f4d56a040a",
"status": "success",
"startTime": "2020-12-14T13:56:13.6270153-08:00",
"endTime": "2020-12-14T13:56:13.6270153-08:00",
"targets": [
{
"status": "succeeded",
"target": "/subscriptions/6b052e15-03d3-4f17-b2e1-be7f07588291/resourceGroups/exampleRG/providers/Microsoft.Compute/virtualMachines/VM1",
"failedDateUtc": "2021-04-02T16:30:55+00:00",
"completedDateUtc": "2021-04-02T17:30:55+00:00"
"targetFailedTime": "2021-04-02T16:30:55+00:00",
"targetCompletedTime": "2021-04-02T17:30:55+00:00"
}
],
"lastUpdatedDateUtc": "2020-12-14T13:56:13.6270153-08:00"
]
}
]
}
Expand Down
33 changes: 21 additions & 12 deletions .../chaos/resource-manager/Microsoft.Chaos/preview/2021-09-15-preview/types/experiments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,14 +498,14 @@
"type": "string",
"readOnly": true
},
"failedDateUtc": {
"targetFailedTime": {
"type": "string",
"format": "date-time",
"description": "String that represents the failed date time.",
"readOnly": true,
"x-nullable": true
},
"completedDateUtc": {
"targetCompletedTime": {
"type": "string",
"format": "date-time",
"description": "String that represents the completed date time.",
Expand Down Expand Up @@ -602,25 +602,25 @@
"type": "string",
"readOnly": true
},
"createdDateUtc": {
"createdDateTime": {
"type": "string",
"format": "date-time",
"description": "String that represents the created date time.",
"readOnly": true
},
"lastActionDateUtc": {
"lastActionDateTime": {
"type": "string",
"format": "date-time",
"description": "String that represents the last action date time.",
"readOnly": true
},
"startDateUtc": {
"startDateTime": {
"type": "string",
"format": "date-time",
"description": "String that represents the start date time.",
"readOnly": true
},
"stopDateUtc": {
"stopDateTime": {
"type": "string",
"format": "date-time",
"description": "String that represents the stop date time.",
Expand All @@ -636,6 +636,9 @@
"items": {
"$ref": "#/definitions/stepStatus"
},
"x-ms-identifiers": [
"stepName"
],
"readOnly": true
}
},
Expand All @@ -647,12 +650,12 @@
"description": "Model that represents the a list of branches and branch statuses.",
"type": "object",
"properties": {
"name": {
"stepName": {
"description": "The name of the step.",
"type": "string",
"readOnly": true
},
"id": {
"stepId": {
"description": "The id of the step.",
"type": "string",
"readOnly": true
Expand All @@ -668,6 +671,9 @@
"items": {
"$ref": "#/definitions/branchStatus"
},
"x-ms-identifiers": [
"branchName"
],
"readOnly": true
}
}
Expand All @@ -676,12 +682,12 @@
"description": "Model that represents the a list of actions and action statuses.",
"type": "object",
"properties": {
"name": {
"branchName": {
"description": "The name of the branch status.",
"type": "string",
"readOnly": true
},
"id": {
"branchId": {
"description": "The id of the branch status.",
"type": "string",
"readOnly": true
Expand All @@ -697,6 +703,9 @@
"items": {
"$ref": "#/definitions/actionStatus"
},
"x-ms-identifiers": [
"actionId"
],
"readOnly": true
}
}
Expand All @@ -705,12 +714,12 @@
"type": "object",
"description": "Model that represents the an action and its status.",
"properties": {
"name": {
"actionName": {
"description": "The name of the action status.",
"type": "string",
"readOnly": true
},
"id": {
"actionId": {
"description": "The id of the action status.",
"type": "string",
"readOnly": true
Expand Down

0 comments on commit 8eed9ad

Please sign in to comment.