From 590bc0382096d2bfa6198abd1761d86d02ba197f Mon Sep 17 00:00:00 2001 From: Teo Magnino Chaban Date: Tue, 12 Jul 2022 10:46:57 -0700 Subject: [PATCH 1/6] Added idleTimeBeforeShutdown to compute instance properties --- .../preview/2022-06-01-preview/machineLearningServices.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json index 12f7d95ab6d7..c53bda63116b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json @@ -3662,6 +3662,10 @@ "x-nullable": true, "readOnly": true }, + "idleTimeBeforeShutdown": { + "type": "string", + "description": "Stops compute instance after user defined period of inactivity. Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days." + }, "enableNodePublicIp": { "type": "boolean", "title": "Enable node public IP.", From 440847234faaf0e222cd97ce63c0062e59a31c41 Mon Sep 17 00:00:00 2001 From: Teo Magnino Chaban Date: Tue, 12 Jul 2022 11:03:35 -0700 Subject: [PATCH 2/6] Added api UpdateIdleShutdownSetting --- .../Compute/updateIdleShutdownSetting.json | 15 +++++ .../machineLearningServices.json | 60 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json new file mode 100644 index 000000000000..273e449acad2 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2022-06-01-preview", + "parameters": { + "idleTimeBeforeShutdown": "PT120M" + } + }, + "responses": { + "200": {} + } +} \ No newline at end of file diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json index c53bda63116b..0e14a007cb50 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json @@ -1270,6 +1270,56 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/updateIdleShutdownSetting": { + "post": { + "tags": [ + "MachineLearningComputes" + ], + "operationId": "Compute_UpdateIdleShutdownSetting", + "description": "Updates the idle shutdown setting of a compute instance.", + "x-ms-examples": { + "Update idle shutdown setting of ComputeInstance": { + "$ref": "./examples/Compute/updateIdleShutdownSetting.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "description": "The object for updating idle shutdown setting of specified ComputeInstance.", + "schema": { + "$ref": "#/definitions/IdleShutdownSetting" + } + } + ], + "responses": { + "200": { + "description": "Success." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections": { "get": { "tags": [ @@ -5665,6 +5715,16 @@ ] } } + }, + "IdleShutdownSetting": { + "type": "object", + "description": "Stops compute instance after user defined period of inactivity.", + "properties": { + "idleTimeBeforeShutdown": { + "type": "string", + "description": "Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days." + } + } } } } From 745a17886513ad35dc6208a6f86aa9757796d21c Mon Sep 17 00:00:00 2001 From: Teo Magnino Chaban Date: Tue, 12 Jul 2022 11:25:07 -0700 Subject: [PATCH 3/6] Added line at end of file --- .../examples/Compute/updateIdleShutdownSetting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json index 273e449acad2..de0eff0e2a52 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json @@ -12,4 +12,4 @@ "responses": { "200": {} } -} \ No newline at end of file +} From 2d5038fdcc1aa55ffa42aea34697c9f3faf6db68 Mon Sep 17 00:00:00 2001 From: Teo Magnino Chaban Date: Tue, 12 Jul 2022 13:47:52 -0700 Subject: [PATCH 4/6] Added required input property --- .../machineLearningServices.json | 97 ++++++++++--------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json index 0e14a007cb50..5b764c2593d3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json @@ -1271,54 +1271,55 @@ } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/updateIdleShutdownSetting": { - "post": { - "tags": [ - "MachineLearningComputes" - ], - "operationId": "Compute_UpdateIdleShutdownSetting", - "description": "Updates the idle shutdown setting of a compute instance.", - "x-ms-examples": { - "Update idle shutdown setting of ComputeInstance": { - "$ref": "./examples/Compute/updateIdleShutdownSetting.json" - } + "post": { + "tags": [ + "MachineLearningComputes" + ], + "operationId": "Compute_UpdateIdleShutdownSetting", + "description": "Updates the idle shutdown setting of a compute instance.", + "x-ms-examples": { + "Update idle shutdown setting of ComputeInstance": { + "$ref": "./examples/Compute/updateIdleShutdownSetting.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/WorkspaceNameParameter" - }, - { - "$ref": "#/parameters/ComputeNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" - }, - { - "name": "parameters", - "in": "body", - "description": "The object for updating idle shutdown setting of specified ComputeInstance.", - "schema": { - "$ref": "#/definitions/IdleShutdownSetting" - } - } - ], - "responses": { - "200": { - "description": "Success." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" - } + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "description": "The object for updating idle shutdown setting of specified ComputeInstance.", + "schema": { + "$ref": "#/definitions/IdleShutdownSetting" + } + } + ], + "responses": { + "200": { + "description": "Success." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" } } } + } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections": { "get": { @@ -5720,10 +5721,10 @@ "type": "object", "description": "Stops compute instance after user defined period of inactivity.", "properties": { - "idleTimeBeforeShutdown": { - "type": "string", - "description": "Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days." - } + "idleTimeBeforeShutdown": { + "type": "string", + "description": "Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days." + } } } } From a5f6dc5f33df03888a4185c50ab96ea81fffe8df Mon Sep 17 00:00:00 2001 From: Teo Magnino Chaban Date: Thu, 14 Jul 2022 12:38:25 -0700 Subject: [PATCH 5/6] Removed new api --- .../Compute/updateIdleShutdownSetting.json | 15 ----- .../machineLearningServices.json | 61 ------------------- 2 files changed, 76 deletions(-) delete mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json deleted file mode 100644 index de0eff0e2a52..000000000000 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parameters": { - "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "resourceGroupName": "testrg123", - "workspaceName": "workspaces123", - "computeName": "compute123", - "api-version": "2022-06-01-preview", - "parameters": { - "idleTimeBeforeShutdown": "PT120M" - } - }, - "responses": { - "200": {} - } -} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json index 5b764c2593d3..c53bda63116b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json @@ -1270,57 +1270,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/updateIdleShutdownSetting": { - "post": { - "tags": [ - "MachineLearningComputes" - ], - "operationId": "Compute_UpdateIdleShutdownSetting", - "description": "Updates the idle shutdown setting of a compute instance.", - "x-ms-examples": { - "Update idle shutdown setting of ComputeInstance": { - "$ref": "./examples/Compute/updateIdleShutdownSetting.json" - } - }, - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/WorkspaceNameParameter" - }, - { - "$ref": "#/parameters/ComputeNameParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "description": "The object for updating idle shutdown setting of specified ComputeInstance.", - "schema": { - "$ref": "#/definitions/IdleShutdownSetting" - } - } - ], - "responses": { - "200": { - "description": "Success." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" - } - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections": { "get": { "tags": [ @@ -5716,16 +5665,6 @@ ] } } - }, - "IdleShutdownSetting": { - "type": "object", - "description": "Stops compute instance after user defined period of inactivity.", - "properties": { - "idleTimeBeforeShutdown": { - "type": "string", - "description": "Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days." - } - } } } } From 224c53e9da685165c6946f3f575175829c21b617 Mon Sep 17 00:00:00 2001 From: Teo Magnino Chaban Date: Fri, 15 Jul 2022 11:28:38 -0700 Subject: [PATCH 6/6] Reverted to having API --- .../Compute/updateIdleShutdownSetting.json | 15 +++++ .../machineLearningServices.json | 61 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json new file mode 100644 index 000000000000..de0eff0e2a52 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/examples/Compute/updateIdleShutdownSetting.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2022-06-01-preview", + "parameters": { + "idleTimeBeforeShutdown": "PT120M" + } + }, + "responses": { + "200": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json index c53bda63116b..5b764c2593d3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2022-06-01-preview/machineLearningServices.json @@ -1270,6 +1270,57 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/updateIdleShutdownSetting": { + "post": { + "tags": [ + "MachineLearningComputes" + ], + "operationId": "Compute_UpdateIdleShutdownSetting", + "description": "Updates the idle shutdown setting of a compute instance.", + "x-ms-examples": { + "Update idle shutdown setting of ComputeInstance": { + "$ref": "./examples/Compute/updateIdleShutdownSetting.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "description": "The object for updating idle shutdown setting of specified ComputeInstance.", + "schema": { + "$ref": "#/definitions/IdleShutdownSetting" + } + } + ], + "responses": { + "200": { + "description": "Success." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections": { "get": { "tags": [ @@ -5665,6 +5716,16 @@ ] } } + }, + "IdleShutdownSetting": { + "type": "object", + "description": "Stops compute instance after user defined period of inactivity.", + "properties": { + "idleTimeBeforeShutdown": { + "type": "string", + "description": "Time is defined in ISO8601 format. Minimum is 15 min, maximum is 3 days." + } + } } } }