Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add force delete query parameter for delegatedSubnets resource #13004

Merged
merged 13 commits into from
Mar 4, 2021
Merged

add force delete query parameter for delegatedSubnets resource #13004

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
62e0d6d
add force delete query parameter
tamilmani1989 Feb 17, 2021
f429111
prettier fix
tamilmani1989 Feb 17, 2021
a65ae5c
added "x-ms-parameter-location" field
tamilmani1989 Feb 17, 2021
2502818
updated erroresponse and errordefintion names to avoid duplication error
tamilmani1989 Feb 17, 2021
c7d572f
fixed spellcheck
tamilmani1989 Feb 17, 2021
f9c027f
updated desc
tamilmani1989 Feb 17, 2021
ebcdd69
fixed warnings
tamilmani1989 Feb 17, 2021
ebefffb
fixed warnings
tamilmani1989 Feb 17, 2021
e900e3d
Fixed errors
tamilmani1989 Feb 27, 2021
2e2dc32
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
tamilmani1989 Feb 27, 2021
7e859cd
include common.json
tamilmani1989 Feb 27, 2021
f56b809
fixed errors
tamilmani1989 Feb 27, 2021
b1a5997
lint fix
tamilmani1989 Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions ...nc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/controller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/ControllerErrorResponse"
tamilmani1989 marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/ControllerErrorResponse"
}
}
},
Expand Down Expand Up @@ -169,7 +169,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/ControllerErrorResponse"
}
}
},
Expand Down Expand Up @@ -219,7 +219,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/ControllerErrorResponse"
}
}
}
Expand Down Expand Up @@ -258,7 +258,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/ControllerErrorResponse"
}
}
}
Expand Down Expand Up @@ -300,7 +300,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/ControllerErrorResponse"
}
}
}
Expand Down Expand Up @@ -343,6 +343,7 @@
},
"ControllerResourceUpdateParameters": {
"description": "Parameters for updating a resource.",
"type": "object",
"properties": {
"tags": {
"type": "object",
Expand Down Expand Up @@ -432,17 +433,19 @@
}
}
},
"ErrorResponse": {
"ControllerErrorResponse": {
"description": "Error response.",
"type": "object",
"properties": {
"error": {
"description": "Error description",
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/ControllerErrorDefinition"
}
}
},
"ErrorDefinition": {
"ControllerErrorDefinition": {
"description": "Error definition.",
"type": "object",
"properties": {
"code": {
"description": "Service specific error code which serves as the substatus for the HTTP error code.",
Expand All @@ -458,7 +461,7 @@
"description": "Internal error details.",
"type": "array",
"items": {
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/ControllerErrorDefinition"
},
"readOnly": true
}
Expand Down
36 changes: 25 additions & 11 deletions ...ource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/delegatedSubnets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/DelegatedSubnetErrorResponse"
}
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/DelegatedSubnetErrorResponse"
}
}
},
Expand Down Expand Up @@ -175,14 +175,14 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/DelegatedSubnetErrorResponse"
}
}
},
"x-ms-long-running-operation": true
},
"delete": {
"description": "Delete dnc DelegatedSubnet.",
"description": "Delete DelegatedSubnet.",
"x-ms-examples": {
"delete delegated subnet": {
"$ref": "./examples/deleteDelegatedSubnet.json"
Expand All @@ -204,6 +204,9 @@
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ForceDeleteParameter"
}
],
"responses": {
Expand All @@ -219,7 +222,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/DelegatedSubnetErrorResponse"
}
}
},
Expand Down Expand Up @@ -259,7 +262,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/DelegatedSubnetErrorResponse"
}
}
}
Expand Down Expand Up @@ -301,7 +304,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/DelegatedSubnetErrorResponse"
}
}
}
Expand Down Expand Up @@ -344,6 +347,7 @@
},
"ResourceUpdateParameters": {
"description": "Parameters for updating a resource.",
"type": "object",
"properties": {
"tags": {
"type": "object",
Expand Down Expand Up @@ -446,17 +450,19 @@
}
}
},
"ErrorResponse": {
"DelegatedSubnetErrorResponse": {
"description": "Error response.",
"type": "object",
"properties": {
"error": {
"description": "Error description",
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/DelegatedSubnetErrorDefinition"
}
}
},
"ErrorDefinition": {
"DelegatedSubnetErrorDefinition": {
"description": "Error definition.",
"type": "object",
"properties": {
"code": {
"description": "Service specific error code which serves as the substatus for the HTTP error code.",
Expand All @@ -472,7 +478,7 @@
"description": "Internal error details.",
"type": "array",
"items": {
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/DelegatedSubnetErrorDefinition"
},
"readOnly": true
}
Expand Down Expand Up @@ -515,6 +521,14 @@
"maxLength": 63,
"x-ms-parameter-location": "method",
"description": "The name of the resource. It must be a minimum of 3 characters, and a maximum of 63."
},
"ForceDeleteParameter": {
"name": "forceDelete",
"in": "query",
"required": false,
"type": "boolean",
"description": "Force delete resource",
"x-ms-parameter-location": "method"
}
}
}
12 changes: 7 additions & 5 deletions ...nc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/operations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OperatorErrorResponse"
}
}
}
Expand Down Expand Up @@ -149,17 +149,19 @@
"type": "object",
"properties": {}
},
"ErrorResponse": {
"OperatorErrorResponse": {
"description": "Error response.",
"type": "object",
"properties": {
"error": {
"description": "Error description",
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/OperatorErrorDefinition"
}
}
},
"ErrorDefinition": {
"OperatorErrorDefinition": {
"description": "Error definition.",
"type": "object",
"properties": {
"code": {
"description": "Service specific error code which serves as the substatus for the HTTP error code.",
Expand All @@ -175,7 +177,7 @@
"description": "Internal error details.",
"type": "array",
"items": {
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/OperatorErrorDefinition"
},
"readOnly": true
}
Expand Down
23 changes: 13 additions & 10 deletions ...resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/orchestrators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OrchestratorErrorResponse"
}
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OrchestratorErrorResponse"
}
}
},
Expand Down Expand Up @@ -169,7 +169,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OrchestratorErrorResponse"
}
}
},
Expand Down Expand Up @@ -219,7 +219,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OrchestratorErrorResponse"
}
}
}
Expand Down Expand Up @@ -258,7 +258,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OrchestratorErrorResponse"
}
}
}
Expand Down Expand Up @@ -300,7 +300,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/OrchestratorErrorResponse"
}
}
}
Expand Down Expand Up @@ -361,6 +361,7 @@
},
"OrchestratorResourceUpdateParameters": {
"description": "Parameters for updating a resource.",
"type": "object",
"properties": {
"tags": {
"type": "object",
Expand Down Expand Up @@ -493,17 +494,19 @@
}
}
},
"ErrorResponse": {
"OrchestratorErrorResponse": {
"description": "Error response.",
"type": "object",
"properties": {
"error": {
"description": "Error description",
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/OrchestratorErrorDefinition"
}
}
},
"ErrorDefinition": {
"OrchestratorErrorDefinition": {
"description": "Error definition.",
"type": "object",
"properties": {
"code": {
"description": "Service specific error code which serves as the substatus for the HTTP error code.",
Expand All @@ -519,7 +522,7 @@
"description": "Internal error details.",
"type": "array",
"items": {
"$ref": "#/definitions/ErrorDefinition"
"$ref": "#/definitions/OrchestratorErrorDefinition"
},
"readOnly": true
}
Expand Down