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

Scheduler: Add ServiceBusQueue and ServiceBusTopic action type. #47

Merged
merged 3 commits into from
Nov 5, 2015
Merged

Scheduler: Add ServiceBusQueue and ServiceBusTopic action type. #47

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c0b08b
Scheduler: Add ServiceBusQueue and ServiceBusTopic action type.
pinwang81 Nov 4, 2015
d38434c
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
pinwang81 Nov 5, 2015
daa8be5
Fix x-ms-pageable
pinwang81 Nov 5, 2015
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
210 changes: 194 additions & 16 deletions arm-scheduler/2014-08-01-preview/swagger/scheduler.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"$ref": "#/definitions/JobCollectionListResult"
}
}
}
},
"x-ms-pageable": true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This extension has changed. Should be: "x-ms-pageable": { "nextLinkName" : "nextLink }

See other specs as a reference.

}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Scheduler/jobCollections": {
Expand Down Expand Up @@ -71,7 +72,8 @@
"$ref": "#/definitions/JobCollectionListResult"
}
}
}
},
"x-ms-pageable": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Scheduler/jobCollections/{jobCollectionName}": {
Expand Down Expand Up @@ -609,7 +611,8 @@
"$ref": "#/definitions/JobListResult"
}
}
}
},
"x-ms-pageable": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Scheduler/jobCollections/{jobCollectionName}/jobs/{jobName}/history": {
Expand Down Expand Up @@ -669,7 +672,8 @@
"$ref": "#/definitions/JobHistoryListResult"
}
}
}
},
"x-ms-pageable": true
}
}
},
Expand Down Expand Up @@ -725,7 +729,7 @@
"id": {
"type": "string",
"readOnly": true,
"description": "Gets the job collection identifier."
"description": "Gets the job collection resource identifier."
},
"type": {
"type": "string",
Expand All @@ -734,7 +738,7 @@
},
"name": {
"type": "string",
"description": "Gets or sets the job collection name."
"description": "Gets or sets the job collection resource name."
},
"location": {
"type": "string",
Expand Down Expand Up @@ -811,7 +815,7 @@
"id": {
"type": "string",
"readOnly": true,
"description": "Gets the job identifier."
"description": "Gets the job resource identifier."
},
"type": {
"type": "string",
Expand All @@ -821,7 +825,7 @@
"name": {
"type": "string",
"readOnly": true,
"description": "Gets the job name."
"description": "Gets the job resource name."
},
"properties": {
"$ref": "#/definitions/JobProperties",
Expand Down Expand Up @@ -954,7 +958,9 @@
"enum": [
"Http",
"Https",
"StorageQueue"
"StorageQueue",
"ServiceBusQueue",
"ServiceBusTopic"
],
"x-ms-enum": { "name": "JobActionType", "modelAsString": "False" }
},
Expand All @@ -966,6 +972,14 @@
"$ref": "#/definitions/StorageQueueMessage",
"description": "Gets or sets the storage queue message."
},
"serviceBusQueueMessage": {
"$ref": "#/definitions/ServiceBusQueueMessage",
"description": "Gets or sets the service bus queue message."
},
"serviceBusTopicMessage": {
"$ref": "#/definitions/ServiceBusTopicMessage",
"description": "Gets or sets the service bus topic message."
},
"retryPolicy": {
"$ref": "#/definitions/RetryPolicy",
"description": "Gets or sets the retry policy."
Expand All @@ -984,7 +998,9 @@
"enum": [
"Http",
"Https",
"StorageQueue"
"StorageQueue",
"ServiceBusQueue",
"ServiceBusTopic"
],
"x-ms-enum": { "name": "JobActionType", "modelAsString": "False" }
},
Expand All @@ -996,6 +1012,14 @@
"$ref": "#/definitions/StorageQueueMessage",
"description": "Gets or sets the storage queue message."
},
"serviceBusQueueMessage": {
"$ref": "#/definitions/ServiceBusQueueMessage",
"description": "Gets or sets the service bus queue message."
},
"serviceBusTopicMessage": {
"$ref": "#/definitions/ServiceBusTopicMessage",
"description": "Gets or sets the service bus topic message."
},
"retryPolicy": {
"$ref": "#/definitions/RetryPolicy",
"description": "Gets or sets the retry policy."
Expand All @@ -1010,7 +1034,7 @@
},
"uri": {
"type": "string",
"description": "Gets or sets the Uri for the request."
"description": "Gets or sets the Uri."
},
"method": {
"type": "string",
Expand All @@ -1025,7 +1049,7 @@
"additionalProperties": {
"type": "string"
},
"description": "Gets or sets the headers for the request."
"description": "Gets or sets the headers."
}
}
},
Expand Down Expand Up @@ -1120,19 +1144,161 @@
"properties": {
"storageAccount": {
"type": "string",
"description": "Gets or sets the Storage Account Name for the request."
"description": "Gets or sets the storage account name."
},
"queueName": {
"type": "string",
"description": "Gets or sets the Queue Name for the request."
"description": "Gets or sets the queue name."
},
"sasToken": {
"type": "string",
"description": "Gets or sets the SAS Key for the request."
"description": "Gets or sets the SAS key."
},
"message": {
"type": "string",
"description": "Gets or sets the message for the request."
"description": "Gets or sets the message."
}
}
},
"ServiceBusQueueMessage": {
"properties": {
"queueName": {
"type": "string",
"description": "Gets or sets the queue name."
}
},
"allOf": [
{
"$ref": "#/definitions/ServiceBusMessage"
}
]
},
"ServiceBusTopicMessage": {
"properties": {
"topicPath": {
"type": "string",
"description": "Gets or sets the topic path."
}
},
"allOf": [
{
"$ref": "#/definitions/ServiceBusMessage"
}
]
},
"ServiceBusMessage": {
"properties": {
"authentication": {
"$ref": "#/definitions/ServiceBusAuthentication",
"description": "Gets or sets the authentication."
},
"brokeredMessageProperties": {
"$ref": "#/definitions/ServiceBusBrokeredMessageProperties",
"description": "Gets or sets the brokered message properties."
},
"customMessageProperties": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Gets or sets the custom message properties."
},
"message": {
"type": "string",
"description": "Gets or sets the message."
},
"namespace": {
"type": "string",
"description": "Gets or sets the namespace."
},
"transportType": {
"type": "string",
"description": "Gets or sets the transport type.",
"enum": [
"NotSpecified",
"NetMessaging",
"AMQP"
],
"x-ms-enum": { "name": "ServiceBusTransportType", "modelAsString": "False" }
}
}
},
"ServiceBusAuthentication": {
"properties": {
"sasKey": {
"type": "string",
"description": "Gets or sets the SAS key."
},
"sasKeyName": {
"type": "string",
"description": "Gets or sets the SAS key name."
},
"type": {
"type": "string",
"description": "Gets or sets the authentication type.",
"enum": [
"NotSpecified",
"SharedAccessKey"
],
"x-ms-enum": { "name": "ServiceBusAuthenticationType", "modelAsString": "False" }
}
}
},
"ServiceBusBrokeredMessageProperties": {
"properties": {
"contentType": {
"type": "string",
"description": "Gets or sets the content type."
},
"correlationId": {
"type": "string",
"description": "Gets or sets the correlation id."
},
"forcePersistence": {
"type": "boolean",
"description": "Gets or sets the force persistence."
},
"label": {
"type": "string",
"description": "Gets or sets the label."
},
"messageId": {
"type": "string",
"description": "Gets or sets the message id."
},
"partitionKey": {
"type": "string",
"description": "Gets or sets the partition key."
},
"replyTo": {
"type": "string",
"description": "Gets or sets the reply to."
},
"replyToSessionId": {
"type": "string",
"description": "Gets or sets the reply to session id."
},
"scheduledEnqueueTimeUtc": {
"type": "string",
"format": "date-time",
"description": "Gets or sets the scheduled enqueue time UTC."
},
"sessionId": {
"type": "string",
"description": "Gets or sets the session id."
},
"timeToLive": {
"type": "string",
"format": "date-time",
"description": "Gets or sets the time to live."
},
"to": {
"type": "string",
"description": "Gets or sets the to."
},
"viaPartitionKey": {
"type": "string",
"description": "Gets or sets the via partition key."
}
}
},
Expand Down Expand Up @@ -1210,6 +1376,18 @@
}
}
},
"RecurrenceFrequency": {
"type": "string",
"description": "Gets or sets the frequency of recurrence (minute, hour, day, week, month).",
"enum": [
"Minute",
"Hour",
"Day",
"Week",
"Month"
],
"x-ms-enum": { "name": "RecurrenceFrequency", "modelAsString": "False" }
},
"JobRecurrenceSchedule": {
"properties": {
"weekDays": {
Expand Down