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.

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

Add schedule api #14360

Merged
merged 92 commits into from
May 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 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
84ec88f
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Sep 10, 2020
ac5afcb
change for getTransitivePEUsages
zhaomuzhi Sep 10, 2020
bf923f0
update
zhaomuzhi Sep 10, 2020
2ab304a
prettier code
zhaomuzhi Sep 10, 2020
e4a5d19
add another new endpoint
zhaomuzhi Sep 10, 2020
8f20ad7
address comments
zhaomuzhi Sep 22, 2020
5eee086
change for getTransitivePEUsages
zhaomuzhi Sep 10, 2020
a34a194
update
zhaomuzhi Sep 10, 2020
0a23a85
prettier code
zhaomuzhi Sep 10, 2020
b87f8e9
add another new endpoint
zhaomuzhi Sep 10, 2020
7c91175
address comments
zhaomuzhi Sep 22, 2020
0696b9e
revert change on transitivePE and notebookKeys
zhaomuzhi Oct 23, 2020
2981eb3
Merge branch 'master' of https://github.com/zhaomuzhi/azure-rest-api-…
zhaomuzhi Oct 23, 2020
072a51f
revert change on transitivePE and notebookKeys
zhaomuzhi Oct 23, 2020
3b010c7
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Nov 21, 2020
c40a15e
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Dec 8, 2020
1d693a7
add new stable version 2021-01-01
zhaomuzhi Dec 8, 2020
0bc494b
add ListNotebookAccessToken
zhaomuzhi Dec 8, 2020
a85c418
add primaryUserAssignedIdentity
zhaomuzhi Dec 8, 2020
e13ea29
fix missing properties and apis
zhaomuzhi Dec 9, 2020
8e6ddf9
fix one more missing property
zhaomuzhi Dec 10, 2020
1df7b8e
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Dec 11, 2020
584fd07
202 status for start and stop CI
VinayRSoni Jan 26, 2021
7e30ce1
Merge pull request #8 from zhaomuzhi/vison/202startstopCI
zhaomuzhi Jan 26, 2021
847d562
Merge remote-tracking branch 'upstream/master'
zhaomuzhi Feb 9, 2021
ed0fbb9
make resync keys long runnin operation in version Jan2021
SubaMoorthy Feb 11, 2021
d57e01a
resync keys 204
SubaMoorthy Feb 11, 2021
a6e57f1
update resync keys example
SubaMoorthy Feb 11, 2021
817df44
Dont throw 204 for resync
SubaMoorthy Feb 11, 2021
da352f8
update resync keys
SubaMoorthy Feb 11, 2021
aa050c6
Formatting
SubaMoorthy Feb 11, 2021
f419400
revert Jan2021changes and add new version
SubaMoorthy Feb 12, 2021
f4e883e
start apr2021 version for azure ml rp
SubaMoorthy Feb 12, 2021
d346094
undo remove new line in jan2021
SubaMoorthy Feb 12, 2021
4a8cd59
Merge branch 'master' of https://github.com/SubaMoorthy/sukaruna-aml-…
zhaomuzhi Mar 2, 2021
5369992
use systemData definition in common
zhaomuzhi Mar 2, 2021
63d49cf
removed old files
zhaomuzhi Mar 2, 2021
36d6366
Merge pull request #3 from SubaMoorthy/referenceCommonSystemData
zhaomuzhi Mar 2, 2021
2818e5f
fix small swagger bugs
SubaMoorthy Mar 4, 2021
7daf6ea
Merge pull request #4 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Mar 4, 2021
45a3c2b
run prettier
SubaMoorthy Mar 30, 2021
8d43278
Merge pull request #6 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Mar 30, 2021
97107b4
remove reference to sku
SubaMoorthy Mar 30, 2021
c24b611
Merge pull request #7 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Mar 30, 2021
aaadda3
update readme
SubaMoorthy Mar 30, 2021
c411877
Merge pull request #8 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Mar 30, 2021
6fe7c50
minimum agentCount should be 0
Mar 30, 2021
a1ac282
add createdOn and ModifiedOn to compute properties
Mar 30, 2021
c8bbd9c
add LoadBalancerType to aks compute
Mar 30, 2021
2cc4a86
add isNotebookInstanceCompute to virtualMachine
Mar 30, 2021
8335e68
add leafDomainLabel to SslConfiguration
Mar 30, 2021
0a9921d
add overwriteExistingDomain to SslConfiguration
Mar 30, 2021
4344156
add synapseSpark as supported compute-type
Mar 31, 2021
db23cf1
update patch compute response to 202
Mar 31, 2021
048bf25
remove location from example responses
Mar 31, 2021
0088b8c
Revert "remove location from example responses"
Mar 31, 2021
83b9be3
Merge pull request #9 from SubaMoorthy/jopet/mlc-swagger-fixes
joshanator Apr 1, 2021
973ae5a
MachineLearningCompute_Update should have a 200 response
Apr 1, 2021
cb6d9c8
sys data to use local def due to naming conflicts.
SubaMoorthy Apr 2, 2021
fb9d2b1
Merge pull request #10 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Apr 2, 2021
c5bd245
Fix enum casing
SubaMoorthy Apr 2, 2021
c0959d0
Merge pull request #11 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Apr 2, 2021
3bfe3f8
Fix operationId PR comment.
SubaMoorthy Apr 5, 2021
373f8bc
Merge pull request #12 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Apr 5, 2021
fc946f1
Change opId in apr version
SubaMoorthy Apr 5, 2021
64257b3
Merge pull request #13 from SubaMoorthy/fix-swagger-kpi-bugs
SubaMoorthy Apr 5, 2021
06b8f2d
remove 20210401 for easy review
SubaMoorthy Apr 6, 2021
1222658
only change api version
SubaMoorthy Apr 6, 2021
df1a995
merge changes for 20210401 version
SubaMoorthy Apr 6, 2021
3da36b8
Add x-ms-discriminator-value for Synapse spark
Apr 7, 2021
1d4b80d
camelcase loadbalancer properties
Apr 7, 2021
cbeffca
add createdOn and Modified on to examples
Apr 7, 2021
235a15e
address AvoidAnonymousTypes error for SynapseSpark
Apr 7, 2021
d45216f
Minor fixes + new property
SubaMoorthy Apr 7, 2021
79f3834
Remove subscription state.
SubaMoorthy Apr 7, 2021
fdafe9c
Merge branch 'Azure:master' into master
SubaMoorthy May 10, 2021
af18145
Merge branch 'Azure:master' into master
SubaMoorthy May 11, 2021
30b8066
add schedules api
SubaMoorthy May 11, 2021
c1633c2
Add schedule examples
SubaMoorthy May 11, 2021
26b4291
case formatting
SubaMoorthy May 11, 2021
ca1dd5a
Cron example for ci create
SubaMoorthy May 11, 2021
4ad7711
Prettier check and model validation
SubaMoorthy May 11, 2021
548f421
renaming property
SubaMoorthy May 17, 2021
d7f5365
Address comments
SubaMoorthy May 17, 2021
0583ede
Give a stop example
SubaMoorthy May 17, 2021
cb4ecb1
Fix time format.
SubaMoorthy May 17, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2021-03-01-preview",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "ComputeInstance",
"properties": {
"vmSize": "STANDARD_NC6",
"subnet": "test-subnet-resource-id",
"applicationSharingPolicy": "Personal",
"sshSettings": {
"sshPublicAccess": "Disabled"
},
"computeInstanceAuthorizationType": "personal",
"personalComputeInstanceSettings": {
"assignedUser": {
"objectId": "00000000-0000-0000-0000-000000000000",
"tenantId": "00000000-0000-0000-0000-000000000000"
}
},
"schedules": {
"computeStartStop": [
{
"status": "Enabled",
"action": "Stop",
"triggerType": "Cron",
"cron": {
"expression": "0 18 * * *",
"startTime": "2021-04-23T01:30:00",
"timeZone": "Pacific Standard Time"
}
SubaMoorthy marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "ComputeInstance",
"provisioningState": "Creating"
}
}
},
"201": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "ComputeInstance",
"provisioningState": "Creating"
}
},
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2021-03-01-preview",
"parameters": {
"computeStartStop": [
{
"status": "Enabled",
"action": "Start",
"triggerType": "Recurrence",
"recurrence": {
"frequency": "Day",
"interval": 1,
"startTime": "2021-04-23T01:30:00",
"timeZone": "Pacific Standard Time",
"schedule": {
"hours": [
18
],
"minutes": [
30
],
"weekDays": null
}
SubaMoorthy marked this conversation as resolved.
Show resolved Hide resolved
}
}
]
}
},
"responses": {
"200": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,9 @@
"Create an ComputeInstance Compute": {
"$ref": "./examples/Compute/createOrUpdate/ComputeInstance.json"
},
"Create an ComputeInstance Compute with Schedules": {
"$ref": "./examples/Compute/createOrUpdate/ComputeInstanceWithSchedules.json"
},
"Create AKS Compute": {
"$ref": "./examples/Compute/createOrUpdate/BasicAKSCompute.json"
},
Expand Down Expand Up @@ -1169,6 +1172,56 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/updateSchedules": {
"post": {
"tags": [
"MachineLearningComputes"
],
"operationId": "Compute_UpdateSchedules",
"description": "Updates schedules of a compute instance",
"x-ms-examples": {
"Update schedules of ComputeInstance": {
"$ref": "./examples/Compute/updateSchedules.json"
}
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "#/parameters/WorkspaceNameParameter"
},
{
"$ref": "#/parameters/ComputeNameParameter"
},
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"name": "parameters",
"in": "body",
"description": "The object for updating schedules of specified ComputeInstance.",
"schema": {
"$ref": "#/definitions/ComputeSchedules"
}
}
],
"responses": {
"200": {
"description": "Success."
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections": {
"get": {
"tags": [
Expand Down Expand Up @@ -3155,6 +3208,10 @@
"description": "The last operation on ComputeInstance.",
"$ref": "#/definitions/ComputeInstanceLastOperation",
"readOnly": true
},
"schedules": {
"description": "The list of schedules to be applied on the compute instance.",
"$ref": "#/definitions/ComputeSchedules"
ninghu marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down Expand Up @@ -4584,6 +4641,209 @@
}
}
}
},
"ComputeStartStopSchedule": {
"type": "object",
"description": "Compute start stop schedule properties",
"properties": {
"id": {
"description": "Schedule id.",
"readOnly": true,
"type": "string"
},
"provisioningStatus": {
"type": "string",
"enum": [
"Completed",
"Provisioning",
"Failed"
],
"x-ms-enum": {
"name": "provisioningStatus",
"modelAsString": true
},
"readOnly": true,
"description": "The current deployment state of schedule."
},
"status": {
"$ref": "#/definitions/ScheduleStatus"
},
"triggerType": {
"$ref": "#/definitions/TriggerType"
},
"action": {
"$ref": "#/definitions/ComputePowerAction"
},
"recurrence": {
"$ref": "#/definitions/Recurrence"
},
"cron": {
"$ref": "#/definitions/Cron"
}
}
},
"ScheduleStatus": {
"type": "string",
"description": "The schedule status.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "ScheduleStatus",
"modelAsString": true
}
},
"ScheduleType": {
"type": "string",
"description": "The schedule type.",
"enum": [
"ComputeStartStop"
],
"x-ms-enum": {
"name": "ScheduleType",
"modelAsString": true
}
},
"ComputePowerAction": {
"type": "string",
"description": "The compute power action.",
"enum": [
"Start",
"Stop"
],
"x-ms-enum": {
"name": "ComputePowerAction",
"modelAsString": true
}
},
"TriggerType": {
"type": "string",
"description": "The schedule trigger type.",
"enum": [
"Recurrence",
"Cron"
],
"x-ms-enum": {
"name": "TriggerType",
"modelAsString": true
}
},
"RecurrenceFrequency": {
"type": "string",
"description": "The recurrence frequency.",
"enum": [
"NotSpecified",
"Second",
"Minute",
"Hour",
"Day",
"Week",
"Month",
"Year"
],
"x-ms-enum": {
"name": "RecurrenceFrequency",
"modelAsString": true
}
},
"RecurrenceSchedule": {
"type": "object",
"description": "The recurrence schedule",
"properties": {
"minutes": {
"type": "array",
"items": {
"type": "integer",
"format": "int32"
},
"description": "The minutes."
},
"hours": {
"type": "array",
"items": {
"type": "integer",
"format": "int32"
},
"description": "The hours."
},
"weekDays": {
"type": "array",
"items": {
"type": "string",
"enum": [
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday"
],
"x-ms-enum": {
"name": "DaysOfWeek",
"modelAsString": false
}
},
"description": "The days of the week."
}
}
},
"Recurrence": {
"type": "object",
"description": "The workflow trigger recurrence for ComputeStartStop schedule type.",
"properties": {
"frequency": {
"$ref": "#/definitions/RecurrenceFrequency"
},
"interval": {
"type": "integer",
"format": "int32",
"description": "The interval."
},
"startTime": {
"type": "string",
"description": "The start time."
},
"timeZone": {
"type": "string",
"description": "The time zone."
},
"schedule": {
"$ref": "#/definitions/RecurrenceSchedule"
}
}
},
"Cron": {
"type": "object",
"description": "The workflow trigger cron for ComputeStartStop schedule type.",
"properties": {
"startTime": {
"type": "string",
"description": "The start time."
},
"timeZone": {
"type": "string",
"description": "The time zone."
},
"expression": {
"type": "string",
"description": "The cron expression."
}
}
},
"ComputeSchedules": {
"type": "object",
"description": "The list of schedules to be applied on the computes",
"properties": {
"computeStartStop": {
"type": "array",
"items": {
"$ref": "#/definitions/ComputeStartStopSchedule"
},
"description": "The list of compute start stop schedules to be applied."
}
}
}
}
}