Skip to content

Update delete pe connection to long running #10387

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

Merged
ArcturusZhang merged 11 commits into from
Sep 7, 2020
Merged

Update delete pe connection to long running #10387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8dbb48b
Add Identity to createWorkpace example
zhaomuzhi Apr 3, 2020
9cba54d
Merge branch 'master' of https://github.com/zhaomuzhi/azure-rest-api-…
zhaomuzhi Apr 14, 2020
b5e4863
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Jun 4, 2020
02a2401
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Jun 12, 2020
f2ceaf1
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Jul 7, 2020
a6591d5
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Jul 15, 2020
1a02687
correct several places in swagger
zhaomuzhi Aug 7, 2020
7d07b46
add id,name,type to PrivateEndpointConnection
zhaomuzhi Aug 17, 2020
72356cf
fix lintDiff error
zhaomuzhi Aug 18, 2020
ee3e96b
fix CI pipelines
zhaomuzhi Aug 19, 2020
c4fd94c
fix sku swagger not aligned with service problem
zhaomuzhi Aug 21, 2020
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
76 changes: 22 additions & 54 deletions ...source-manager/Microsoft.MachineLearningServices/stable/2020-06-01/examples/ListSkus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,67 +9,35 @@
"value": [
{
"resourceType": "workspaces",
"name": "Basic",
"tier": "Basic",
"locations": [
"westus"
],
"locationInfo": [
"skus": [
{
"location": "westus",
"zones": [
"westus-AZ02",
"westus-AZ01"
]
}
],
"capabilities": [
{
"name": "automatedml_readhyperdrivesdk",
"value": "{\n \"id\": \"automatedml_ readhyperdrivesdk\",\n \"name\": \"Read hyperdrive SDK\",\n \"description\": \"Read only access to Hyperdrive in the SDK\"\n}"
},
{
"name": "workspace_upgradeworkspacesdk",
"value": "{\n \"id\": \"workspace_upgradeworkspacesdk\",\n \"name\": \"Upgrade workspace SDK\",\n \"description\": \"Upgrade workspace from Basic to enterprise from the SDK\"\n}"
}
],
"restrictions": []
},
{
"resourceType": "workspaces",
"name": "Enterprise",
"tier": "Enterprise",
"locations": [
"westus"
],
"locationInfo": [
{
"location": "westus",
"zones": [
"westus-AZ01"
"name": "Basic",
"tier": "Basic",
"locations": [
"westus"
],
"zoneDetails": [
"locationInfo": [
{
"name": [
"location": "westus",
"zones": [
"westus-AZ02",
"westus-AZ01"
],
"capabilities": [
{
"name": "automatedml_createeditexperimentssdk",
"value": "{\n \"id\": \"automatedml_createeditexperimentssdk\",\n \"name\": \"Create edit experiments SDK\",\n \"description\": \"Create, edit or delete AutoML experiments in the SDK\"\n}"
}
]
}
]
}
],
"capabilities": [
{
"name": "automatedml_createeditexperimentssdk",
"value": "{\n \"id\": \"automatedml_createeditexperimentssdk\",\n \"name\": \"Create edit experiments SDK\",\n \"description\": \"Create, edit or delete AutoML experiments in the SDK\"\n}"
],
"capabilities": [
{
"name": "automatedml_readhyperdrivesdk",
"value": "{\n \"id\": \"automatedml_ readhyperdrivesdk\",\n \"name\": \"Read hyperdrive SDK\",\n \"description\": \"Read only access to Hyperdrive in the SDK\"\n}"
},
{
"name": "workspace_upgradeworkspacesdk",
"value": "{\n \"id\": \"workspace_upgradeworkspacesdk\",\n \"name\": \"Upgrade workspace SDK\",\n \"description\": \"Upgrade workspace from Basic to enterprise from the SDK\"\n}"
}
],
"restrictions": []
}
],
"restrictions": []
]
}
],
"nextLink": null
Expand Down
1 change: 1 addition & 0 deletions ...LearningServices/stable/2020-06-01/examples/workspaceDeletePrivateEndpointConnection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
},
"responses": {
"200": {},
"202": {},
"204": {}
}
}
54 changes: 44 additions & 10 deletions ...-manager/Microsoft.MachineLearningServices/stable/2020-06-01/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/MachineLearningServiceError"
}
}
}
Expand Down Expand Up @@ -1396,7 +1396,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/MachineLearningServiceError"
}
}
}
Expand All @@ -1407,6 +1407,7 @@
],
"operationId": "PrivateEndpointConnections_Delete",
"description": "Deletes the specified private endpoint connection associated with the workspace.",
"x-ms-long-running-operation": true,
"x-ms-examples": {
"WorkspaceDeletePrivateEndpointConnection": {
"$ref": "./examples/workspaceDeletePrivateEndpointConnection.json"
Expand All @@ -1433,13 +1434,16 @@
"200": {
"description": "OK -- Delete the private endpoint connection successfully."
},
"202": {
"description": "The request was successful; the request was well-formed and received properly."
},
"204": {
"description": "No Content -- The private endpoint connection does not exist."
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "#/definitions/MachineLearningServiceError"
}
}
}
Expand Down Expand Up @@ -3533,6 +3537,24 @@
"description": "Describes The zonal capabilities of a SKU."
},
"WorkspaceSku": {
"type": "object",
"description": "AML workspace sku information",
"properties": {
"resourceType": {
"readOnly": true,
"type": "string"
},
"skus": {
"readOnly": true,
"type": "array",
"items": {
"$ref": "#/definitions/SkuSettings"
},
"description": "The list of workspace sku settings"
}
}
},
"SkuSettings": {
"description": "Describes Workspace Sku details and features",
"type": "object",
"properties": {
Expand Down Expand Up @@ -3646,19 +3668,31 @@
}
},
"PrivateEndpointConnection": {
"x-ms-azure-resource": true,
"description": "The Private Endpoint Connection resource.",
"type": "object",
"properties": {
"id": {
"type": "string",
"description": "ResourceId of the private endpoint connection.",
"readOnly": true
},
"name": {
"type": "string",
"description": "Friendly name of the private endpoint connection.",
"readOnly": true
},
"type": {
"type": "string",
"description": "Resource type of private endpoint connection.",
"readOnly": true
},
"properties": {
"$ref": "#/definitions/PrivateEndpointConnectionProperties",
"x-ms-client-flatten": true,
"description": "Resource properties."
}
},
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"description": "The Private Endpoint Connection resource."
}
},
"PrivateEndpointConnectionProperties": {
"properties": {
Expand Down