From 313f5d0280eb7272b6c6eb1ab385a078d1f6cc9d Mon Sep 17 00:00:00 2001 From: Kayla Ames Date: Wed, 20 Sep 2023 09:05:34 -0700 Subject: [PATCH 1/4] TriggerType->ComputeTriggerType --- .../2023-10-01/machineLearningServices.json | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json index 32c860d8e8a8..8bf9d8b27e07 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json @@ -5490,7 +5490,7 @@ }, "triggerType": { "description": "[Required] The schedule trigger type.", - "$ref": "./mfe.json#/definitions/TriggerType" + "$ref": "#/definitions/ComputeTriggerType" }, "recurrence": { "description": "Required if triggerType is Recurrence.", @@ -5506,6 +5506,26 @@ } } }, + "ComputeTriggerType": { + "enum": [ + "Recurrence", + "Cron" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeTriggerType", + "modelAsString": true, + "values": [ + { + "value": "Recurrence" + }, + { + "value": "Cron" + } + ] + }, + "additionalProperties": false + }, "ScheduleBase": { "type": "object", "properties": { From ab76d7509ab8d868eda356d208ba39b042270689 Mon Sep 17 00:00:00 2001 From: Kayla Ames Date: Wed, 20 Sep 2023 09:14:34 -0700 Subject: [PATCH 2/4] RecurrenceFrequency->ComputeRecurrenceFrequency --- .../2023-10-01/machineLearningServices.json | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json index 8bf9d8b27e07..0d220d8ebf64 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json @@ -5607,7 +5607,7 @@ "properties": { "frequency": { "description": "[Required] The frequency to trigger schedule.", - "$ref": "./mfe.json#/definitions/RecurrenceFrequency" + "$ref": "#/definitions/ComputeRecurrenceFrequency" }, "interval": { "description": "[Required] Specifies schedule interval in conjunction with frequency", @@ -5630,6 +5630,44 @@ } } }, + "ComputeRecurrenceFrequency": { + "description": "Enum to describe the frequency of a compute recurrence schedule", + "enum": [ + "Minute", + "Hour", + "Day", + "Week", + "Month" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeRecurrenceFrequency", + "modelAsString": true, + "values": [ + { + "value": "Minute", + "description": "Minute frequency" + }, + { + "value": "Hour", + "description": "Hour frequency" + }, + { + "value": "Day", + "description": "Day frequency" + }, + { + "value": "Week", + "description": "Week frequency" + }, + { + "value": "Month", + "description": "Month frequency" + } + ] + }, + "additionalProperties": false + }, "Cron": { "type": "object", "description": "The workflow trigger cron for ComputeStartStop schedule type.", From f5cdd0058e0bd7e81abc0da7f9db47843acd4435 Mon Sep 17 00:00:00 2001 From: Kayla Ames Date: Wed, 20 Sep 2023 09:17:03 -0700 Subject: [PATCH 3/4] RecurrenceSchedule->ComputeRecurrenceSchedule --- .../2023-10-01/machineLearningServices.json | 93 ++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json index 0d220d8ebf64..236771f517ce 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json @@ -5626,7 +5626,7 @@ }, "schedule": { "description": "[Required] The recurrence schedule.", - "$ref": "./mfe.json#/definitions/RecurrenceSchedule" + "$ref": "#/definitions/ComputeRecurrenceSchedule" } } }, @@ -5668,6 +5668,97 @@ }, "additionalProperties": false }, + "ComputeRecurrenceSchedule": { + "required": [ + "hours", + "minutes" + ], + "type": "object", + "properties": { + "hours": { + "description": "[Required] List of hours for the schedule.", + "type": "array", + "items": { + "format": "int32", + "type": "integer" + } + }, + "minutes": { + "description": "[Required] List of minutes for the schedule.", + "type": "array", + "items": { + "format": "int32", + "type": "integer" + } + }, + "monthDays": { + "description": "List of month days for the schedule", + "type": "array", + "items": { + "format": "int32", + "type": "integer" + }, + "x-nullable": true + }, + "weekDays": { + "description": "List of days for the schedule.", + "type": "array", + "items": { + "$ref": "#/definitions/ComputeWeekDay" + }, + "x-nullable": true + } + }, + "additionalProperties": false + }, + "ComputeWeekDay": { + "description": "Enum of weekday", + "enum": [ + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + "Sunday" + ], + "type": "string", + "x-ms-enum": { + "name": "ComputeWeekDay", + "modelAsString": true, + "values": [ + { + "value": "Monday", + "description": "Monday weekday" + }, + { + "value": "Tuesday", + "description": "Tuesday weekday" + }, + { + "value": "Wednesday", + "description": "Wednesday weekday" + }, + { + "value": "Thursday", + "description": "Thursday weekday" + }, + { + "value": "Friday", + "description": "Friday weekday" + }, + { + "value": "Saturday", + "description": "Saturday weekday" + }, + { + "value": "Sunday", + "description": "Sunday weekday" + } + ] + }, + "additionalProperties": false + }, "Cron": { "type": "object", "description": "The workflow trigger cron for ComputeStartStop schedule type.", From ebc072f54f0cc6181444cc6bed42cca7c1802a89 Mon Sep 17 00:00:00 2001 From: Kayla Ames Date: Thu, 21 Sep 2023 13:05:48 -0700 Subject: [PATCH 4/4] description --- .../stable/2023-10-01/machineLearningServices.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json index 236771f517ce..4e31377122c4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json @@ -5511,6 +5511,7 @@ "Recurrence", "Cron" ], + "description": "Is the trigger type recurrence or cron.", "type": "string", "x-ms-enum": { "name": "ComputeTriggerType",