From ff91d1ccf06ea4b25b7486f359dc45160c32dfb6 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Fri, 31 Jan 2020 16:12:23 -0800 Subject: [PATCH 01/47] 2020-02-01-preview for Media Services LVA Changes to MediaGraph model Changing PUT from sync to async Fixing some description --- .../preview/2020-02-01-preview/Common.json | 80 ++ .../2020-02-01-preview/MediaGraphs.json | 867 ++++++++++++++++++ .../examples/media-graph-create.json | 118 +++ .../examples/media-graph-delete.json | 13 + .../examples/media-graph-get-by-name.json | 46 + .../examples/media-graph-list-all.json | 112 +++ .../examples/media-graph-start.json | 13 + .../examples/media-graph-stop.json | 13 + .../examples/operation-result-get.json | 14 + 9 files changed, 1276 insertions(+) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json new file mode 100644 index 000000000000..db5f118e4181 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -0,0 +1,80 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Media Services", + "version": "2018-07-01" + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "Impersonate your user account" + } + } + }, + "paths": {}, + "definitions": { + "Resource": { + "description": "The core properties of ARM resources.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource ID for the resource." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource." + } + }, + "x-ms-azure-resource": true + }, + "TrackedResource": { + "description": "The resource model definition for a ARM tracked resource.", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The Azure Region of the resource." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProxyResource": { + "description": "The resource model definition for a ARM proxy resource.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json new file mode 100644 index 000000000000..f3e809f92ad7 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -0,0 +1,867 @@ +{ + "schemes": [ + "https" + ], + "swagger": "2.0", + "info": { + "title": "Azure Media Services", + "description": "This Swagger was generated by the API Framework.", + "version": "2020-02-01-preview" + }, + "host": "management.azure.com", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "Impersonate your user account" + } + } + }, + "definitions": { + "MediaGraphProperties": { + "properties": { + "description": { + "type": "string", + "description": "Media Graph description." + }, + "state": { + "type": "string", + "enum": [ + "Creating", + "Running", + "Starting", + "Stopped", + "Stopping" + ], + "x-ms-enum": { + "name": "MediaGraphState", + "values": [ + { + "value": "Creating", + "description": "Media Graph is Creating." + }, + { + "value": "Running", + "description": "Media Graph is Running." + }, + { + "value": "Starting", + "description": "Media Graph is Starting." + }, + { + "value": "Stopped", + "description": "Media Graph has Stopped." + }, + { + "value": "Stopping", + "description": "Media Graph is Stopping." + } + ], + "modelAsString": true + }, + "description": "Media Graph state which indicates the resource allocation status for running the media graph pipeline.", + "readOnly": true, + "x-nullable": false + }, + "provisioningState": { + "type": "string", + "enum": [ + "Succeeded", + "Failed", + "Canceled", + "Creating", + "Updating" + ], + "x-ms-enum": { + "name": "MediaGraphProvisioningState", + "values": [ + { + "value": "Succeeded", + "description": "Media graph provisioning is in Succeeded state." + }, + { + "value": "Failed", + "description": "Media graph provisioning is in Failed state." + }, + { + "value": "Canceled", + "description": "Media graph provisioning is in Canceled state." + }, + { + "value": "Creating", + "description": "Media graph provisioning is in Creating state." + }, + { + "value": "Updating", + "description": "Media graph provisioning is in Updating state." + } + ], + "modelAsString": true + }, + "description": "Media Graph provisioning state which indicates the status of media graph creation or update.", + "readOnly": true, + "x-nullable": false + }, + "provisioningComment": { + "type": "string", + "description": "Media Graph provisioning comment which provides more details if creation or update failed.", + "readOnly": true + }, + "created": { + "type": "string", + "format": "date-time", + "description": "Date the Media Graph was created.", + "readOnly": true, + "x-nullable": false + }, + "lastModified": { + "type": "string", + "format": "date-time", + "description": "Date the Media Graph was last modified.", + "readOnly": true, + "x-nullable": false + }, + "sources": { + "type": "array", + "items": { + "$ref": "#/definitions/MediaGraphSource" + }, + "description": "Media Graph sources." + }, + "sinks": { + "type": "array", + "items": { + "$ref": "#/definitions/MediaGraphSink" + }, + "description": "Media Graph sinks." + } + }, + "type": "object", + "required": [ + "sources", + "sinks" + ], + "description": "Class for Media Graph properties." + }, + "MediaGraphSource": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + }, + "name": { + "type": "string", + "description": "Source name." + } + }, + "type": "object", + "required": [ + "@odata.type", + "name" + ], + "description": "Media source." + }, + "MediaGraphSink": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + }, + "name": { + "type": "string", + "description": "Sink name." + }, + "inputs": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Sink inputs." + } + }, + "type": "object", + "required": [ + "@odata.type", + "name", + "inputs" + ], + "description": "Media Sink." + }, + "MediaGraphRtspSource": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphRtspSource", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphSource" + } + ], + "properties": { + "transport": { + "type": "string", + "enum": [ + "http", + "tcp" + ], + "x-ms-enum": { + "name": "MediaGraphRtspTransport", + "values": [ + { + "value": "http", + "description": "HTTP/HTTPS transport." + }, + { + "value": "tcp", + "description": "TCP transport." + } + ], + "modelAsString": true + }, + "description": "Underlying RTSP transport." + }, + "endpoint": { + "$ref": "#/definitions/MediaGraphEndpoint", + "description": "RTSP endpoint." + } + }, + "type": "object", + "required": [ + "endpoint" + ], + "description": "Media source" + }, + "MediaGraphEndpoint": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + }, + "credentials": { + "$ref": "#/definitions/MediaGraphCredentials", + "description": "Polymorphic credentials to present to the endpoint" + }, + "url": { + "type": "string", + "description": "Url for the endpoint" + } + }, + "type": "object", + "required": [ + "@odata.type", + "credentials", + "url" + ], + "description": "Base class for endpoints" + }, + "MediaGraphAssetSink": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphAssetSink", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphSink" + } + ], + "properties": { + "assetName": { + "type": "string", + "description": "Asset name." + } + }, + "type": "object", + "required": [ + "assetName" + ], + "description": "Asset sink." + }, + "MediaGraphCredentials": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + } + }, + "type": "object", + "required": [ + "@odata.type" + ], + "description": "Credentials to present during authentication" + }, + "MediaGraphUsernamePasswordCredentials": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphCredentials" + } + ], + "properties": { + "username": { + "type": "string", + "description": "Username for a username/password pair" + }, + "password": { + "type": "string", + "description": "Password for a username/password pair" + } + }, + "type": "object", + "required": [ + "username", + "password" + ], + "description": "Username/password credential pair" + }, + "MediaGraphClearEndpoint": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphClearEndpoint", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphEndpoint" + } + ], + "properties": {}, + "type": "object", + "description": "An endpoint to connect to with no encryption in transit." + }, + "MediaGraphTlsEndpoint": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphTlsEndpoint", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphEndpoint" + } + ], + "properties": { + "trustedCertificates": { + "$ref": "#/definitions/MediaGraphCertificateSource", + "description": "What certificates should be trusted when authenticating a TLS connection. Null designates that Azure Media's source of trust should be used." + }, + "validationOptions": { + "$ref": "#/definitions/MediaGraphTlsValidationOptions", + "description": "Validation options to use when authenticating a TLS connection. By default, strict validation is used" + } + }, + "type": "object", + "description": "An endpoint which must be connected over TLS/SSL" + }, + "MediaGraphCertificateSource": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + } + }, + "type": "object", + "required": [ + "@odata.type" + ], + "description": "Base class for certificate sources." + }, + "MediaGraphTlsValidationOptions": { + "properties": { + "ignoreHostname": { + "type": "boolean", + "description": "Ignore the host name (common name) during validation." + }, + "ignoreSignature": { + "type": "boolean", + "description": "Ignore the signature and validity period during validation." + } + }, + "type": "object", + "description": "Options for controlling the authentication of TLS endpoints." + }, + "MediaGraphPemCertificateList": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphPemCertificateList", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphCertificateSource" + } + ], + "properties": { + "certificates": { + "type": "array", + "items": { + "type": "string" + }, + "description": "PEM formatted public certificates, one per entry." + } + }, + "type": "object", + "required": [ + "certificates" + ], + "description": "A list of PEM formatted certificates." + }, + "MediaGraph": { + "allOf": [ + { + "$ref": "./Common.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/MediaGraphProperties", + "x-ms-client-flatten": true + } + }, + "type": "object", + "description": "The Media Graph." + }, + "MediaGraphOperationResult": { + "properties": {}, + "type": "object", + "description": "The result of the Media Graph operation." + }, + "ODataError": { + "properties": { + "code": { + "type": "string", + "description": "A language-independent error name." + }, + "message": { + "type": "string", + "description": "The error message." + }, + "target": { + "type": "string", + "description": "The target of the error (for example, the name of the property in error)." + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/ODataError" + }, + "description": "The error details." + } + }, + "type": "object", + "description": "Information about an error." + }, + "ApiError": { + "properties": { + "error": { + "$ref": "#/definitions/ODataError", + "description": "The error properties." + } + }, + "type": "object", + "description": "The API error." + }, + "MediaGraphCollection": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/MediaGraph" + }, + "description": "A collection of MediaGraph items." + }, + "@odata.nextLink": { + "type": "string", + "description": "A link to the next page of the collection (when the collection contains too many results to return in one response)." + } + }, + "type": "object", + "description": "A collection of MediaGraph items." + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs": { + "get": { + "summary": "List Media Graphs", + "description": "Lists Media Graphs in the Media Services account.", + "operationId": "MediaGraphs_List", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MediaGraphCollection" + } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "$ref": "#/parameters/ApiVersion" + }, + { + "name": "$top", + "in": "query", + "required": false, + "type": "integer", + "description": "Specifies a non-negative integer n that limits the number of items returned from a collection. The service returns the number of available items up to but not greater than the specified value n." + } + ], + "x-ms-pageable": { + "nextLinkName": "@odata.nextLink" + }, + "x-ms-examples": { + "List all Media Graphs": { + "$ref": "examples/media-graph-list-all.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}": { + "get": { + "summary": "Get a Media Graph", + "description": "Get the details of a Media Graph in the Media Services account.", + "operationId": "MediaGraphs_Get", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MediaGraph" + } + }, + "404": { + "description": "NotFound" + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-examples": { + "Get a Media Graph by name": { + "$ref": "examples/media-graph-get-by-name.json" + } + } + }, + "put": { + "summary": "Create or update a Media Graph", + "description": "Create or update a Media Graph in the Media Services account.", + "operationId": "MediaGraphs_CreateOrUpdate", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MediaGraph" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/MediaGraph" + } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/MediaGraph" + }, + "description": "The request parameters" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create or update a Media Graph": { + "$ref": "examples/media-graph-create.json" + } + } + }, + "delete": { + "summary": "Delete a Media Graph", + "description": "Deletes a Media Graph in the Media Services account.", + "operationId": "MediaGraphs_Delete", + "responses": { + "200": { + "description": "OK" + }, + "204": { + "description": "NoContent" + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-examples": { + "Delete a Media Graph": { + "$ref": "examples/media-graph-delete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/start": { + "post": { + "summary": "Start a Media Graph", + "description": "Start a Media Graph in the Media Services account.", + "operationId": "MediaGraphs_Start", + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Start Media Graph": { + "$ref": "examples/media-graph-start.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/stop": { + "post": { + "summary": "Stop a Media Graph", + "description": "Stop a Media Graph in the Media Services account.", + "operationId": "MediaGraphs_Stop", + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Stop Media Graph": { + "$ref": "examples/media-graph-stop.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationResults/{operationId}": { + "get": { + "summary": "Get the operation result", + "description": "Get the operation result of a Media Graph in the Media Services account.", + "operationId": "OperationResults_Get", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MediaGraphOperationResult" + } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "name": "operationId", + "in": "path", + "required": true, + "type": "string", + "description": "The operation ID" + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-examples": { + "Get the operation result": { + "$ref": "examples/operation-result-get.json" + } + } + } + } + }, + "parameters": { + "SubscriptionId": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The unique identifier for a Microsoft Azure subscription." + }, + "ResourceGroupName": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group within the Azure subscription.", + "x-ms-parameter-location": "method" + }, + "MediaServicesAccountName": { + "name": "accountName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Services account name.", + "x-ms-parameter-location": "method" + }, + "ApiVersion": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The Version of the API to be used with the client request." + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json new file mode 100644 index 000000000000..fb061bbf197e --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json @@ -0,0 +1,118 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph1", + "api-version": "2020-02-01-preview", + "parameters": { + "properties": { + "description": "updated description", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "rtspSource", + "transport": "http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink", + "inputs": [ + "rtspSource" + ], + "assetName": "SampleAsset" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "SampleMediaGraph", + "properties": { + "description": "", + "state": "Stopped", + "provisioningState": "Succeeded", + "provisioningComment": "", + "created": "2020-01-29T22:46:17.3044334Z", + "lastModified": "2020-01-29T22:46:17.3044334Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource0", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink0", + "inputs": [ + "RTSPSource0" + ], + "assetName": "Sample Asset0" + } + ] + } + } + }, + "201": { + "body": { + "name": "SampleMediaGraph1", + "properties": { + "description": "", + "state": "Creating", + "provisioningState": "Creating", + "provisioningComment": "", + "created": "2020-01-29T22:46:28.4921266Z", + "lastModified": "2020-01-29T22:46:28.4921266Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource0", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink0", + "inputs": [ + "RTSPSource0" + ], + "assetName": "Sample Asset0" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json new file mode 100644 index 000000000000..0a040e16f478 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "api-version": "2020-02-01-preview" + }, + "responses": { + "204": {}, + "200": {} + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json new file mode 100644 index 000000000000..222ac79f7078 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph1", + "api-version": "2020-02-01-preview" + }, + "responses": { + "404": {}, + "200": { + "body": { + "name": "SampleMediaGraph1", + "properties": { + "description": "", + "state": "Stopped", + "provisioningState": "Succeeded", + "provisioningComment": "", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource1", + "transport": "http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1" + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink1", + "inputs": [ + "RTSPSource1" + ], + "assetName": "Sample Asset1" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json new file mode 100644 index 000000000000..68515eee6076 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json @@ -0,0 +1,112 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "SampleMediaGraph0", + "properties": { + "description": "", + "state": "Stopped", + "provisioningState": "Succeeded", + "provisioningComment": "", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource0", + "transport": "http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream0" + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink0", + "inputs": [ + "RTSPSource0" + ], + "assetName": "Sample Asset0" + } + ] + } + }, + { + "name": "SampleMediaGraph1", + "properties": { + "description": "", + "state": "Starting", + "provisioningState": "Succeeded", + "provisioningComment": "", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource1", + "transport": "http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1" + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink1", + "inputs": [ + "RTSPSource1" + ], + "assetName": "Sample Asset1" + } + ] + } + }, + { + "name": "SampleMediaGraph2", + "properties": { + "description": "", + "state": "Running", + "provisioningState": "Succeeded", + "provisioningComment": "", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource2", + "transport": "http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream2" + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink2", + "inputs": [ + "RTSPSource2" + ], + "assetName": "Sample Asset2" + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json new file mode 100644 index 000000000000..a8a50d3db690 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "api-version": "2020-02-01-preview" + }, + "responses": { + "202": {}, + "200": {} + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json new file mode 100644 index 000000000000..a8a50d3db690 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "api-version": "2020-02-01-preview" + }, + "responses": { + "202": {}, + "200": {} + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json new file mode 100644 index 000000000000..b5b9ff5041fe --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "operationId": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", + "api-version": "2020-02-01-preview" + }, + "responses": { + "202": {}, + "204": {} + } +} \ No newline at end of file From 13a8b5cd6db9d19722431b1db09d91b32f5aee56 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Sat, 1 Feb 2020 20:42:19 -0800 Subject: [PATCH 02/47] Prettier and model validations fix --- .../preview/2020-02-01-preview/Common.json | 2 +- .../2020-02-01-preview/MediaGraphs.json | 5 ++++- .../examples/media-graph-create.json | 2 +- .../examples/media-graph-delete.json | 2 +- .../examples/media-graph-get-by-name.json | 2 +- .../examples/media-graph-list-all.json | 2 +- .../examples/media-graph-start.json | 2 +- .../examples/media-graph-stop.json | 2 +- .../examples/operation-result-get.json | 2 +- .../mediaservices/resource-manager/readme.md | 18 ++++++++++++++++++ 10 files changed, 30 insertions(+), 9 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json index db5f118e4181..ddaa689795e0 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -77,4 +77,4 @@ ] } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index f3e809f92ad7..686c9ff50966 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -789,6 +789,9 @@ "$ref": "#/definitions/MediaGraphOperationResult" } }, + "202": { + "description": "Accepted" + }, "default": { "description": "Detailed error information.", "schema": { @@ -864,4 +867,4 @@ "description": "The Version of the API to be used with the client request." } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json index fb061bbf197e..4e18835e5ada 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json @@ -115,4 +115,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json index 0a040e16f478..e77c43b37dbf 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json @@ -10,4 +10,4 @@ "204": {}, "200": {} } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json index 222ac79f7078..c50e305c2915 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json @@ -43,4 +43,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json index 68515eee6076..517c988e2b6b 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json @@ -109,4 +109,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json index a8a50d3db690..0ac5e0014e43 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json @@ -10,4 +10,4 @@ "202": {}, "200": {} } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json index a8a50d3db690..0ac5e0014e43 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json @@ -10,4 +10,4 @@ "202": {}, "200": {} } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json index b5b9ff5041fe..df34f31e1694 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md index f21dde020c01..741357466009 100644 --- a/specification/mediaservices/resource-manager/readme.md +++ b/specification/mediaservices/resource-manager/readme.md @@ -30,6 +30,23 @@ tag: package-2018-07 opt-in-extensible-enums: true ``` +### Tag: package-2020-02-preview + +These settings apply only when `--tag=package-2020-02-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2020-02-preview' +input-file: + - Microsoft.Media/stable/2018-07-01/AccountFilters.json + - Microsoft.Media/stable/2018-07-01/Accounts.json + - Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json + - Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json + - Microsoft.Media/stable/2018-07-01/Encoding.json + - Microsoft.Media/preview/2020-20-01-preview/MediaGraphs.json + - Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json + - Microsoft.Media/stable/2018-07-01/streamingservice.json +``` + + ### Tag: package-2019-09-preview These settings apply only when `--tag=package-2019-09-preview` is specified on the command line. @@ -303,6 +320,7 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: + - $(this-folder)/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json - $(this-folder)/Microsoft.Media/stable/2018-07-01/AccountFilters.json - $(this-folder)/Microsoft.Media/stable/2018-07-01/Accounts.json - $(this-folder)/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json From a5aab54b4de8e80d76a62a01c92c913e78f676b9 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Sat, 1 Feb 2020 22:49:16 -0800 Subject: [PATCH 03/47] Fixing validations --- .../preview/2020-02-01-preview/MediaGraphs.json | 10 +++------- specification/mediaservices/resource-manager/readme.md | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 686c9ff50966..543f18e8ced5 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -258,7 +258,6 @@ "type": "object", "required": [ "@odata.type", - "credentials", "url" ], "description": "Base class for endpoints" @@ -783,15 +782,12 @@ "description": "Get the operation result of a Media Graph in the Media Services account.", "operationId": "OperationResults_Get", "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/MediaGraphOperationResult" - } - }, "202": { "description": "Accepted" }, + "204": { + "description": "NoContent" + }, "default": { "description": "Detailed error information.", "schema": { diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md index 741357466009..11f291dcc9ed 100644 --- a/specification/mediaservices/resource-manager/readme.md +++ b/specification/mediaservices/resource-manager/readme.md @@ -41,7 +41,7 @@ input-file: - Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json - Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json - Microsoft.Media/stable/2018-07-01/Encoding.json - - Microsoft.Media/preview/2020-20-01-preview/MediaGraphs.json + - Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json - Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json - Microsoft.Media/stable/2018-07-01/streamingservice.json ``` From 0ccaace0fb58bbfc8161741e556afaa98c4902a6 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 3 Feb 2020 09:39:36 -0800 Subject: [PATCH 04/47] Fixing version in Common.json --- .../Microsoft.Media/preview/2020-02-01-preview/Common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json index ddaa689795e0..02ec66a8b421 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Azure Media Services", - "version": "2018-07-01" + "version": "2020-02-01-preview" }, "securityDefinitions": { "azure_auth": { From 6c08aadee3ef6724ef63b0d46c7cc89b8dd601ea Mon Sep 17 00:00:00 2001 From: Risong Na Date: Tue, 4 Feb 2020 16:56:06 -0800 Subject: [PATCH 05/47] Using common types.json --- .../preview/2020-02-01-preview/Common.json | 80 ------------------- .../2020-02-01-preview/MediaGraphs.json | 10 +-- 2 files changed, 5 insertions(+), 85 deletions(-) delete mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json deleted file mode 100644 index 02ec66a8b421..000000000000 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Azure Media Services", - "version": "2020-02-01-preview" - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "Impersonate your user account" - } - } - }, - "paths": {}, - "definitions": { - "Resource": { - "description": "The core properties of ARM resources.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource ID for the resource." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "The resource model definition for a ARM tracked resource.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The Azure Region of the resource." - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "The resource model definition for a ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - } - } -} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 543f18e8ced5..23fe99c4c1f1 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -1,7 +1,4 @@ { - "schemes": [ - "https" - ], "swagger": "2.0", "info": { "title": "Azure Media Services", @@ -9,6 +6,9 @@ "version": "2020-02-01-preview" }, "host": "management.azure.com", + "schemes": [ + "https" + ], "consumes": [ "application/json" ], @@ -47,7 +47,7 @@ "values": [ { "value": "Creating", - "description": "Media Graph is Creating." + "description": "Media Graph is being created." }, { "value": "Running", @@ -403,7 +403,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "./Common.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { From a2f821044883929c3572c8437f3159edd00a2532 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 12:09:39 -0800 Subject: [PATCH 06/47] Updating new version --- .../2020-02-01-preview/MediaGraphs.json | 215 +++++++++++------- .../media-graph-create-clear-source.json | 74 ++++++ .../media-graph-create-encrypted-source.json | 94 ++++++++ .../examples/media-graph-create.json | 118 ---------- .../examples/media-graph-get-by-name.json | 8 +- .../examples/media-graph-list-all.json | 20 +- .../examples/operation-status-get.json | 18 ++ 7 files changed, 327 insertions(+), 220 deletions(-) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json delete mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 23fe99c4c1f1..38998524b627 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -1,4 +1,7 @@ { + "schemes": [ + "https" + ], "swagger": "2.0", "info": { "title": "Azure Media Services", @@ -6,9 +9,6 @@ "version": "2020-02-01-preview" }, "host": "management.azure.com", - "schemes": [ - "https" - ], "consumes": [ "application/json" ], @@ -36,7 +36,6 @@ "state": { "type": "string", "enum": [ - "Creating", "Running", "Starting", "Stopped", @@ -45,10 +44,6 @@ "x-ms-enum": { "name": "MediaGraphState", "values": [ - { - "value": "Creating", - "description": "Media Graph is being created." - }, { "value": "Running", "description": "Media Graph is Running." @@ -72,50 +67,6 @@ "readOnly": true, "x-nullable": false }, - "provisioningState": { - "type": "string", - "enum": [ - "Succeeded", - "Failed", - "Canceled", - "Creating", - "Updating" - ], - "x-ms-enum": { - "name": "MediaGraphProvisioningState", - "values": [ - { - "value": "Succeeded", - "description": "Media graph provisioning is in Succeeded state." - }, - { - "value": "Failed", - "description": "Media graph provisioning is in Failed state." - }, - { - "value": "Canceled", - "description": "Media graph provisioning is in Canceled state." - }, - { - "value": "Creating", - "description": "Media graph provisioning is in Creating state." - }, - { - "value": "Updating", - "description": "Media graph provisioning is in Updating state." - } - ], - "modelAsString": true - }, - "description": "Media Graph provisioning state which indicates the status of media graph creation or update.", - "readOnly": true, - "x-nullable": false - }, - "provisioningComment": { - "type": "string", - "description": "Media Graph provisioning comment which provides more details if creation or update failed.", - "readOnly": true - }, "created": { "type": "string", "format": "date-time", @@ -209,35 +160,36 @@ "transport": { "type": "string", "enum": [ - "http", - "tcp" + "Http", + "Tcp" ], "x-ms-enum": { "name": "MediaGraphRtspTransport", "values": [ { - "value": "http", - "description": "HTTP/HTTPS transport." + "value": "Http", + "description": "HTTP/HTTPS transport. This should be used when HTTP tunneling is desired." }, { - "value": "tcp", - "description": "TCP transport." + "value": "Tcp", + "description": "TCP transport. This should be used when HTTP tunneling is not desired." } ], "modelAsString": true }, - "description": "Underlying RTSP transport." + "description": "Underlying RTSP transport. This can be used to enable or disable HTTP tunneling." }, "endpoint": { "$ref": "#/definitions/MediaGraphEndpoint", - "description": "RTSP endpoint." + "description": "RTSP endpoint of the stream being connected to." } }, "type": "object", "required": [ + "transport", "endpoint" ], - "description": "Media source" + "description": "RTSP source." }, "MediaGraphEndpoint": { "discriminator": "@odata.type", @@ -248,11 +200,11 @@ }, "credentials": { "$ref": "#/definitions/MediaGraphCredentials", - "description": "Polymorphic credentials to present to the endpoint" + "description": "Polymorphic credentials to present to the endpoint." }, "url": { "type": "string", - "description": "Url for the endpoint" + "description": "Url for the endpoint." } }, "type": "object", @@ -260,7 +212,7 @@ "@odata.type", "url" ], - "description": "Base class for endpoints" + "description": "Base class for endpoints." }, "MediaGraphAssetSink": { "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphAssetSink", @@ -293,7 +245,7 @@ "required": [ "@odata.type" ], - "description": "Credentials to present during authentication" + "description": "Credentials to present during authentication." }, "MediaGraphUsernamePasswordCredentials": { "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", @@ -305,11 +257,11 @@ "properties": { "username": { "type": "string", - "description": "Username for a username/password pair" + "description": "Username for a username/password pair." }, "password": { "type": "string", - "description": "Password for a username/password pair" + "description": "Password for a username/password pair." } }, "type": "object", @@ -317,7 +269,7 @@ "username", "password" ], - "description": "Username/password credential pair" + "description": "Username/password credential pair." }, "MediaGraphClearEndpoint": { "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphClearEndpoint", @@ -344,11 +296,11 @@ }, "validationOptions": { "$ref": "#/definitions/MediaGraphTlsValidationOptions", - "description": "Validation options to use when authenticating a TLS connection. By default, strict validation is used" + "description": "Validation options to use when authenticating a TLS connection. By default, strict validation is used." } }, "type": "object", - "description": "An endpoint which must be connected over TLS/SSL" + "description": "An endpoint which must be connected over TLS/SSL." }, "MediaGraphCertificateSource": { "discriminator": "@odata.type", @@ -372,10 +324,14 @@ }, "ignoreSignature": { "type": "boolean", - "description": "Ignore the signature and validity period during validation." + "description": "Ignore the integrity of the certificate chain at the current time." } }, "type": "object", + "required": [ + "ignoreHostname", + "ignoreSignature" + ], "description": "Options for controlling the authentication of TLS endpoints." }, "MediaGraphPemCertificateList": { @@ -403,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "./Common.json#/definitions/ProxyResource" } ], "properties": { @@ -415,6 +371,41 @@ "type": "object", "description": "The Media Graph." }, + "MediaGraphOperationError": { + "properties": { + "code": { + "type": "string", + "description": "The operation error code." + }, + "message": { + "type": "string", + "description": "The operation error message." + } + }, + "type": "object", + "description": "The operation error." + }, + "MediaGraphOperationStatus": { + "properties": { + "name": { + "type": "string", + "description": "The name of the Media Graph operation." + }, + "status": { + "type": "string", + "description": "The status of the Media Graph operation." + }, + "error": { + "$ref": "#/definitions/MediaGraphOperationError", + "description": "The error details for the Media Graph operation." + } + }, + "type": "object", + "required": [ + "name" + ], + "description": "The status of the Media Graph operation." + }, "MediaGraphOperationResult": { "properties": {}, "type": "object", @@ -584,12 +575,6 @@ "$ref": "#/definitions/MediaGraph" } }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/MediaGraph" - } - }, "default": { "description": "Detailed error information.", "schema": { @@ -627,10 +612,12 @@ "$ref": "#/parameters/ApiVersion" } ], - "x-ms-long-running-operation": true, "x-ms-examples": { - "Create or update a Media Graph": { - "$ref": "examples/media-graph-create.json" + "Create or update a Media Graph with a clear RTSP Source": { + "$ref": "examples/media-graph-create-clear-source.json" + }, + "Create or update a Media Graph with an encrypted RTSP Source": { + "$ref": "examples/media-graph-create-encrypted-source.json" } } }, @@ -776,6 +763,60 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationsStatus/{operationId}": { + "get": { + "summary": "Get the operation status", + "description": "Get the operation status of a Media Graph in the media services account.", + "operationId": "OperationsStatus_Get", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MediaGraphOperationStatus" + } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/MediaServicesAccountName" + }, + { + "name": "mediaGraphName", + "in": "path", + "required": true, + "type": "string", + "description": "The Media Graph name." + }, + { + "name": "operationId", + "in": "path", + "required": true, + "type": "string", + "description": "The operation ID." + }, + { + "$ref": "#/parameters/ApiVersion" + } + ], + "x-ms-examples": { + "Get the operation status.": { + "$ref": "examples/operation-status-get.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationResults/{operationId}": { "get": { "summary": "Get the operation result", @@ -783,10 +824,16 @@ "operationId": "OperationResults_Get", "responses": { "202": { - "description": "Accepted" + "description": "Accepted", + "schema": { + "$ref": "#/definitions/MediaGraphOperationResult" + } }, "204": { - "description": "NoContent" + "description": "NoContent", + "schema": { + "$ref": "#/definitions/MediaGraphOperationResult" + } }, "default": { "description": "Detailed error information.", @@ -863,4 +910,4 @@ "description": "The Version of the API to be used with the client request." } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json new file mode 100644 index 000000000000..e0b92893a9cc --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -0,0 +1,74 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "api-version": "2020-02-01-preview", + "parameters": { + "properties": { + "description": "updated description", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "rtspSource", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink", + "inputs": [ + "rtspSource" + ], + "assetName": "SampleAsset" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "SampleMediaGraph", + "properties": { + "description": "", + "state": "Stopped", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource1", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1" + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink1", + "inputs": [ + "RTSPSource1" + ], + "assetName": "SampleAsset1" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json new file mode 100644 index 000000000000..ec33016b1a5d --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -0,0 +1,94 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "api-version": "2020-02-01-preview", + "parameters": { + "properties": { + "description": "updated description", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "rtspSource", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphTlsEndpoint", + "url": "rtsps://contoso.com:443/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + }, + "trustedCertificates": { + "@odata.type": "#Microsoft.Media.MediaGraphPemCertificateList", + "certificates": [ + "-----BEGIN CERTIFICATE-----\nMIIDhTCCAm2gAwIBAgIUajvPKmoO+8qaO89/ZGATl7ZYnTswDQYJKoZIhvcNAQEL\nBQAwUTESMBAGA1UECgwJTWljcm9zb2Z0MRQwEgYDVQQLDAtBenVyZSBNZWRpYTEl\nMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBDZXJ0aWZpY2F0ZTAgFw0yMDAyMDYy\nMTI5MTlaGA8zMDE5MDYwOTIxMjkxOVowUTESMBAGA1UECgwJTWljcm9zb2Z0MRQw\nEgYDVQQLDAtBenVyZSBNZWRpYTElMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBD\nZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2lg5ff\n7xXPaBZXHl/zrTukdiBtu7BNIOchHba51eloruPRzpvQx7Pedk3CVTut7LYinijf\nuol0EwkQ2FLt2i2jOqiva9nXR95ujIZHcKsEeMC4RSNSP4++k6SpP8FgyYVdv5ru\nf8GC+HyYQ4j0TqpR/cJs53l/LGRSldaFZ6fcDde1jeyca4VivAbAH1/WDIOvmjzo\n9XIGxZ10VSS5l5+DIgdkJZ+mDMLJIuVZ0YVF16ZGEB3beq1trk5lItvmSjQLTllH\nqMFm9UGY8jKZSo/BY8ewHEtnGSAFQK0TVuRx1HhUWwu6C9jk+2zmRS2090BNpQWa\nJMKFJrSPzFDPRX8CAwEAAaNTMFEwHQYDVR0OBBYEFIumbhu0lYk0EFDThEg0yyIn\n/wZZMB8GA1UdIwQYMBaAFIumbhu0lYk0EFDThEg0yyIn/wZZMA8GA1UdEwEB/wQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADUNw+/NGNVtigq9tMJKqlk39MTpDn1s\nZ1BVIAuAWSQjlevYZJeDIPUiWNWFhRe+xN7oOLnn2+NIXEKKeMSyuPoZYbN0mBkB\n99oS3XVipSANpmDvIepNdCrOnjfqDFIifRF1Dqjtb6i1hb6v/qYKVPLQvcrgGur7\nPKKkAu9p4YRZ3RBdwwaUuMgojrj/l6DGbeJY6IRVnVMY39rryMnZjA5xUlhCu55n\noB3t/jsJLwnQN+JbAjLAeuqgOWtgARsEFzvpt+VvDsaj0YLOJPhyJwTvHgaa/slB\nnECzd3TuyFKYeGssSni/QQ1e7yZcLapQqz66g5otdriw0IRdOfDxm5M=\n-----END CERTIFICATE-----" + ] + }, + "validationOptions": { + "ignoreHostname": true, + "ignoreSignature": false + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink", + "inputs": [ + "rtspSource" + ], + "assetName": "SampleAsset" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "SampleMediaGraph", + "properties": { + "description": "", + "state": "Stopped", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource1", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphTlsEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "trustedCertificates": { + "@odata.type": "#Microsoft.Media.MediaGraphPemCertificateList", + "certificates": [ + "-----BEGIN CERTIFICATE-----\nMIIDhTCCAm2gAwIBAgIUajvPKmoO+8qaO89/ZGATl7ZYnTswDQYJKoZIhvcNAQEL\nBQAwUTESMBAGA1UECgwJTWljcm9zb2Z0MRQwEgYDVQQLDAtBenVyZSBNZWRpYTEl\nMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBDZXJ0aWZpY2F0ZTAgFw0yMDAyMDYy\nMTI5MTlaGA8zMDE5MDYwOTIxMjkxOVowUTESMBAGA1UECgwJTWljcm9zb2Z0MRQw\nEgYDVQQLDAtBenVyZSBNZWRpYTElMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBD\nZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2lg5ff\n7xXPaBZXHl/zrTukdiBtu7BNIOchHba51eloruPRzpvQx7Pedk3CVTut7LYinijf\nuol0EwkQ2FLt2i2jOqiva9nXR95ujIZHcKsEeMC4RSNSP4++k6SpP8FgyYVdv5ru\nf8GC+HyYQ4j0TqpR/cJs53l/LGRSldaFZ6fcDde1jeyca4VivAbAH1/WDIOvmjzo\n9XIGxZ10VSS5l5+DIgdkJZ+mDMLJIuVZ0YVF16ZGEB3beq1trk5lItvmSjQLTllH\nqMFm9UGY8jKZSo/BY8ewHEtnGSAFQK0TVuRx1HhUWwu6C9jk+2zmRS2090BNpQWa\nJMKFJrSPzFDPRX8CAwEAAaNTMFEwHQYDVR0OBBYEFIumbhu0lYk0EFDThEg0yyIn\n/wZZMB8GA1UdIwQYMBaAFIumbhu0lYk0EFDThEg0yyIn/wZZMA8GA1UdEwEB/wQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADUNw+/NGNVtigq9tMJKqlk39MTpDn1s\nZ1BVIAuAWSQjlevYZJeDIPUiWNWFhRe+xN7oOLnn2+NIXEKKeMSyuPoZYbN0mBkB\n99oS3XVipSANpmDvIepNdCrOnjfqDFIifRF1Dqjtb6i1hb6v/qYKVPLQvcrgGur7\nPKKkAu9p4YRZ3RBdwwaUuMgojrj/l6DGbeJY6IRVnVMY39rryMnZjA5xUlhCu55n\noB3t/jsJLwnQN+JbAjLAeuqgOWtgARsEFzvpt+VvDsaj0YLOJPhyJwTvHgaa/slB\nnECzd3TuyFKYeGssSni/QQ1e7yZcLapQqz66g5otdriw0IRdOfDxm5M=\n-----END CERTIFICATE-----" + ] + }, + "validationOptions": { + "ignoreHostname": true, + "ignoreSignature": false + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink1", + "inputs": [ + "RTSPSource1" + ], + "assetName": "SampleAsset1" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json deleted file mode 100644 index 4e18835e5ada..000000000000 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "contoso", - "accountName": "contosomedia", - "mediaGraphName": "SampleMediaGraph1", - "api-version": "2020-02-01-preview", - "parameters": { - "properties": { - "description": "updated description", - "sources": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "rtspSource", - "transport": "http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphEndpoint", - "url": "rtsp://contoso.com:554/stream1", - "credentials": { - "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", - "username": "exampleusername", - "password": "examplepassword" - } - } - } - ], - "sinks": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink", - "inputs": [ - "rtspSource" - ], - "assetName": "SampleAsset" - } - ] - } - } - }, - "responses": { - "200": { - "body": { - "name": "SampleMediaGraph", - "properties": { - "description": "", - "state": "Stopped", - "provisioningState": "Succeeded", - "provisioningComment": "", - "created": "2020-01-29T22:46:17.3044334Z", - "lastModified": "2020-01-29T22:46:17.3044334Z", - "sources": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "RTSPSource0", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphEndpoint", - "url": "rtsp://contoso.com:554/stream1", - "credentials": { - "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", - "username": "exampleusername", - "password": "examplepassword" - } - } - } - ], - "sinks": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink0", - "inputs": [ - "RTSPSource0" - ], - "assetName": "Sample Asset0" - } - ] - } - } - }, - "201": { - "body": { - "name": "SampleMediaGraph1", - "properties": { - "description": "", - "state": "Creating", - "provisioningState": "Creating", - "provisioningComment": "", - "created": "2020-01-29T22:46:28.4921266Z", - "lastModified": "2020-01-29T22:46:28.4921266Z", - "sources": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "RTSPSource0", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphEndpoint", - "url": "rtsp://contoso.com:554/stream1", - "credentials": { - "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", - "username": "exampleusername", - "password": "examplepassword" - } - } - } - ], - "sinks": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink0", - "inputs": [ - "RTSPSource0" - ], - "assetName": "Sample Asset0" - } - ] - } - } - } - } -} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json index c50e305c2915..506a2faa04e6 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json @@ -14,15 +14,13 @@ "properties": { "description": "", "state": "Stopped", - "provisioningState": "Succeeded", - "provisioningComment": "", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource1", - "transport": "http", + "transport": "Http", "endpoint": { "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", "url": "rtsp://contoso.com:554/stream1" @@ -36,11 +34,11 @@ "inputs": [ "RTSPSource1" ], - "assetName": "Sample Asset1" + "assetName": "SampleAsset1" } ] } } } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json index 517c988e2b6b..8d5770177717 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json @@ -14,15 +14,13 @@ "properties": { "description": "", "state": "Stopped", - "provisioningState": "Succeeded", - "provisioningComment": "", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource0", - "transport": "http", + "transport": "Http", "endpoint": { "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", "url": "rtsp://contoso.com:554/stream0" @@ -36,7 +34,7 @@ "inputs": [ "RTSPSource0" ], - "assetName": "Sample Asset0" + "assetName": "SampleAsset0" } ] } @@ -46,15 +44,13 @@ "properties": { "description": "", "state": "Starting", - "provisioningState": "Succeeded", - "provisioningComment": "", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource1", - "transport": "http", + "transport": "Http", "endpoint": { "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", "url": "rtsp://contoso.com:554/stream1" @@ -68,7 +64,7 @@ "inputs": [ "RTSPSource1" ], - "assetName": "Sample Asset1" + "assetName": "SampleAsset1" } ] } @@ -78,15 +74,13 @@ "properties": { "description": "", "state": "Running", - "provisioningState": "Succeeded", - "provisioningComment": "", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource2", - "transport": "http", + "transport": "Http", "endpoint": { "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", "url": "rtsp://contoso.com:554/stream2" @@ -100,7 +94,7 @@ "inputs": [ "RTSPSource2" ], - "assetName": "Sample Asset2" + "assetName": "SampleAsset2" } ] } @@ -109,4 +103,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json new file mode 100644 index 000000000000..ab5e2da8f7a7 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "operationId": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", + "api-version": "2020-02-01-preview" + }, + "responses": { + "200": { + "body": { + "name": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", + "status": "Succeeded" + } + } + } +} \ No newline at end of file From 6bf3a735ca31f072a4a329f2fc156a9e1914fb1e Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 12:10:13 -0800 Subject: [PATCH 07/47] Adding old version --- .../preview/2020-02-01-preview/Common.json | 80 ++++++ .../2020-02-01-preview/MediaGraphs.json | 270 ++++-------------- .../media-graph-create-encrypted-source.json | 94 ------ ...ar-source.json => media-graph-create.json} | 33 +-- .../examples/media-graph-delete.json | 2 +- .../examples/media-graph-get-by-name.json | 12 +- .../examples/media-graph-list-all.json | 32 +-- .../examples/media-graph-start.json | 2 +- .../examples/media-graph-stop.json | 2 +- .../examples/operation-result-get.json | 7 +- .../examples/operation-status-get.json | 4 +- 11 files changed, 172 insertions(+), 366 deletions(-) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json delete mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json rename specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/{media-graph-create-clear-source.json => media-graph-create.json} (60%) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json new file mode 100644 index 000000000000..8ffd3bd1f71a --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -0,0 +1,80 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Media Services", + "version": "2018-07-01" + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "Impersonate your user account" + } + } + }, + "paths": {}, + "definitions": { + "Resource": { + "description": "The core properties of ARM resources.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource ID for the resource." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource." + } + }, + "x-ms-azure-resource": true + }, + "TrackedResource": { + "description": "The resource model definition for a ARM tracked resource.", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The Azure Region of the resource." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProxyResource": { + "description": "The resource model definition for a ARM proxy resource.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + } + } +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 38998524b627..d7aec84e0549 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -6,7 +6,7 @@ "info": { "title": "Azure Media Services", "description": "This Swagger was generated by the API Framework.", - "version": "2020-02-01-preview" + "version": "2019-09-01-preview" }, "host": "management.azure.com", "consumes": [ @@ -31,7 +31,7 @@ "properties": { "description": { "type": "string", - "description": "Media Graph description." + "description": "Media Graph description" }, "state": { "type": "string", @@ -46,38 +46,38 @@ "values": [ { "value": "Running", - "description": "Media Graph is Running." + "description": "Media Graph is Running" }, { "value": "Starting", - "description": "Media Graph is Starting." + "description": "Media Graph is Starting" }, { "value": "Stopped", - "description": "Media Graph has Stopped." + "description": "Media Graph has Stopped" }, { "value": "Stopping", - "description": "Media Graph is Stopping." + "description": "Media Graph is Stopping" } ], "modelAsString": true }, - "description": "Media Graph state which indicates the resource allocation status for running the media graph pipeline.", + "description": "Media Graph state", "readOnly": true, "x-nullable": false }, "created": { "type": "string", "format": "date-time", - "description": "Date the Media Graph was created.", + "description": "Date the Media Graph was created", "readOnly": true, "x-nullable": false }, "lastModified": { "type": "string", "format": "date-time", - "description": "Date the Media Graph was last modified.", + "description": "Date the Media Graph was last modified", "readOnly": true, "x-nullable": false }, @@ -86,14 +86,14 @@ "items": { "$ref": "#/definitions/MediaGraphSource" }, - "description": "Media Graph sources." + "description": "Media Graph sources" }, "sinks": { "type": "array", "items": { "$ref": "#/definitions/MediaGraphSink" }, - "description": "Media Graph sinks." + "description": "Media Graph sinks" } }, "type": "object", @@ -101,7 +101,7 @@ "sources", "sinks" ], - "description": "Class for Media Graph properties." + "description": "Class for Media Graph properties" }, "MediaGraphSource": { "discriminator": "@odata.type", @@ -112,7 +112,7 @@ }, "name": { "type": "string", - "description": "Source name." + "description": "Source name" } }, "type": "object", @@ -120,7 +120,7 @@ "@odata.type", "name" ], - "description": "Media source." + "description": "Media source" }, "MediaGraphSink": { "discriminator": "@odata.type", @@ -131,14 +131,14 @@ }, "name": { "type": "string", - "description": "Sink name." + "description": "Sink name" }, "inputs": { "type": "array", "items": { "type": "string" }, - "description": "Sink inputs." + "description": "Sink inputs" } }, "type": "object", @@ -147,7 +147,7 @@ "name", "inputs" ], - "description": "Media Sink." + "description": "Media Sink" }, "MediaGraphRtspSource": { "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphRtspSource", @@ -157,111 +157,30 @@ } ], "properties": { - "transport": { + "rtspUrl": { "type": "string", - "enum": [ - "Http", - "Tcp" - ], - "x-ms-enum": { - "name": "MediaGraphRtspTransport", - "values": [ - { - "value": "Http", - "description": "HTTP/HTTPS transport. This should be used when HTTP tunneling is desired." - }, - { - "value": "Tcp", - "description": "TCP transport. This should be used when HTTP tunneling is not desired." - } - ], - "modelAsString": true - }, - "description": "Underlying RTSP transport. This can be used to enable or disable HTTP tunneling." - }, - "endpoint": { - "$ref": "#/definitions/MediaGraphEndpoint", - "description": "RTSP endpoint of the stream being connected to." - } - }, - "type": "object", - "required": [ - "transport", - "endpoint" - ], - "description": "RTSP source." - }, - "MediaGraphEndpoint": { - "discriminator": "@odata.type", - "properties": { - "@odata.type": { - "type": "string", - "description": "The discriminator for derived types." + "description": "RTSP URL" }, "credentials": { - "$ref": "#/definitions/MediaGraphCredentials", - "description": "Polymorphic credentials to present to the endpoint." - }, - "url": { - "type": "string", - "description": "Url for the endpoint." - } - }, - "type": "object", - "required": [ - "@odata.type", - "url" - ], - "description": "Base class for endpoints." - }, - "MediaGraphAssetSink": { - "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphAssetSink", - "allOf": [ - { - "$ref": "#/definitions/MediaGraphSink" - } - ], - "properties": { - "assetName": { - "type": "string", - "description": "Asset name." + "$ref": "#/definitions/MediaGraphUserCredentials", + "description": "RTSP Credentials" } }, "type": "object", "required": [ - "assetName" - ], - "description": "Asset sink." - }, - "MediaGraphCredentials": { - "discriminator": "@odata.type", - "properties": { - "@odata.type": { - "type": "string", - "description": "The discriminator for derived types." - } - }, - "type": "object", - "required": [ - "@odata.type" + "rtspUrl" ], - "description": "Credentials to present during authentication." + "description": "RTSP source" }, - "MediaGraphUsernamePasswordCredentials": { - "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", - "allOf": [ - { - "$ref": "#/definitions/MediaGraphCredentials" - } - ], + "MediaGraphUserCredentials": { "properties": { "username": { "type": "string", - "description": "Username for a username/password pair." + "description": "User name" }, "password": { "type": "string", - "description": "Password for a username/password pair." + "description": "Password credential" } }, "type": "object", @@ -269,92 +188,26 @@ "username", "password" ], - "description": "Username/password credential pair." - }, - "MediaGraphClearEndpoint": { - "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphClearEndpoint", - "allOf": [ - { - "$ref": "#/definitions/MediaGraphEndpoint" - } - ], - "properties": {}, - "type": "object", - "description": "An endpoint to connect to with no encryption in transit." + "description": "Credentials to authenticate to Media Graph sources" }, - "MediaGraphTlsEndpoint": { - "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphTlsEndpoint", + "MediaGraphAssetSink": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphAssetSink", "allOf": [ { - "$ref": "#/definitions/MediaGraphEndpoint" + "$ref": "#/definitions/MediaGraphSink" } ], "properties": { - "trustedCertificates": { - "$ref": "#/definitions/MediaGraphCertificateSource", - "description": "What certificates should be trusted when authenticating a TLS connection. Null designates that Azure Media's source of trust should be used." - }, - "validationOptions": { - "$ref": "#/definitions/MediaGraphTlsValidationOptions", - "description": "Validation options to use when authenticating a TLS connection. By default, strict validation is used." - } - }, - "type": "object", - "description": "An endpoint which must be connected over TLS/SSL." - }, - "MediaGraphCertificateSource": { - "discriminator": "@odata.type", - "properties": { - "@odata.type": { + "assetName": { "type": "string", - "description": "The discriminator for derived types." - } - }, - "type": "object", - "required": [ - "@odata.type" - ], - "description": "Base class for certificate sources." - }, - "MediaGraphTlsValidationOptions": { - "properties": { - "ignoreHostname": { - "type": "boolean", - "description": "Ignore the host name (common name) during validation." - }, - "ignoreSignature": { - "type": "boolean", - "description": "Ignore the integrity of the certificate chain at the current time." - } - }, - "type": "object", - "required": [ - "ignoreHostname", - "ignoreSignature" - ], - "description": "Options for controlling the authentication of TLS endpoints." - }, - "MediaGraphPemCertificateList": { - "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphPemCertificateList", - "allOf": [ - { - "$ref": "#/definitions/MediaGraphCertificateSource" - } - ], - "properties": { - "certificates": { - "type": "array", - "items": { - "type": "string" - }, - "description": "PEM formatted public certificates, one per entry." + "description": "Asset name" } }, "type": "object", "required": [ - "certificates" + "assetName" ], - "description": "A list of PEM formatted certificates." + "description": "Asset sink" }, "MediaGraph": { "allOf": [ @@ -375,41 +228,41 @@ "properties": { "code": { "type": "string", - "description": "The operation error code." + "description": "The operation error code" }, "message": { "type": "string", - "description": "The operation error message." + "description": "The operation error message" } }, "type": "object", - "description": "The operation error." + "description": "The operation error" }, "MediaGraphOperationStatus": { "properties": { "name": { "type": "string", - "description": "The name of the Media Graph operation." + "description": "The name of the Media Graph operation" }, "status": { "type": "string", - "description": "The status of the Media Graph operation." + "description": "The status of the Media Graph operation" }, "error": { "$ref": "#/definitions/MediaGraphOperationError", - "description": "The error details for the Media Graph operation." + "description": "The error for the Media Graph operation" } }, "type": "object", "required": [ "name" ], - "description": "The status of the Media Graph operation." + "description": "The status of the Media Graph operation" }, "MediaGraphOperationResult": { "properties": {}, "type": "object", - "description": "The result of the Media Graph operation." + "description": "The result of the Media Graph operation" }, "ODataError": { "properties": { @@ -468,7 +321,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs": { "get": { "summary": "List Media Graphs", - "description": "Lists Media Graphs in the Media Services account.", + "description": "Lists Media Graphs in the Media Services account", "operationId": "MediaGraphs_List", "responses": { "200": { @@ -518,7 +371,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}": { "get": { "summary": "Get a Media Graph", - "description": "Get the details of a Media Graph in the Media Services account.", + "description": "Get the details of a Media Graph in the Media Services account", "operationId": "MediaGraphs_Get", "responses": { "200": { @@ -566,7 +419,7 @@ }, "put": { "summary": "Create or update a Media Graph", - "description": "Create or update a Media Graph in the Media Services account.", + "description": "Create or update a Media Graph in the Media Services account", "operationId": "MediaGraphs_CreateOrUpdate", "responses": { "200": { @@ -613,17 +466,14 @@ } ], "x-ms-examples": { - "Create or update a Media Graph with a clear RTSP Source": { - "$ref": "examples/media-graph-create-clear-source.json" - }, - "Create or update a Media Graph with an encrypted RTSP Source": { - "$ref": "examples/media-graph-create-encrypted-source.json" + "Create or update a Media Graph": { + "$ref": "examples/media-graph-create.json" } } }, "delete": { "summary": "Delete a Media Graph", - "description": "Deletes a Media Graph in the Media Services account.", + "description": "Deletes a Media Graph in the Media Services account", "operationId": "MediaGraphs_Delete", "responses": { "200": { @@ -670,7 +520,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/start": { "post": { "summary": "Start a Media Graph", - "description": "Start a Media Graph in the Media Services account.", + "description": "Start a Media Graph in the Media Services account", "operationId": "MediaGraphs_Start", "responses": { "200": { @@ -718,7 +568,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/stop": { "post": { "summary": "Stop a Media Graph", - "description": "Stop a Media Graph in the Media Services account.", + "description": "Stop a Media Graph in the Media Services account", "operationId": "MediaGraphs_Stop", "responses": { "200": { @@ -766,7 +616,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationsStatus/{operationId}": { "get": { "summary": "Get the operation status", - "description": "Get the operation status of a Media Graph in the media services account.", + "description": "Get the operation status of a Media Graph in the media services account", "operationId": "OperationsStatus_Get", "responses": { "200": { @@ -804,14 +654,14 @@ "in": "path", "required": true, "type": "string", - "description": "The operation ID." + "description": "The operation ID" }, { "$ref": "#/parameters/ApiVersion" } ], "x-ms-examples": { - "Get the operation status.": { + "Get the operation status": { "$ref": "examples/operation-status-get.json" } } @@ -820,17 +670,11 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationResults/{operationId}": { "get": { "summary": "Get the operation result", - "description": "Get the operation result of a Media Graph in the Media Services account.", + "description": "Get the operation result of a Media Graph in the Media Services account", "operationId": "OperationResults_Get", "responses": { - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/MediaGraphOperationResult" - } - }, - "204": { - "description": "NoContent", + "200": { + "description": "OK", "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } @@ -910,4 +754,4 @@ "description": "The Version of the API to be used with the client request." } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json deleted file mode 100644 index ec33016b1a5d..000000000000 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "contoso", - "accountName": "contosomedia", - "mediaGraphName": "SampleMediaGraph", - "api-version": "2020-02-01-preview", - "parameters": { - "properties": { - "description": "updated description", - "sources": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "rtspSource", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphTlsEndpoint", - "url": "rtsps://contoso.com:443/stream1", - "credentials": { - "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", - "username": "exampleusername", - "password": "examplepassword" - }, - "trustedCertificates": { - "@odata.type": "#Microsoft.Media.MediaGraphPemCertificateList", - "certificates": [ - "-----BEGIN CERTIFICATE-----\nMIIDhTCCAm2gAwIBAgIUajvPKmoO+8qaO89/ZGATl7ZYnTswDQYJKoZIhvcNAQEL\nBQAwUTESMBAGA1UECgwJTWljcm9zb2Z0MRQwEgYDVQQLDAtBenVyZSBNZWRpYTEl\nMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBDZXJ0aWZpY2F0ZTAgFw0yMDAyMDYy\nMTI5MTlaGA8zMDE5MDYwOTIxMjkxOVowUTESMBAGA1UECgwJTWljcm9zb2Z0MRQw\nEgYDVQQLDAtBenVyZSBNZWRpYTElMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBD\nZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2lg5ff\n7xXPaBZXHl/zrTukdiBtu7BNIOchHba51eloruPRzpvQx7Pedk3CVTut7LYinijf\nuol0EwkQ2FLt2i2jOqiva9nXR95ujIZHcKsEeMC4RSNSP4++k6SpP8FgyYVdv5ru\nf8GC+HyYQ4j0TqpR/cJs53l/LGRSldaFZ6fcDde1jeyca4VivAbAH1/WDIOvmjzo\n9XIGxZ10VSS5l5+DIgdkJZ+mDMLJIuVZ0YVF16ZGEB3beq1trk5lItvmSjQLTllH\nqMFm9UGY8jKZSo/BY8ewHEtnGSAFQK0TVuRx1HhUWwu6C9jk+2zmRS2090BNpQWa\nJMKFJrSPzFDPRX8CAwEAAaNTMFEwHQYDVR0OBBYEFIumbhu0lYk0EFDThEg0yyIn\n/wZZMB8GA1UdIwQYMBaAFIumbhu0lYk0EFDThEg0yyIn/wZZMA8GA1UdEwEB/wQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADUNw+/NGNVtigq9tMJKqlk39MTpDn1s\nZ1BVIAuAWSQjlevYZJeDIPUiWNWFhRe+xN7oOLnn2+NIXEKKeMSyuPoZYbN0mBkB\n99oS3XVipSANpmDvIepNdCrOnjfqDFIifRF1Dqjtb6i1hb6v/qYKVPLQvcrgGur7\nPKKkAu9p4YRZ3RBdwwaUuMgojrj/l6DGbeJY6IRVnVMY39rryMnZjA5xUlhCu55n\noB3t/jsJLwnQN+JbAjLAeuqgOWtgARsEFzvpt+VvDsaj0YLOJPhyJwTvHgaa/slB\nnECzd3TuyFKYeGssSni/QQ1e7yZcLapQqz66g5otdriw0IRdOfDxm5M=\n-----END CERTIFICATE-----" - ] - }, - "validationOptions": { - "ignoreHostname": true, - "ignoreSignature": false - } - } - } - ], - "sinks": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink", - "inputs": [ - "rtspSource" - ], - "assetName": "SampleAsset" - } - ] - } - } - }, - "responses": { - "200": { - "body": { - "name": "SampleMediaGraph", - "properties": { - "description": "", - "state": "Stopped", - "created": "2019-09-01T00:00:00Z", - "lastModified": "2019-09-01T00:00:00Z", - "sources": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "RTSPSource1", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphTlsEndpoint", - "url": "rtsp://contoso.com:554/stream1", - "trustedCertificates": { - "@odata.type": "#Microsoft.Media.MediaGraphPemCertificateList", - "certificates": [ - "-----BEGIN CERTIFICATE-----\nMIIDhTCCAm2gAwIBAgIUajvPKmoO+8qaO89/ZGATl7ZYnTswDQYJKoZIhvcNAQEL\nBQAwUTESMBAGA1UECgwJTWljcm9zb2Z0MRQwEgYDVQQLDAtBenVyZSBNZWRpYTEl\nMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBDZXJ0aWZpY2F0ZTAgFw0yMDAyMDYy\nMTI5MTlaGA8zMDE5MDYwOTIxMjkxOVowUTESMBAGA1UECgwJTWljcm9zb2Z0MRQw\nEgYDVQQLDAtBenVyZSBNZWRpYTElMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBD\nZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2lg5ff\n7xXPaBZXHl/zrTukdiBtu7BNIOchHba51eloruPRzpvQx7Pedk3CVTut7LYinijf\nuol0EwkQ2FLt2i2jOqiva9nXR95ujIZHcKsEeMC4RSNSP4++k6SpP8FgyYVdv5ru\nf8GC+HyYQ4j0TqpR/cJs53l/LGRSldaFZ6fcDde1jeyca4VivAbAH1/WDIOvmjzo\n9XIGxZ10VSS5l5+DIgdkJZ+mDMLJIuVZ0YVF16ZGEB3beq1trk5lItvmSjQLTllH\nqMFm9UGY8jKZSo/BY8ewHEtnGSAFQK0TVuRx1HhUWwu6C9jk+2zmRS2090BNpQWa\nJMKFJrSPzFDPRX8CAwEAAaNTMFEwHQYDVR0OBBYEFIumbhu0lYk0EFDThEg0yyIn\n/wZZMB8GA1UdIwQYMBaAFIumbhu0lYk0EFDThEg0yyIn/wZZMA8GA1UdEwEB/wQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADUNw+/NGNVtigq9tMJKqlk39MTpDn1s\nZ1BVIAuAWSQjlevYZJeDIPUiWNWFhRe+xN7oOLnn2+NIXEKKeMSyuPoZYbN0mBkB\n99oS3XVipSANpmDvIepNdCrOnjfqDFIifRF1Dqjtb6i1hb6v/qYKVPLQvcrgGur7\nPKKkAu9p4YRZ3RBdwwaUuMgojrj/l6DGbeJY6IRVnVMY39rryMnZjA5xUlhCu55n\noB3t/jsJLwnQN+JbAjLAeuqgOWtgARsEFzvpt+VvDsaj0YLOJPhyJwTvHgaa/slB\nnECzd3TuyFKYeGssSni/QQ1e7yZcLapQqz66g5otdriw0IRdOfDxm5M=\n-----END CERTIFICATE-----" - ] - }, - "validationOptions": { - "ignoreHostname": true, - "ignoreSignature": false - } - } - } - ], - "sinks": [ - { - "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink1", - "inputs": [ - "RTSPSource1" - ], - "assetName": "SampleAsset1" - } - ] - } - } - } - } -} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json similarity index 60% rename from specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json rename to specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json index e0b92893a9cc..a09d494e78fe 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2020-02-01-preview", + "api-version": "2019-09-01-preview", "parameters": { "properties": { "description": "updated description", @@ -12,15 +12,10 @@ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "rtspSource", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", - "url": "rtsp://contoso.com:554/stream1", - "credentials": { - "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", - "username": "exampleusername", - "password": "examplepassword" - } + "rtspUrl": "rtsp://contoso.com:554/stream1", + "credentials": { + "username": "exampleusername", + "password": "examplepassword" } } ], @@ -42,33 +37,29 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "", + "description": "updated description", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "RTSPSource1", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", - "url": "rtsp://contoso.com:554/stream1" - } + "name": "rtspSource", + "rtspUrl": "rtsp://contoso.com:554/stream1" } ], "sinks": [ { "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink1", + "name": "AssetSink", "inputs": [ - "RTSPSource1" + "rtspSource" ], - "assetName": "SampleAsset1" + "assetName": "SampleAsset" } ] } } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json index e77c43b37dbf..eeff17d1df88 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { "204": {}, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json index 506a2faa04e6..a81936804954 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph1", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { "404": {}, @@ -20,11 +20,7 @@ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource1", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", - "url": "rtsp://contoso.com:554/stream1" - } + "rtspUrl": "rtsp://contoso.com:554/stream1" } ], "sinks": [ @@ -34,11 +30,11 @@ "inputs": [ "RTSPSource1" ], - "assetName": "SampleAsset1" + "assetName": "Sample Asset1" } ] } } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json index 8d5770177717..83101b2006a3 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "contoso", "accountName": "contosomedia", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { "200": { @@ -20,11 +20,7 @@ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource0", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", - "url": "rtsp://contoso.com:554/stream0" - } + "rtspUrl": "rtsp://contoso.com:554/stream0" } ], "sinks": [ @@ -34,7 +30,7 @@ "inputs": [ "RTSPSource0" ], - "assetName": "SampleAsset0" + "assetName": "Sample Asset0" } ] } @@ -43,18 +39,14 @@ "name": "SampleMediaGraph1", "properties": { "description": "", - "state": "Starting", + "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource1", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", - "url": "rtsp://contoso.com:554/stream1" - } + "rtspUrl": "rtsp://contoso.com:554/stream1" } ], "sinks": [ @@ -64,7 +56,7 @@ "inputs": [ "RTSPSource1" ], - "assetName": "SampleAsset1" + "assetName": "Sample Asset1" } ] } @@ -73,18 +65,14 @@ "name": "SampleMediaGraph2", "properties": { "description": "", - "state": "Running", + "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource2", - "transport": "Http", - "endpoint": { - "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", - "url": "rtsp://contoso.com:554/stream2" - } + "rtspUrl": "rtsp://contoso.com:554/stream2" } ], "sinks": [ @@ -94,7 +82,7 @@ "inputs": [ "RTSPSource2" ], - "assetName": "SampleAsset2" + "assetName": "Sample Asset2" } ] } @@ -103,4 +91,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json index 0ac5e0014e43..1b2240840b6e 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { "202": {}, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json index 0ac5e0014e43..1b2240840b6e 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { "202": {}, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json index df34f31e1694..ce121a965c51 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json @@ -5,10 +5,11 @@ "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", "operationId": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { - "202": {}, - "204": {} + "200": { + "body": {} + } } } diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json index ab5e2da8f7a7..1e3ee9bda64d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json @@ -5,7 +5,7 @@ "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", "operationId": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", - "api-version": "2020-02-01-preview" + "api-version": "2019-09-01-preview" }, "responses": { "200": { @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} From c1cdf21aa622378f4d4699426a3f6ba7f7a99b05 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 12:10:31 -0800 Subject: [PATCH 08/47] Revert "Adding old version" This reverts commit 6bf3a735ca31f072a4a329f2fc156a9e1914fb1e. --- .../preview/2020-02-01-preview/Common.json | 80 ------ .../2020-02-01-preview/MediaGraphs.json | 270 ++++++++++++++---- ...n => media-graph-create-clear-source.json} | 33 ++- .../media-graph-create-encrypted-source.json | 94 ++++++ .../examples/media-graph-delete.json | 2 +- .../examples/media-graph-get-by-name.json | 12 +- .../examples/media-graph-list-all.json | 32 ++- .../examples/media-graph-start.json | 2 +- .../examples/media-graph-stop.json | 2 +- .../examples/operation-result-get.json | 7 +- .../examples/operation-status-get.json | 4 +- 11 files changed, 366 insertions(+), 172 deletions(-) delete mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json rename specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/{media-graph-create.json => media-graph-create-clear-source.json} (60%) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json deleted file mode 100644 index 8ffd3bd1f71a..000000000000 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Azure Media Services", - "version": "2018-07-01" - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "Impersonate your user account" - } - } - }, - "paths": {}, - "definitions": { - "Resource": { - "description": "The core properties of ARM resources.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource ID for the resource." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "The resource model definition for a ARM tracked resource.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The Azure Region of the resource." - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "The resource model definition for a ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - } - } -} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index d7aec84e0549..38998524b627 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -6,7 +6,7 @@ "info": { "title": "Azure Media Services", "description": "This Swagger was generated by the API Framework.", - "version": "2019-09-01-preview" + "version": "2020-02-01-preview" }, "host": "management.azure.com", "consumes": [ @@ -31,7 +31,7 @@ "properties": { "description": { "type": "string", - "description": "Media Graph description" + "description": "Media Graph description." }, "state": { "type": "string", @@ -46,38 +46,38 @@ "values": [ { "value": "Running", - "description": "Media Graph is Running" + "description": "Media Graph is Running." }, { "value": "Starting", - "description": "Media Graph is Starting" + "description": "Media Graph is Starting." }, { "value": "Stopped", - "description": "Media Graph has Stopped" + "description": "Media Graph has Stopped." }, { "value": "Stopping", - "description": "Media Graph is Stopping" + "description": "Media Graph is Stopping." } ], "modelAsString": true }, - "description": "Media Graph state", + "description": "Media Graph state which indicates the resource allocation status for running the media graph pipeline.", "readOnly": true, "x-nullable": false }, "created": { "type": "string", "format": "date-time", - "description": "Date the Media Graph was created", + "description": "Date the Media Graph was created.", "readOnly": true, "x-nullable": false }, "lastModified": { "type": "string", "format": "date-time", - "description": "Date the Media Graph was last modified", + "description": "Date the Media Graph was last modified.", "readOnly": true, "x-nullable": false }, @@ -86,14 +86,14 @@ "items": { "$ref": "#/definitions/MediaGraphSource" }, - "description": "Media Graph sources" + "description": "Media Graph sources." }, "sinks": { "type": "array", "items": { "$ref": "#/definitions/MediaGraphSink" }, - "description": "Media Graph sinks" + "description": "Media Graph sinks." } }, "type": "object", @@ -101,7 +101,7 @@ "sources", "sinks" ], - "description": "Class for Media Graph properties" + "description": "Class for Media Graph properties." }, "MediaGraphSource": { "discriminator": "@odata.type", @@ -112,7 +112,7 @@ }, "name": { "type": "string", - "description": "Source name" + "description": "Source name." } }, "type": "object", @@ -120,7 +120,7 @@ "@odata.type", "name" ], - "description": "Media source" + "description": "Media source." }, "MediaGraphSink": { "discriminator": "@odata.type", @@ -131,14 +131,14 @@ }, "name": { "type": "string", - "description": "Sink name" + "description": "Sink name." }, "inputs": { "type": "array", "items": { "type": "string" }, - "description": "Sink inputs" + "description": "Sink inputs." } }, "type": "object", @@ -147,7 +147,7 @@ "name", "inputs" ], - "description": "Media Sink" + "description": "Media Sink." }, "MediaGraphRtspSource": { "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphRtspSource", @@ -157,38 +157,62 @@ } ], "properties": { - "rtspUrl": { + "transport": { "type": "string", - "description": "RTSP URL" + "enum": [ + "Http", + "Tcp" + ], + "x-ms-enum": { + "name": "MediaGraphRtspTransport", + "values": [ + { + "value": "Http", + "description": "HTTP/HTTPS transport. This should be used when HTTP tunneling is desired." + }, + { + "value": "Tcp", + "description": "TCP transport. This should be used when HTTP tunneling is not desired." + } + ], + "modelAsString": true + }, + "description": "Underlying RTSP transport. This can be used to enable or disable HTTP tunneling." }, - "credentials": { - "$ref": "#/definitions/MediaGraphUserCredentials", - "description": "RTSP Credentials" + "endpoint": { + "$ref": "#/definitions/MediaGraphEndpoint", + "description": "RTSP endpoint of the stream being connected to." } }, "type": "object", "required": [ - "rtspUrl" + "transport", + "endpoint" ], - "description": "RTSP source" + "description": "RTSP source." }, - "MediaGraphUserCredentials": { + "MediaGraphEndpoint": { + "discriminator": "@odata.type", "properties": { - "username": { + "@odata.type": { "type": "string", - "description": "User name" + "description": "The discriminator for derived types." }, - "password": { + "credentials": { + "$ref": "#/definitions/MediaGraphCredentials", + "description": "Polymorphic credentials to present to the endpoint." + }, + "url": { "type": "string", - "description": "Password credential" + "description": "Url for the endpoint." } }, "type": "object", "required": [ - "username", - "password" + "@odata.type", + "url" ], - "description": "Credentials to authenticate to Media Graph sources" + "description": "Base class for endpoints." }, "MediaGraphAssetSink": { "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphAssetSink", @@ -200,14 +224,137 @@ "properties": { "assetName": { "type": "string", - "description": "Asset name" + "description": "Asset name." } }, "type": "object", "required": [ "assetName" ], - "description": "Asset sink" + "description": "Asset sink." + }, + "MediaGraphCredentials": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + } + }, + "type": "object", + "required": [ + "@odata.type" + ], + "description": "Credentials to present during authentication." + }, + "MediaGraphUsernamePasswordCredentials": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphCredentials" + } + ], + "properties": { + "username": { + "type": "string", + "description": "Username for a username/password pair." + }, + "password": { + "type": "string", + "description": "Password for a username/password pair." + } + }, + "type": "object", + "required": [ + "username", + "password" + ], + "description": "Username/password credential pair." + }, + "MediaGraphClearEndpoint": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphClearEndpoint", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphEndpoint" + } + ], + "properties": {}, + "type": "object", + "description": "An endpoint to connect to with no encryption in transit." + }, + "MediaGraphTlsEndpoint": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphTlsEndpoint", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphEndpoint" + } + ], + "properties": { + "trustedCertificates": { + "$ref": "#/definitions/MediaGraphCertificateSource", + "description": "What certificates should be trusted when authenticating a TLS connection. Null designates that Azure Media's source of trust should be used." + }, + "validationOptions": { + "$ref": "#/definitions/MediaGraphTlsValidationOptions", + "description": "Validation options to use when authenticating a TLS connection. By default, strict validation is used." + } + }, + "type": "object", + "description": "An endpoint which must be connected over TLS/SSL." + }, + "MediaGraphCertificateSource": { + "discriminator": "@odata.type", + "properties": { + "@odata.type": { + "type": "string", + "description": "The discriminator for derived types." + } + }, + "type": "object", + "required": [ + "@odata.type" + ], + "description": "Base class for certificate sources." + }, + "MediaGraphTlsValidationOptions": { + "properties": { + "ignoreHostname": { + "type": "boolean", + "description": "Ignore the host name (common name) during validation." + }, + "ignoreSignature": { + "type": "boolean", + "description": "Ignore the integrity of the certificate chain at the current time." + } + }, + "type": "object", + "required": [ + "ignoreHostname", + "ignoreSignature" + ], + "description": "Options for controlling the authentication of TLS endpoints." + }, + "MediaGraphPemCertificateList": { + "x-ms-discriminator-value": "#Microsoft.Media.MediaGraphPemCertificateList", + "allOf": [ + { + "$ref": "#/definitions/MediaGraphCertificateSource" + } + ], + "properties": { + "certificates": { + "type": "array", + "items": { + "type": "string" + }, + "description": "PEM formatted public certificates, one per entry." + } + }, + "type": "object", + "required": [ + "certificates" + ], + "description": "A list of PEM formatted certificates." }, "MediaGraph": { "allOf": [ @@ -228,41 +375,41 @@ "properties": { "code": { "type": "string", - "description": "The operation error code" + "description": "The operation error code." }, "message": { "type": "string", - "description": "The operation error message" + "description": "The operation error message." } }, "type": "object", - "description": "The operation error" + "description": "The operation error." }, "MediaGraphOperationStatus": { "properties": { "name": { "type": "string", - "description": "The name of the Media Graph operation" + "description": "The name of the Media Graph operation." }, "status": { "type": "string", - "description": "The status of the Media Graph operation" + "description": "The status of the Media Graph operation." }, "error": { "$ref": "#/definitions/MediaGraphOperationError", - "description": "The error for the Media Graph operation" + "description": "The error details for the Media Graph operation." } }, "type": "object", "required": [ "name" ], - "description": "The status of the Media Graph operation" + "description": "The status of the Media Graph operation." }, "MediaGraphOperationResult": { "properties": {}, "type": "object", - "description": "The result of the Media Graph operation" + "description": "The result of the Media Graph operation." }, "ODataError": { "properties": { @@ -321,7 +468,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs": { "get": { "summary": "List Media Graphs", - "description": "Lists Media Graphs in the Media Services account", + "description": "Lists Media Graphs in the Media Services account.", "operationId": "MediaGraphs_List", "responses": { "200": { @@ -371,7 +518,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}": { "get": { "summary": "Get a Media Graph", - "description": "Get the details of a Media Graph in the Media Services account", + "description": "Get the details of a Media Graph in the Media Services account.", "operationId": "MediaGraphs_Get", "responses": { "200": { @@ -419,7 +566,7 @@ }, "put": { "summary": "Create or update a Media Graph", - "description": "Create or update a Media Graph in the Media Services account", + "description": "Create or update a Media Graph in the Media Services account.", "operationId": "MediaGraphs_CreateOrUpdate", "responses": { "200": { @@ -466,14 +613,17 @@ } ], "x-ms-examples": { - "Create or update a Media Graph": { - "$ref": "examples/media-graph-create.json" + "Create or update a Media Graph with a clear RTSP Source": { + "$ref": "examples/media-graph-create-clear-source.json" + }, + "Create or update a Media Graph with an encrypted RTSP Source": { + "$ref": "examples/media-graph-create-encrypted-source.json" } } }, "delete": { "summary": "Delete a Media Graph", - "description": "Deletes a Media Graph in the Media Services account", + "description": "Deletes a Media Graph in the Media Services account.", "operationId": "MediaGraphs_Delete", "responses": { "200": { @@ -520,7 +670,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/start": { "post": { "summary": "Start a Media Graph", - "description": "Start a Media Graph in the Media Services account", + "description": "Start a Media Graph in the Media Services account.", "operationId": "MediaGraphs_Start", "responses": { "200": { @@ -568,7 +718,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/stop": { "post": { "summary": "Stop a Media Graph", - "description": "Stop a Media Graph in the Media Services account", + "description": "Stop a Media Graph in the Media Services account.", "operationId": "MediaGraphs_Stop", "responses": { "200": { @@ -616,7 +766,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationsStatus/{operationId}": { "get": { "summary": "Get the operation status", - "description": "Get the operation status of a Media Graph in the media services account", + "description": "Get the operation status of a Media Graph in the media services account.", "operationId": "OperationsStatus_Get", "responses": { "200": { @@ -654,14 +804,14 @@ "in": "path", "required": true, "type": "string", - "description": "The operation ID" + "description": "The operation ID." }, { "$ref": "#/parameters/ApiVersion" } ], "x-ms-examples": { - "Get the operation status": { + "Get the operation status.": { "$ref": "examples/operation-status-get.json" } } @@ -670,11 +820,17 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Media/mediaServices/{accountName}/mediaGraphs/{mediaGraphName}/operationResults/{operationId}": { "get": { "summary": "Get the operation result", - "description": "Get the operation result of a Media Graph in the Media Services account", + "description": "Get the operation result of a Media Graph in the Media Services account.", "operationId": "OperationResults_Get", "responses": { - "200": { - "description": "OK", + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/MediaGraphOperationResult" + } + }, + "204": { + "description": "NoContent", "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } @@ -754,4 +910,4 @@ "description": "The Version of the API to be used with the client request." } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json similarity index 60% rename from specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json rename to specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json index a09d494e78fe..e0b92893a9cc 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2019-09-01-preview", + "api-version": "2020-02-01-preview", "parameters": { "properties": { "description": "updated description", @@ -12,10 +12,15 @@ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "rtspSource", - "rtspUrl": "rtsp://contoso.com:554/stream1", - "credentials": { - "username": "exampleusername", - "password": "examplepassword" + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + } } } ], @@ -37,29 +42,33 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "updated description", + "description": "", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", - "name": "rtspSource", - "rtspUrl": "rtsp://contoso.com:554/stream1" + "name": "RTSPSource1", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1" + } } ], "sinks": [ { "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", - "name": "AssetSink", + "name": "AssetSink1", "inputs": [ - "rtspSource" + "RTSPSource1" ], - "assetName": "SampleAsset" + "assetName": "SampleAsset1" } ] } } } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json new file mode 100644 index 000000000000..ec33016b1a5d --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -0,0 +1,94 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contoso", + "accountName": "contosomedia", + "mediaGraphName": "SampleMediaGraph", + "api-version": "2020-02-01-preview", + "parameters": { + "properties": { + "description": "updated description", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "rtspSource", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphTlsEndpoint", + "url": "rtsps://contoso.com:443/stream1", + "credentials": { + "@odata.type": "#Microsoft.Media.MediaGraphUsernamePasswordCredentials", + "username": "exampleusername", + "password": "examplepassword" + }, + "trustedCertificates": { + "@odata.type": "#Microsoft.Media.MediaGraphPemCertificateList", + "certificates": [ + "-----BEGIN CERTIFICATE-----\nMIIDhTCCAm2gAwIBAgIUajvPKmoO+8qaO89/ZGATl7ZYnTswDQYJKoZIhvcNAQEL\nBQAwUTESMBAGA1UECgwJTWljcm9zb2Z0MRQwEgYDVQQLDAtBenVyZSBNZWRpYTEl\nMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBDZXJ0aWZpY2F0ZTAgFw0yMDAyMDYy\nMTI5MTlaGA8zMDE5MDYwOTIxMjkxOVowUTESMBAGA1UECgwJTWljcm9zb2Z0MRQw\nEgYDVQQLDAtBenVyZSBNZWRpYTElMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBD\nZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2lg5ff\n7xXPaBZXHl/zrTukdiBtu7BNIOchHba51eloruPRzpvQx7Pedk3CVTut7LYinijf\nuol0EwkQ2FLt2i2jOqiva9nXR95ujIZHcKsEeMC4RSNSP4++k6SpP8FgyYVdv5ru\nf8GC+HyYQ4j0TqpR/cJs53l/LGRSldaFZ6fcDde1jeyca4VivAbAH1/WDIOvmjzo\n9XIGxZ10VSS5l5+DIgdkJZ+mDMLJIuVZ0YVF16ZGEB3beq1trk5lItvmSjQLTllH\nqMFm9UGY8jKZSo/BY8ewHEtnGSAFQK0TVuRx1HhUWwu6C9jk+2zmRS2090BNpQWa\nJMKFJrSPzFDPRX8CAwEAAaNTMFEwHQYDVR0OBBYEFIumbhu0lYk0EFDThEg0yyIn\n/wZZMB8GA1UdIwQYMBaAFIumbhu0lYk0EFDThEg0yyIn/wZZMA8GA1UdEwEB/wQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADUNw+/NGNVtigq9tMJKqlk39MTpDn1s\nZ1BVIAuAWSQjlevYZJeDIPUiWNWFhRe+xN7oOLnn2+NIXEKKeMSyuPoZYbN0mBkB\n99oS3XVipSANpmDvIepNdCrOnjfqDFIifRF1Dqjtb6i1hb6v/qYKVPLQvcrgGur7\nPKKkAu9p4YRZ3RBdwwaUuMgojrj/l6DGbeJY6IRVnVMY39rryMnZjA5xUlhCu55n\noB3t/jsJLwnQN+JbAjLAeuqgOWtgARsEFzvpt+VvDsaj0YLOJPhyJwTvHgaa/slB\nnECzd3TuyFKYeGssSni/QQ1e7yZcLapQqz66g5otdriw0IRdOfDxm5M=\n-----END CERTIFICATE-----" + ] + }, + "validationOptions": { + "ignoreHostname": true, + "ignoreSignature": false + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink", + "inputs": [ + "rtspSource" + ], + "assetName": "SampleAsset" + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "SampleMediaGraph", + "properties": { + "description": "", + "state": "Stopped", + "created": "2019-09-01T00:00:00Z", + "lastModified": "2019-09-01T00:00:00Z", + "sources": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", + "name": "RTSPSource1", + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphTlsEndpoint", + "url": "rtsp://contoso.com:554/stream1", + "trustedCertificates": { + "@odata.type": "#Microsoft.Media.MediaGraphPemCertificateList", + "certificates": [ + "-----BEGIN CERTIFICATE-----\nMIIDhTCCAm2gAwIBAgIUajvPKmoO+8qaO89/ZGATl7ZYnTswDQYJKoZIhvcNAQEL\nBQAwUTESMBAGA1UECgwJTWljcm9zb2Z0MRQwEgYDVQQLDAtBenVyZSBNZWRpYTEl\nMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBDZXJ0aWZpY2F0ZTAgFw0yMDAyMDYy\nMTI5MTlaGA8zMDE5MDYwOTIxMjkxOVowUTESMBAGA1UECgwJTWljcm9zb2Z0MRQw\nEgYDVQQLDAtBenVyZSBNZWRpYTElMCMGA1UEAwwcKFVudHJ1c3RlZCkgVGVzdCBD\nZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2lg5ff\n7xXPaBZXHl/zrTukdiBtu7BNIOchHba51eloruPRzpvQx7Pedk3CVTut7LYinijf\nuol0EwkQ2FLt2i2jOqiva9nXR95ujIZHcKsEeMC4RSNSP4++k6SpP8FgyYVdv5ru\nf8GC+HyYQ4j0TqpR/cJs53l/LGRSldaFZ6fcDde1jeyca4VivAbAH1/WDIOvmjzo\n9XIGxZ10VSS5l5+DIgdkJZ+mDMLJIuVZ0YVF16ZGEB3beq1trk5lItvmSjQLTllH\nqMFm9UGY8jKZSo/BY8ewHEtnGSAFQK0TVuRx1HhUWwu6C9jk+2zmRS2090BNpQWa\nJMKFJrSPzFDPRX8CAwEAAaNTMFEwHQYDVR0OBBYEFIumbhu0lYk0EFDThEg0yyIn\n/wZZMB8GA1UdIwQYMBaAFIumbhu0lYk0EFDThEg0yyIn/wZZMA8GA1UdEwEB/wQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADUNw+/NGNVtigq9tMJKqlk39MTpDn1s\nZ1BVIAuAWSQjlevYZJeDIPUiWNWFhRe+xN7oOLnn2+NIXEKKeMSyuPoZYbN0mBkB\n99oS3XVipSANpmDvIepNdCrOnjfqDFIifRF1Dqjtb6i1hb6v/qYKVPLQvcrgGur7\nPKKkAu9p4YRZ3RBdwwaUuMgojrj/l6DGbeJY6IRVnVMY39rryMnZjA5xUlhCu55n\noB3t/jsJLwnQN+JbAjLAeuqgOWtgARsEFzvpt+VvDsaj0YLOJPhyJwTvHgaa/slB\nnECzd3TuyFKYeGssSni/QQ1e7yZcLapQqz66g5otdriw0IRdOfDxm5M=\n-----END CERTIFICATE-----" + ] + }, + "validationOptions": { + "ignoreHostname": true, + "ignoreSignature": false + } + } + } + ], + "sinks": [ + { + "@odata.type": "#Microsoft.Media.MediaGraphAssetSink", + "name": "AssetSink1", + "inputs": [ + "RTSPSource1" + ], + "assetName": "SampleAsset1" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json index eeff17d1df88..e77c43b37dbf 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-delete.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "204": {}, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json index a81936804954..506a2faa04e6 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph1", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "404": {}, @@ -20,7 +20,11 @@ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource1", - "rtspUrl": "rtsp://contoso.com:554/stream1" + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1" + } } ], "sinks": [ @@ -30,11 +34,11 @@ "inputs": [ "RTSPSource1" ], - "assetName": "Sample Asset1" + "assetName": "SampleAsset1" } ] } } } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json index 83101b2006a3..8d5770177717 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "contoso", "accountName": "contosomedia", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "200": { @@ -20,7 +20,11 @@ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource0", - "rtspUrl": "rtsp://contoso.com:554/stream0" + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream0" + } } ], "sinks": [ @@ -30,7 +34,7 @@ "inputs": [ "RTSPSource0" ], - "assetName": "Sample Asset0" + "assetName": "SampleAsset0" } ] } @@ -39,14 +43,18 @@ "name": "SampleMediaGraph1", "properties": { "description": "", - "state": "Stopped", + "state": "Starting", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource1", - "rtspUrl": "rtsp://contoso.com:554/stream1" + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream1" + } } ], "sinks": [ @@ -56,7 +64,7 @@ "inputs": [ "RTSPSource1" ], - "assetName": "Sample Asset1" + "assetName": "SampleAsset1" } ] } @@ -65,14 +73,18 @@ "name": "SampleMediaGraph2", "properties": { "description": "", - "state": "Stopped", + "state": "Running", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", "sources": [ { "@odata.type": "#Microsoft.Media.MediaGraphRtspSource", "name": "RTSPSource2", - "rtspUrl": "rtsp://contoso.com:554/stream2" + "transport": "Http", + "endpoint": { + "@odata.type": "#Microsoft.Media.MediaGraphClearEndpoint", + "url": "rtsp://contoso.com:554/stream2" + } } ], "sinks": [ @@ -82,7 +94,7 @@ "inputs": [ "RTSPSource2" ], - "assetName": "Sample Asset2" + "assetName": "SampleAsset2" } ] } @@ -91,4 +103,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json index 1b2240840b6e..0ac5e0014e43 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-start.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "202": {}, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json index 1b2240840b6e..0ac5e0014e43 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-stop.json @@ -4,7 +4,7 @@ "resourceGroupName": "contoso", "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "202": {}, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json index ce121a965c51..df34f31e1694 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json @@ -5,11 +5,10 @@ "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", "operationId": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { - "200": { - "body": {} - } + "202": {}, + "204": {} } } diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json index 1e3ee9bda64d..ab5e2da8f7a7 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json @@ -5,7 +5,7 @@ "accountName": "contosomedia", "mediaGraphName": "SampleMediaGraph", "operationId": "7877d0da-ae9b-4c5b-a1fa-c9ece3ef5d11", - "api-version": "2019-09-01-preview" + "api-version": "2020-02-01-preview" }, "responses": { "200": { @@ -15,4 +15,4 @@ } } } -} +} \ No newline at end of file From 1bdb6117bc2ba810337ac6468c81e1eac2e71c48 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 13:56:00 -0800 Subject: [PATCH 09/47] Using common types --- .../Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 38998524b627..883eb4df34bb 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -359,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "./Common.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { From a40ca5e6f2b5b2ec64e4490c7260bcb903f3dade Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 14:01:40 -0800 Subject: [PATCH 10/47] Using 200 for operation locatio header. --- .../preview/2020-02-01-preview/MediaGraphs.json | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 883eb4df34bb..04c6b7457d67 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -823,23 +823,11 @@ "description": "Get the operation result of a Media Graph in the Media Services account.", "operationId": "OperationResults_Get", "responses": { - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/MediaGraphOperationResult" - } - }, - "204": { - "description": "NoContent", + "200": { + "description": "OK", "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } - }, - "default": { - "description": "Detailed error information.", - "schema": { - "$ref": "#/definitions/ApiError" - } } }, "parameters": [ From 02b1e31294edf9707d8c2d834da602717f0d4cba Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 15:16:13 -0800 Subject: [PATCH 11/47] Fixing validation errors --- .../preview/2020-02-01-preview/MediaGraphs.json | 2 +- .../examples/media-graph-create-clear-source.json | 2 +- .../examples/media-graph-create-encrypted-source.json | 2 +- .../2020-02-01-preview/examples/media-graph-get-by-name.json | 2 +- .../2020-02-01-preview/examples/media-graph-list-all.json | 2 +- .../2020-02-01-preview/examples/operation-result-get.json | 5 +++-- .../2020-02-01-preview/examples/operation-status-get.json | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 04c6b7457d67..a641b02b7eb5 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -898,4 +898,4 @@ "description": "The Version of the API to be used with the client request." } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json index e0b92893a9cc..ee95f1a0a46d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -71,4 +71,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json index ec33016b1a5d..2db8f6d07a5f 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -91,4 +91,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json index 506a2faa04e6..35a11344a843 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-get-by-name.json @@ -41,4 +41,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json index 8d5770177717..99303e603261 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-list-all.json @@ -103,4 +103,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json index df34f31e1694..deb76584daeb 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-result-get.json @@ -8,7 +8,8 @@ "api-version": "2020-02-01-preview" }, "responses": { - "202": {}, - "204": {} + "200": { + "body": {} + } } } diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json index ab5e2da8f7a7..eecbc258949b 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/operation-status-get.json @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} From 5e5fd28ebb883b0a54ba3da334303fd1007f0f40 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:34:52 -0800 Subject: [PATCH 12/47] Trying to fix autorest --- .../preview/2020-02-01-preview/Common.json | 160 ++++++++++++++++++ .../2020-02-01-preview/MediaGraphs.json | 8 +- .../media-graph-create-clear-source.json | 2 +- .../media-graph-create-encrypted-source.json | 2 +- 4 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json new file mode 100644 index 000000000000..b97f35f3e520 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -0,0 +1,160 @@ + +{ + + "swagger": "2.0", + + "info": { + + "title": "Azure Media Services", + + "version": "2018-07-01" + + }, + + "securityDefinitions": { + + "azure_auth": { + + "type": "oauth2", + + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + + "flow": "implicit", + + "description": "Azure Active Directory OAuth2 Flow", + + "scopes": { + + "user_impersonation": "Impersonate your user account" + + } + + } + + }, + + "paths": {}, + + "definitions": { + + "Resource": { + + "description": "The core properties of ARM resources.", + + "properties": { + + "id": { + + "readOnly": true, + + "type": "string", + + "description": "Fully qualified resource ID for the resource." + + }, + + "name": { + + "readOnly": true, + + "type": "string", + + "description": "The name of the resource." + + }, + + "type": { + + "readOnly": true, + + "type": "string", + + "description": "The type of the resource." + + } + + }, + + "x-ms-azure-resource": true + + }, + + "TrackedResource": { + + "description": "The resource model definition for a ARM tracked resource.", + + "properties": { + + "tags": { + + "type": "object", + + "additionalProperties": { + + "type": "string" + + }, + + "x-ms-mutability": [ + + "read", + + "create", + + "update" + + ], + + "description": "Resource tags." + + }, + + "location": { + + "type": "string", + + "x-ms-mutability": [ + + "read", + + "create" + + ], + + "description": "The Azure Region of the resource." + + } + + }, + + "allOf": [ + + { + + "$ref": "#/definitions/Resource" + + } + + ] + + }, + + "ProxyResource": { + + "description": "The resource model definition for a ARM proxy resource.", + + "allOf": [ + + { + + "$ref": "#/definitions/Resource" + + } + + ] + + } + + } + + } \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index a641b02b7eb5..bcc70f95944b 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -359,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "./Common.json#/definitions/ProxyResource" } ], "properties": { @@ -828,6 +828,12 @@ "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } } }, "parameters": [ diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json index ee95f1a0a46d..3864b78b45c7 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -42,7 +42,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "", + "description": "updated description", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json index 2db8f6d07a5f..d28e6aa04e3d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -52,7 +52,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "", + "description": "updated description", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", From c395bf023295b0fbbf736ec37e84706129b93ee9 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:37:47 -0800 Subject: [PATCH 13/47] Reverting common.js to test if that matters for autorest. --- .../preview/2020-02-01-preview/Common.json | 160 ------------------ .../2020-02-01-preview/MediaGraphs.json | 2 +- 2 files changed, 1 insertion(+), 161 deletions(-) delete mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json deleted file mode 100644 index b97f35f3e520..000000000000 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ /dev/null @@ -1,160 +0,0 @@ - -{ - - "swagger": "2.0", - - "info": { - - "title": "Azure Media Services", - - "version": "2018-07-01" - - }, - - "securityDefinitions": { - - "azure_auth": { - - "type": "oauth2", - - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - - "flow": "implicit", - - "description": "Azure Active Directory OAuth2 Flow", - - "scopes": { - - "user_impersonation": "Impersonate your user account" - - } - - } - - }, - - "paths": {}, - - "definitions": { - - "Resource": { - - "description": "The core properties of ARM resources.", - - "properties": { - - "id": { - - "readOnly": true, - - "type": "string", - - "description": "Fully qualified resource ID for the resource." - - }, - - "name": { - - "readOnly": true, - - "type": "string", - - "description": "The name of the resource." - - }, - - "type": { - - "readOnly": true, - - "type": "string", - - "description": "The type of the resource." - - } - - }, - - "x-ms-azure-resource": true - - }, - - "TrackedResource": { - - "description": "The resource model definition for a ARM tracked resource.", - - "properties": { - - "tags": { - - "type": "object", - - "additionalProperties": { - - "type": "string" - - }, - - "x-ms-mutability": [ - - "read", - - "create", - - "update" - - ], - - "description": "Resource tags." - - }, - - "location": { - - "type": "string", - - "x-ms-mutability": [ - - "read", - - "create" - - ], - - "description": "The Azure Region of the resource." - - } - - }, - - "allOf": [ - - { - - "$ref": "#/definitions/Resource" - - } - - ] - - }, - - "ProxyResource": { - - "description": "The resource model definition for a ARM proxy resource.", - - "allOf": [ - - { - - "$ref": "#/definitions/Resource" - - } - - ] - - } - - } - - } \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index bcc70f95944b..d65edbf6e909 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -359,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "./Common.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { From e9ace2ccb4ba03a698127daa6b6c4bde0e34df27 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:39:34 -0800 Subject: [PATCH 14/47] Reverting default operation result to test if that matters for autorest --- .../preview/2020-02-01-preview/MediaGraphs.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index d65edbf6e909..996b3f16ed81 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -476,12 +476,6 @@ "schema": { "$ref": "#/definitions/MediaGraphCollection" } - }, - "default": { - "description": "Detailed error information.", - "schema": { - "$ref": "#/definitions/ApiError" - } } }, "parameters": [ From 325b8bb5ef5d2e77751d5c0e9d3b6a56a3c5d8e9 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:41:54 -0800 Subject: [PATCH 15/47] Fixing previous revert. --- .../preview/2020-02-01-preview/MediaGraphs.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 996b3f16ed81..a641b02b7eb5 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -476,6 +476,12 @@ "schema": { "$ref": "#/definitions/MediaGraphCollection" } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } } }, "parameters": [ @@ -822,12 +828,6 @@ "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } - }, - "default": { - "description": "Detailed error information.", - "schema": { - "$ref": "#/definitions/ApiError" - } } }, "parameters": [ From b9d741ad75da5a064572fb761916a8d64099c654 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:56:51 -0800 Subject: [PATCH 16/47] Fixing after merge from upstream --- specification/mediaservices/resource-manager/readme.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md index d3777831cfdf..e76afcb8f395 100644 --- a/specification/mediaservices/resource-manager/readme.md +++ b/specification/mediaservices/resource-manager/readme.md @@ -308,7 +308,7 @@ directive: reason: Output not required for job update ``` -## Multi-API/Profile support for AutoRest v3 generators +## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. @@ -320,7 +320,6 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: - - $(this-folder)/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json - $(this-folder)/Microsoft.Media/stable/2018-07-01/AccountFilters.json - $(this-folder)/Microsoft.Media/stable/2018-07-01/Accounts.json - $(this-folder)/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json @@ -355,11 +354,11 @@ input-file: ``` -If there are files that should not be in the `all-api-versions` set, +If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' -#exclude-file: +#exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` From a9af30639d4cdc2b0b7d61a6791991effb1d9e6c Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:58:50 -0800 Subject: [PATCH 17/47] Testing default operation result --- .../preview/2020-02-01-preview/MediaGraphs.json | 6 ++++++ .../examples/media-graph-create-clear-source.json | 2 +- .../examples/media-graph-create-encrypted-source.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index a641b02b7eb5..d65edbf6e909 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -828,6 +828,12 @@ "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } + }, + "default": { + "description": "Detailed error information.", + "schema": { + "$ref": "#/definitions/ApiError" + } } }, "parameters": [ diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json index 3864b78b45c7..ee95f1a0a46d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -42,7 +42,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "updated description", + "description": "", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json index d28e6aa04e3d..2db8f6d07a5f 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -52,7 +52,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "updated description", + "description": "", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", From 9798df544d53def8bd22dce0f2333d3550a14346 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 16:59:50 -0800 Subject: [PATCH 18/47] Testing description --- .../examples/media-graph-create-clear-source.json | 2 +- .../examples/media-graph-create-encrypted-source.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json index ee95f1a0a46d..3864b78b45c7 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -42,7 +42,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "", + "description": "updated description", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json index 2db8f6d07a5f..d28e6aa04e3d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -52,7 +52,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "", + "description": "updated description", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", From 466b211d45ceb9cf87d9e7a8e473180d4fdeef21 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 17:07:52 -0800 Subject: [PATCH 19/47] Adding common json back --- .../preview/2020-02-01-preview/Common.json | 80 +++++++++++++++++++ .../2020-02-01-preview/MediaGraphs.json | 2 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json new file mode 100644 index 000000000000..02dc5b2dfc8d --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -0,0 +1,80 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Media Services", + "version": "2018-07-01" + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "Impersonate your user account" + } + } + }, + "paths": {}, + "definitions": { + "Resource": { + "description": "The core properties of ARM resources.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource ID for the resource." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource." + } + }, + "x-ms-azure-resource": true + }, + "TrackedResource": { + "description": "The resource model definition for a ARM tracked resource.", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The Azure Region of the resource." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProxyResource": { + "description": "The resource model definition for a ARM proxy resource.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + } + } + } \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index d65edbf6e909..bcc70f95944b 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -359,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "./Common.json#/definitions/ProxyResource" } ], "properties": { From b58ed125b2d2a41ce448eb483ffcc7c33648b620 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 17:09:36 -0800 Subject: [PATCH 20/47] Testing empty description --- .../examples/media-graph-create-clear-source.json | 2 +- .../examples/media-graph-create-encrypted-source.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json index 3864b78b45c7..ee95f1a0a46d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-clear-source.json @@ -42,7 +42,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "updated description", + "description": "", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json index d28e6aa04e3d..2db8f6d07a5f 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/examples/media-graph-create-encrypted-source.json @@ -52,7 +52,7 @@ "body": { "name": "SampleMediaGraph", "properties": { - "description": "updated description", + "description": "", "state": "Stopped", "created": "2019-09-01T00:00:00Z", "lastModified": "2019-09-01T00:00:00Z", From 96284e066cb0d9a34ab72399c16c08bf7f345eb9 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Mon, 24 Feb 2020 17:11:29 -0800 Subject: [PATCH 21/47] Testing no default for operation result --- .../preview/2020-02-01-preview/MediaGraphs.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index bcc70f95944b..5e38e2ae333f 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -828,12 +828,6 @@ "schema": { "$ref": "#/definitions/MediaGraphOperationResult" } - }, - "default": { - "description": "Detailed error information.", - "schema": { - "$ref": "#/definitions/ApiError" - } } }, "parameters": [ From e672ff5b5627714a0d54045e4f0b8351a8107bab Mon Sep 17 00:00:00 2001 From: Risong Na Date: Tue, 25 Feb 2020 16:18:11 -0800 Subject: [PATCH 22/47] Removing common.json --- .../preview/2020-02-01-preview/Common.json | 80 ------------------- .../2020-02-01-preview/MediaGraphs.json | 2 +- 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json deleted file mode 100644 index 02dc5b2dfc8d..000000000000 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Azure Media Services", - "version": "2018-07-01" - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "Impersonate your user account" - } - } - }, - "paths": {}, - "definitions": { - "Resource": { - "description": "The core properties of ARM resources.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Fully qualified resource ID for the resource." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of the resource." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "The type of the resource." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "The resource model definition for a ARM tracked resource.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "The Azure Region of the resource." - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "The resource model definition for a ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - } - } - } \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index 5e38e2ae333f..a641b02b7eb5 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -359,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "./Common.json#/definitions/ProxyResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" } ], "properties": { From bff43040be144201cce297f75f4a84f711d9f725 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Tue, 25 Feb 2020 16:21:58 -0800 Subject: [PATCH 23/47] Updating common.json of AMS --- .../Microsoft.Media/stable/2018-07-01/Common.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json index 8ffd3bd1f71a..c01129cc914b 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json @@ -18,7 +18,7 @@ "paths": {}, "definitions": { "Resource": { - "description": "The core properties of ARM resources.", + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "properties": { "id": { "readOnly": true, @@ -39,7 +39,7 @@ "x-ms-azure-resource": true }, "TrackedResource": { - "description": "The resource model definition for a ARM tracked resource.", + "description": "The resource model definition for a ARM tracked top level resource", "properties": { "tags": { "type": "object", @@ -69,7 +69,7 @@ ] }, "ProxyResource": { - "description": "The resource model definition for a ARM proxy resource.", + "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags", "allOf": [ { "$ref": "#/definitions/Resource" From 5d63fbf639745df299003568b32feb40dabaa97a Mon Sep 17 00:00:00 2001 From: Risong Na Date: Tue, 25 Feb 2020 16:25:10 -0800 Subject: [PATCH 24/47] Updating common.json --- .../Microsoft.Media/stable/2018-07-01/Common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json index c01129cc914b..51f612c6bfb6 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json @@ -33,7 +33,7 @@ "type": { "readOnly": true, "type": "string", - "description": "The type of the resource." + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." } }, "x-ms-azure-resource": true @@ -59,7 +59,7 @@ "read", "create" ], - "description": "The Azure Region of the resource." + "description": "The geo-location where the resource lives" } }, "allOf": [ From 3467a1353b3b16f58ca741441ea2ead420176212 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Tue, 25 Feb 2020 16:32:43 -0800 Subject: [PATCH 25/47] Updating common.json --- .../Microsoft.Media/stable/2018-07-01/Common.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json index 51f612c6bfb6..195566373342 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json @@ -18,12 +18,11 @@ "paths": {}, "definitions": { "Resource": { - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}", "properties": { "id": { "readOnly": true, "type": "string", - "description": "Fully qualified resource ID for the resource." + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" }, "name": { "readOnly": true, From d4fdfb78978fa4d52123c3be5ef2467e1b9554bd Mon Sep 17 00:00:00 2001 From: Risong Na Date: Tue, 25 Feb 2020 16:34:16 -0800 Subject: [PATCH 26/47] Updating common.json --- .../Microsoft.Media/stable/2018-07-01/Common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json index 195566373342..4905e51bfcf1 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json @@ -27,7 +27,7 @@ "name": { "readOnly": true, "type": "string", - "description": "The name of the resource." + "description": "The name of the resource" }, "type": { "readOnly": true, From 363db7b94ab1237d8feea0ae3a5251934c4266fb Mon Sep 17 00:00:00 2001 From: dosegal <51155368+dosegal@users.noreply.github.com> Date: Tue, 25 Feb 2020 04:39:17 +0200 Subject: [PATCH 27/47] Rename unknown classification to undetermined classification (#8436) --- .../preview/2019-01-01-preview/SecurityInsights.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 5ceeb23ca3c0..2fde4c050cf2 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -5949,7 +5949,7 @@ "classification": { "description": "The reason the incident was closed", "enum": [ - "Unknown", + "Undetermined", "TruePositive", "FalsePositive" ], @@ -5959,8 +5959,8 @@ "name": "IncidentClassification", "values": [ { - "description": "Incident classification was not set", - "value": "Unknown" + "description": "Incident classification was undetermined", + "value": "Undetermined" }, { "description": "Incident was true positive", From 333fb94d60b7ea4e843972e30944942b5bfc4150 Mon Sep 17 00:00:00 2001 From: anushreeringne Date: Mon, 24 Feb 2020 19:10:53 -0800 Subject: [PATCH 28/47] Fixing the structure of RESTProxy documentation: Updating the OperationId (#8327) * Updating the OperationId Updating the OperationId because the grouping of operations isn't correct. * Updating the operationId spelling * Making prettier fixes as outputed --- .../hdinsight-kafka-rest-proxy/proxy.json | 120 +++++++++++++----- 1 file changed, 86 insertions(+), 34 deletions(-) diff --git a/specification/hdinsight/hdinsight-kafka-rest-proxy/proxy.json b/specification/hdinsight/hdinsight-kafka-rest-proxy/proxy.json index 8b7e5335e37a..d09da2b64632 100644 --- a/specification/hdinsight/hdinsight-kafka-rest-proxy/proxy.json +++ b/specification/hdinsight/hdinsight-kafka-rest-proxy/proxy.json @@ -32,16 +32,24 @@ "description": "Manage Kafka topics" } ], - "schemes": [ "https" ], + "schemes": [ + "https" + ], "paths": { "/v1/consumer/topics/{topic}/partitions/{partition}/offsets/{offset}": { "get": { - "tags": [ "v1consumer" ], + "tags": [ + "v1consumer" + ], "summary": "Consume records using a simple consumer", "description": "Consume records from one partition of a topic beginning with a specific offset. By default count is 1. It can read maximum of 6 megabytes of data at once", - "operationId": "consumeTopicInPartitionWithOffset", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Consumer_ConsumeTopicInPartitionWithOffset", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "parameters": [ { "name": "topic", @@ -108,12 +116,18 @@ }, "/v1/metadata/brokers": { "get": { - "tags": [ "v1metadata" ], + "tags": [ + "v1metadata" + ], "summary": "Get a list of Kafka brokers", "description": "Get a list of Kafka brokers with hostname, port, and broker id", - "operationId": "getBrokers", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Metadata_GetBrokers", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "responses": { "200": { "description": "successful operation", @@ -144,12 +158,18 @@ }, "/v1/metadata/topics": { "get": { - "tags": [ "v1metadata" ], + "tags": [ + "v1metadata" + ], "summary": "Get a list of Kafka topics", "description": "Get a list of Kafka topics. If it is a newly created topic, please wait a few seconds for it to show up.", - "operationId": "getTopics", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Metadata_GetTopics", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "responses": { "200": { "description": "successful operation", @@ -180,12 +200,18 @@ }, "/v1/metadata/topics/{topic}/partitions": { "get": { - "tags": [ "v1metadata" ], + "tags": [ + "v1metadata" + ], "summary": "Get metadata about all partitions for a specific topic", "description": "Get metadata about all partitions for a specific topic with partition ID, earliest offset, latest offset, leader, replicas, and in-sync replicas", - "operationId": "getPartitions", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Metadata_GetTopicPartitions", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "parameters": [ { "name": "topic", @@ -225,12 +251,18 @@ }, "/v1/metadata/topics/{topic}/partitions/{partition}": { "get": { - "tags": [ "v1metadata" ], + "tags": [ + "v1metadata" + ], "summary": "Get metadata about a specific Kafka topic-partition", "description": "Get metadata about a specific Kafka topic-partition with partition ID, earliest offset, latest offset, leader, replicas, and in-sync replicas", - "operationId": "getPartitionMetadata", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Metadata_GetMetadataForPartition", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "parameters": [ { "name": "topic", @@ -278,12 +310,18 @@ }, "/v1/producer/topics/{topic}": { "post": { - "tags": [ "v1producer" ], + "tags": [ + "v1producer" + ], "summary": "Produce records", "description": "Produce records to a topic in Kafka. If producing records to a newly created topic, please wait a few seconds for the topic to show up.", - "operationId": "produceMessageToTopic", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Producer_ProduceMessageToTopic", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "parameters": [ { "name": "topic", @@ -332,12 +370,18 @@ }, "/v1/status": { "get": { - "tags": [ "v1status" ], + "tags": [ + "v1status" + ], "summary": "Check the status of Kafka Rest proxy server", "description": "Check the status of Kafka Rest proxy server", - "operationId": "checkRestproxyStatus", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Admin_CheckRestProxyStatus", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "responses": { "200": { "description": "successful operation", @@ -350,12 +394,18 @@ }, "/v1/topics/{topic}": { "put": { - "tags": [ "v1topics" ], + "tags": [ + "v1topics" + ], "summary": "Create a topic", "description": "Create a topic in Kafka with topic configuration", - "operationId": "putTopics", - "consumes": [ "application/json" ], - "produces": [ "application/json" ], + "operationId": "Admin_CreateTopic", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], "parameters": [ { "name": "topic", @@ -447,7 +497,9 @@ }, "ProducerRecord": { "type": "object", - "required": [ "value" ], + "required": [ + "value" + ], "properties": { "value": { "type": "object", From 076c77e68bda65aeb09273272e79584842e9ad26 Mon Sep 17 00:00:00 2001 From: JianyeXi <59603451+jianyexi@users.noreply.github.com> Date: Wed, 26 Feb 2020 02:59:38 +0800 Subject: [PATCH 29/47] update lint doc, add the missed rules doc R2029,R2007 (#8502) --- .../openapi-authoring-automated-guidelines.md | 72 ++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/documentation/openapi-authoring-automated-guidelines.md b/documentation/openapi-authoring-automated-guidelines.md index cb651946827d..cc7401937ca8 100644 --- a/documentation/openapi-authoring-automated-guidelines.md +++ b/documentation/openapi-authoring-automated-guidelines.md @@ -123,7 +123,9 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an | [R2064](#r2064) | [LROStatusCodesReturnTypeSchema](#r2064) | ARM and Data plane OpenAPI(swagger) specs | | [R2023](#r2023) | [SummaryAndDescriptionMustNotBeSame](#r2023) | ARM and Data plane OpenAPI(swagger) specs | | [R2010](#r2010) | [LongRunningOperationsOptionsValidator](#r2010) | ARM and Data plane OpenAPI(swagger) specs | - +| [R2007](#r2007) | [LongRunningOperationsWithLongRunningExtension](#r2007) | ARM OpenAPI(swagger) specs | +| [R2029](#r2029) | [PageableOperation](#r2029) | ARM and Data plane OpenAPI(swagger) specs | + ### Documentation #### Documentation Errors @@ -2095,4 +2097,72 @@ Valid: ``` +Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings) + +### R2007 LongRunningOperationsWithLongRunningExtension + +**Category** : SDK Warning + +**Applies to** : ARM OpenAPI(swagger) specs + +**Output Message** : The operation '{0}' returns 202 status code, which indicates a long running operation, please enable 'x-ms-long-running-operation'. + +**Description** : Per [x-ms-long-running-operation](./swagger-extensions.md#x-ms-long-running-operation) ,The operation which returns 202 status code indicates a long running operation. Every long running operation must have the x-ms-long-running-operation enabled. + +**How to fix the violation**: +Having the "x-ms-long-running-operation" enabled. +Eg: +```json +...... +...... + "put": { + "operationId": "Foo_Create", + "responses": { + "202": { + "description": "" + }, + "x-ms-long-running-operation": true + } + } +...... +...... +``` + +Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings) + + +### R2029 PageableOperation + +**Category** : SDK Warning + +**Applies to** : ARM and Data plane OpenAPI(swagger) specs + +**Output Message** : Based on the response model schema, operation '${operationId}' might be pageable. Consider adding the x-ms-pageable extension. + +**Description** : This rule was introduced to check if a pageable operation has x-ms-pageable enabled. + +**How to fix the violation**: +Having the x-ms-pageable enabled if the operation is pageable. +Eg: +```json +...... +...... + "get": { + "operationId": "Foo_List", + "responses": { + "200": { + "description": ". ", + "schema": { + "$ref": "#/definitions/ant" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } +...... +...... +``` + Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings) From ef43fa288964ebd5f9efab716d09d706dd423ed5 Mon Sep 17 00:00:00 2001 From: JianyeXi <59603451+jianyexi@users.noreply.github.com> Date: Wed, 26 Feb 2020 03:02:20 +0800 Subject: [PATCH 30/47] Linter tool document update: add R4004, modify R2016 ,R3006 (#8417) * Linter tool document update: add R4004. * Update linter doc : modify R2016 ,R3006 * change date format * Update description of R2016 --- .../openapi-authoring-automated-guidelines.md | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/documentation/openapi-authoring-automated-guidelines.md b/documentation/openapi-authoring-automated-guidelines.md index cc7401937ca8..0a357da13333 100644 --- a/documentation/openapi-authoring-automated-guidelines.md +++ b/documentation/openapi-authoring-automated-guidelines.md @@ -60,6 +60,7 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an | [R2057](#r2057) | [InvalidSkuModel](#r2057) | ARM OpenAPI(swagger) specs | | [R3010](#r3010) | [TrackedResourceListByImmediateParent](#r3010) | ARM OpenAPI(swagger) specs | | [R2004](#r2004) | [NonApplicationJsonType](#r2004) | ARM OpenAPI(swagger) specs | +| [R4004](#r4004) | [OperationIdRequired](#r4004) | ARM OpenAPI(swagger) specs | | [R3020](#r3020) | [PathResourceProviderNamePascalCase](#r3020) | ARM OpenAPI(swagger) specs | | [R3021](#r3021) | [PathResouceTypeNameCamelCase](#r3021) | ARM OpenAPI(swagger) specs | | [R3015](#r3015) | [EnumMustHaveType](#r3015) | ARM OpenAPI(swagger) specs | @@ -1408,10 +1409,14 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul **Applies to** : ARM OpenAPI(swagger) specs -**Output Message**: Top level properties should be one of name, type, id, location, properties, tags, plan, sku, etag, managedBy, identity. Model definition '{0}' has extra properties ['{1}']. +**Output Message**: Top level properties should be one of name, type, id, location, properties, tags, plan, sku, etag, managedBy, identity, systemdata. Model definition '{0}' has extra properties ['{1}']. **Description**: Per [ARM guidelines](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md), top level properties of a resource should be only ones from the allowed set. +**CreatedAt** : N/A + +**LastModifiedAt** : February 18, 2020 + **Why the rule is important**: [ARM guidelines](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md). **How to fix the violation**: Consider moving extra properties into "properties" bag of the resource model. @@ -1662,11 +1667,56 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul **Output Message**: Properties of a PATCH request body must not be {0}. PATCH operation: '{1}' Model Definition: '{2}' Property: '{3}' **Description**: A request parameter of the Patch Operation must not have a required/default value. +But it's allowed when all required properties are marked as discriminator, because the discriminator must be required. + +**CreatedAt** : N/A + +**LastModifiedAt** : February 18, 2020 **Why the rule is important**: A PATCH operation is used to update properties of a resource. So, If the resource has 'X' number of properties and if you wish to change one of them, then a PATCH request could be sent with a value for that specified property. In other words, all the properties in the PATCH request are updated. Now, if any of the values are marked as required/default, it would force the system to update it always which is not the intention of the PATCH operation. **How to fix the violation**: Ensure that the request parameter of the Patch Operation does not have a required/default value. +**Good Examples**: The following is a good example: +```json +...... +...... + "patch": { + "tags": [ + "SampleTag" + ], + "operationId": "Foo_Update", + "description": "Test Description", + "parameters": [ + { + "name": "foo_patch", + "in": "body", + "schema": { + "$ref": "#/definitions/FooRequestParams" + }, + "description": "foo patch request" + } + ] + } +...... +...... + "definitions": { + "FooRequestParams": { + "properties": { + "prop0": { + "type": "string" + } + }, + "discriminator": "prop0", + "required": [ + "prop0" + ] + } + } +...... +...... +``` + Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings) ### R4000 ParameterDescriptionRequired @@ -1846,6 +1896,24 @@ or Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings) +### R4004 OperationIdRequired + +**Category** : ARM Warning + +**Applies to** : ARM OpenAPI(swagger) specs + +**Output Message** : Missing operationId. path:'${operation path}' operation:'${operation}'. + +**Description** : Each operation must has a unique operationId. + +**CreatedAt** : February 18, 2020 + +**LastModifiedAt** : February 18, 2020 + +**Why this rule is important**: Per [creating-swagger](creating-swagger.md#Paths),The operationId is used to determine the generated method name. + +**How to fix the violation**: Add the right operationId for each operation + ### R3020 PathResourceProviderNamePascalCase **Category** : ARM Warning From f06134e734f2713fbd2ac240b5e487901f9ea4be Mon Sep 17 00:00:00 2001 From: aramesh-msft <59899320+aramesh-msft@users.noreply.github.com> Date: Tue, 25 Feb 2020 14:45:32 -0800 Subject: [PATCH 31/47] 2020 01 01 updates to rules engine caching behavior (#8455) * 2020 01 01 updates to rules engine caching behavior * add new cache settings fields to CacheConfiguration * cache settings fields will enable Rules Engine to allow cache override actions * fix typos in examples * renamed privateLinkResourceId to privateLinkAlias * fix x-nullable usage * Change cacheDuration to "format":"duration" Co-authored-by: Moustafa Eid --- .../2020-01-01/examples/FrontdoorCreate.json | 19 +++++++---- .../2020-01-01/examples/FrontdoorGet.json | 4 +-- .../2020-01-01/examples/FrontdoorList.json | 2 +- .../2020-01-01/examples/FrontdoorListAll.json | 2 +- .../examples/FrontdoorRulesEngineCreate.json | 34 +++++++++++++++++++ .../examples/FrontdoorRulesEngineGet.json | 34 +++++++++++++++++++ .../examples/FrontdoorRulesEngineList.json | 34 +++++++++++++++++++ .../stable/2020-01-01/frontdoor.json | 17 ++++++++-- 8 files changed, 133 insertions(+), 13 deletions(-) diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorCreate.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorCreate.json index 53f6407f0237..1e75091a2451 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorCreate.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorCreate.json @@ -83,7 +83,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateLinkApprovalMessage": "Please approve this request to connect to the Private Link", "address": "10.0.1.5", "httpPort": 80, @@ -167,7 +167,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1" } }, - "rulesEngine": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1", + "rulesEngine": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1" + }, "enabledState": "Enabled" } } @@ -216,7 +218,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateEndpointStatus": "Pending", "privateLinkApprovalMessage": "Please approve the connection request for this Private Link", "address": "10.0.1.5", @@ -306,7 +308,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1" } }, - "rulesEngine": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1", + "rulesEngine": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1" + }, "enabledState": "Enabled" } } @@ -355,7 +359,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateEndpointStatus": "Approved", "privateLinkApprovalMessage": "Please approve the connection request for this Private Link", "address": "10.0.1.5", @@ -445,6 +449,9 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1" } }, + "rulesEngine": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1" + }, "enabledState": "Enabled" } } @@ -493,7 +500,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateEndpointStatus": "Approved", "privateLinkApprovalMessage": "Please approve the connection request for this Private Link", "address": "10.0.1.5", diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorGet.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorGet.json index fd4b657552f7..ee642abc01b3 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorGet.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorGet.json @@ -95,7 +95,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateEndpointStatus": "Approved", "privateLinkApprovalMessage": "Please approve the connection request for this Private Link", "address": "10.0.1.5", @@ -138,7 +138,7 @@ ], "rulesEngines": [ { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/routingRules/rulesEngine1", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/rulesEngines/rulesEngine1", "name": "rulesEngine1", "properties": { "rules": [ diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorList.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorList.json index f859c8a824e7..5affee4eeac4 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorList.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorList.json @@ -96,7 +96,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateEndpointStatus": "Approved", "privateLinkApprovalMessage": "Please approve the connection request for this Private Link", "address": "10.0.1.5", diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorListAll.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorListAll.json index 6c99f8d4e449..3975d2759a87 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorListAll.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorListAll.json @@ -95,7 +95,7 @@ "priority": 1 }, { - "privateLinkResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkAlias": "SQLSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice", "privateEndpointStatus": "Approved", "privateLinkApprovalMessage": "Please approve the connection request for this Private Link", "address": "10.0.1.5", diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineCreate.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineCreate.json index 1805db9019f9..e7d7da48aca3 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineCreate.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineCreate.json @@ -57,6 +57,40 @@ ] } ] + }, + { + "name": "Rule3", + "priority": 3, + "action": { + "routeConfigurationOverride": { + "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration", + "customForwardingPath": null, + "forwardingProtocol": "HttpsOnly", + "cacheConfiguration": { + "queryParameterStripDirective": "StripOnly", + "queryParameters": "a=b,p=q", + "dynamicCompression": "Disabled", + "cacheDuration": "P1DT12H20M30S" + }, + "backendPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1" + } + } + }, + "matchConditions": [ + { + "rulesEngineMatchVariable": "RequestHeader", + "rulesEngineOperator": "Equal", + "rulesEngineMatchValue": [ + "allowoverride" + ], + "transforms": [ + "Lowercase" + ], + "negateCondition": false, + "selector": "Rules-Engine-Route-Forward" + } + ] } ] } diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineGet.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineGet.json index b6b138d610da..329e370ff82f 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineGet.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineGet.json @@ -62,6 +62,40 @@ ] } ] + }, + { + "name": "Rule3", + "priority": 3, + "action": { + "routeConfigurationOverride": { + "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration", + "customForwardingPath": null, + "forwardingProtocol": "HttpsOnly", + "cacheConfiguration": { + "queryParameterStripDirective": "StripOnly", + "queryParameters": "a=b,p=q", + "dynamicCompression": "Disabled", + "cacheDuration": "P1DT12H20M30S" + }, + "backendPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1" + } + } + }, + "matchConditions": [ + { + "rulesEngineMatchVariable": "RequestHeader", + "rulesEngineOperator": "Equal", + "rulesEngineMatchValue": [ + "allowoverride" + ], + "transforms": [ + "Lowercase" + ], + "negateCondition": false, + "selector": "Rules-Engine-Route-Forward" + } + ] } ] } diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineList.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineList.json index 9ca9c9249d18..bf1c2190f8e0 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineList.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/examples/FrontdoorRulesEngineList.json @@ -63,6 +63,40 @@ ] } ] + }, + { + "name": "Rule3", + "priority": 3, + "action": { + "routeConfigurationOverride": { + "@odata.type": "#Microsoft.Azure.FrontDoor.Models.FrontdoorForwardingConfiguration", + "customForwardingPath": null, + "forwardingProtocol": "HttpsOnly", + "cacheConfiguration": { + "queryParameterStripDirective": "StripOnly", + "queryParameters": "a=b,p=q", + "dynamicCompression": "Disabled", + "cacheDuration": "P1DT12H20M30S" + }, + "backendPool": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/frontDoors/frontDoor1/backendPools/backendPool1" + } + } + }, + "matchConditions": [ + { + "rulesEngineMatchVariable": "RequestHeader", + "rulesEngineOperator": "Equal", + "rulesEngineMatchValue": [ + "allowoverride" + ], + "transforms": [ + "Lowercase" + ], + "negateCondition": false, + "selector": "Rules-Engine-Route-Forward" + } + ] } ] } diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/frontdoor.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/frontdoor.json index 8b25f8ffeddd..1fac62bfeda9 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/frontdoor.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-01-01/frontdoor.json @@ -1237,8 +1237,8 @@ "description": "Location of the backend (IP address or FQDN)", "type": "string" }, - "privateLinkResourceId": { - "description": "If this backend is private, provide the Private Link resource Id. Populating this optional field indicates that this backend is 'Private'", + "privateLinkAlias": { + "description": "The Alias of the Private Link resource. Populating this optional field indicates that this backend is 'Private'", "type": "string" }, "privateEndpointStatus": { @@ -1570,7 +1570,9 @@ "description": "Treatment of URL query terms when forming the cache key.", "enum": [ "StripNone", - "StripAll" + "StripAll", + "StripOnly", + "StripAllExcept" ], "type": "string", "x-ms-enum": { @@ -1578,6 +1580,10 @@ "modelAsString": true } }, + "queryParameters": { + "description": "query parameters to include or exclude (comma separated).", + "type": "string" + }, "dynamicCompression": { "description": "Whether to use dynamic compression for cached content", "enum": [ @@ -1589,6 +1595,11 @@ "name": "DynamicCompressionEnabled", "modelAsString": true } + }, + "cacheDuration": { + "description": "The duration for which the content needs to be cached. Allowed format is in ISO 8601 format (http://en.wikipedia.org/wiki/ISO_8601#Durations). HTTP requires the value to be no more than a year", + "type": "string", + "format": "duration" } } }, From 1c5548cd3601fd7a46501fa7a3d5b969dc417127 Mon Sep 17 00:00:00 2001 From: Kerwin Date: Wed, 26 Feb 2020 06:49:46 +0800 Subject: [PATCH 32/47] add cli.md for postgresql (#8492) * add cli.md for postgresql * remove and update description --- .../postgresql/resource-manager/readme.cli.md | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 specification/postgresql/resource-manager/readme.cli.md diff --git a/specification/postgresql/resource-manager/readme.cli.md b/specification/postgresql/resource-manager/readme.cli.md new file mode 100644 index 000000000000..616184b4aae8 --- /dev/null +++ b/specification/postgresql/resource-manager/readme.cli.md @@ -0,0 +1,44 @@ +## CLI + +These settings don't need to apply `--cli` on the command line. + +``` yaml +cli: + cli-name: postgresql + package-name: azure-mgmt-rdbms-postgresql + namespace: azure.mgmt.rdbms.postgresql + test-scenario: + - name: Create a new server + - name: Create a server as a geo restore + - name: Create a replica server + - name: Create a database as a point in time restore + - name: DatabaseCreate + - name: FirewallRuleCreate + - name: ConfigurationCreateOrUpdate + - name: Create or update a virtual network rule + - name: Update a server's threat detection policy with all parameters + - name: Update a server's threat detection policy with minimal parameters + - name: Get a server's threat detection policy + - name: Gets a virtual network rule + - name: ConfigurationGet + - name: FirewallRuleGet + - name: DatabaseGet + - name: List virtual network rules + - name: ConfigurationList + - name: FirewallRuleList + - name: DatabaseList + - name: LogFileList + - name: ReplicasListByServer + - name: ServerGet + - name: PerformanceTiersList + - name: ServerListByResourceGroup + - name: ServerList + - name: OperationList + - name: ServerRestart + - name: ServerUpdate + - name: NameAvailability + - name: Delete a virtual network rule + - name: FirewallRuleDelete + - name: DatabaseDelete + - name: ServerDelete +``` \ No newline at end of file From 689efc732ae408a65d0da377cecd208e6d7ce73b Mon Sep 17 00:00:00 2001 From: Andrija Cicovic <60783126+cicovica@users.noreply.github.com> Date: Wed, 26 Feb 2020 02:06:43 +0100 Subject: [PATCH 33/47] Added minimalTlsVersion property for Managed Instance endpoint, API version 2018-06-01-preview (#8508) --- .../preview/2018-06-01-preview/managedInstances.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json index 787250a313a2..14afdcdb4e85 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstances.json @@ -176,7 +176,7 @@ } }, "default": { - "description": "*** Error Responses: ***\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 HkCannotSwitchToInactive - The database cannot proceed with pricing-tier update as it has memory-optimized objects. Please drop such objects and try again.\n\n * 400 ManagedInstanceInvalidStorageSizeLessThenCurrentSizeUsed - Invalid storage size: Storage size limit ({0} GB) is less that current storage used ({1} GB). Please specify higher storage size limit.\n\n * 400 InstanceTimezoneUpdateNotSupported - Instance timezone update not supported.\n\n * 400 CreateManagedInstanceWithNonDefaultTimezoneNotSupported - Create Managed Instance with non-default timezone not supported.\n\n * 400 ManagedInstanceIpAddressRangeLimit - Cannot create a Managed Instance as there are not enough available ip addresses in the selected subnet\n\n * 400 VnetDelegationNotAllowed - User tried to inject Managed Server to subnet which is delegated.\n\n * 400 SubnetHasResourcesOfDifferentType - User tried to create MI in subnet that has resources of different type.\n\n * 400 InvalidUsername - Supplied user name contains invalid characters.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 InstancePoolNotEnoughCapacity - An instance pool does not have enough vCore capacity\n\n * 400 ServerNotFound - The requested server was not found.\n\n * 400 TokenTooLong - The provided token is too long.\n\n * 400 ManagedInstanceSloUpdateFailed - SLO '{0}' operation cannot succeed as the memory usage of '{1}' exceeds the quota.\n\n * 400 ManagedInstanceLocalStorageUpdateSloDisabled - Update SLO for managed instances with local storage is not supported yet.\n\n * 400 InvalidLoginName - The provided login name is invalid.\n\n * 400 RegionDoesNotSupportVersion - A user attempted to create a server of a specified version in a location where that server version isn't supported.\n\n * 400 PasswordTooShort - The provided password is too short\n\n * 400 PasswordTooLong - The provided password is too long.\n\n * 400 PasswordNotComplex - The provided password is not complex enough.\n\n * 400 GatewayInvalidEdition - '{0}' is not a valid database edition in this version of SQL Server.\n\n * 400 InvalidSubnetResourceId - The provided subnet resource ID for the managed instance create or update is invalid.\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 InvalidLocation - An invalid location was specified.\n\n * 400 VnetInWrongRegion - Virtual network is in wrong region.\n\n * 400 InvalidServerName - Invalid server name specified.\n\n * 400 VnetAddressRangeError - Virtual network address range is invalid.\n\n * 400 VnetConfigIsNotAllowed - Virtual network configuration is not allowed.\n\n * 400 InvalidCollation - Invalid collation.\n\n * 400 InvalidIdentifier - The identifier contains NULL or an invalid unicode character.\n\n * 400 ManagedInstanceClassicVnetNotSupported - Managed Instance cannot be joined to a classic virtual network.\n\n * 400 AlterDbDeactivatedNotSupported - Database Operation failed for Server '{0}', Database '{1}' due to unexpected delay. Please try again.\n\n * 400 RegionDoesNotAllowProvisioning - The selected location is not accepting new Windows Azure SQL Database servers. This may change at a later time.\n\n * 400 VnetConfigHasNsg - User tried to inject Managed Server subnet with Network Security Groups.\n\n * 400 VnetConfigHasNoUdr - User tried to inject Managed Server subnet without default User Defined Route Table.\n\n * 400 VnetConfigHasInvalidUdr - User tried to inject Managed Server subnet with invalid User Defined Route Table.\n\n * 400 VnetConfigHasInvalidDns - User tried to inject Managed Server subnet with invalid custom DNS.\n\n * 400 VnetConfigHasServiceEndpoints - User tried to inject Managed Server subnet with service endpoints.\n\n * 400 VnetSubnetIsInUse - User tried to inject Managed Server subnet that is not empty.\n\n * 400 VnetSubnetIsLocked - User tried to inject Managed Server subnet that is in locked scope.\n\n * 400 VnetSubnetIsGateway - User tried to inject Managed Server subnet that is Gateway subnet.\n\n * 400 VnetSubnetIsUnknown - User tried to inject Managed Server subnet that does not exist.\n\n * 400 VnetSubnetConflictWithIntendedPolicy - User tried to inject Managed Server subnet that has a conflict with IntendedPolicy.\n\n * 400 NameAlreadyExists - The provided name already exists.\n\n * 400 ManagedInstanceInvalidEditionForSku - The specified edition {0} is not consistent with the specified SKU {1}.\n\n * 400 ProvisioningDisabled - Displays error message from resources operation authorizer as is, without changes\n\n * 400 ManagedInstanceInvalidLicenseType - The specified license type {0} is not valid.\n\n * 400 ManagedInstanceUpdateSloInProgress - \"The operation could not be completed because a service tier change is in progress for managed instance '{0}.' Please wait for the operation in progress to complete and try again.\"\n\n * 400 VnetResourceNotFound - Resource not found: '{0}'.\n\n * 400 InvalidTimezone - Invalid timezone.\n\n * 400 UnableToResolveRemoteServer - The remote partner server name could not be resolved due to an invalid server name or DNS connectivity issues.\n\n * 400 InstanceCollationUpdateNotSupported - User cannot change instance collation on Managed Instance.\n\n * 400 CreateManagedInstanceWithNonDefaultCollationNotSupported - User can create a Managed Instance only with collation 'SQL_Latin1_General_CP1_CI_AS'.\n\n * 400 ManagedInstanceOperationInProgress - The operation could not be completed because {0} operation is in progress. Please wait for the operation in progress to complete and try again.\n\n * 400 ManagedInstanceExceedMaxAzureStorage - The operation could not be completed because total allocated storage size for General Purpose instance would exceed {0}. Please reduce the number of database files and retry operation.\n\n * 400 ManagedInstanceHasGeoReplica - The operation could not be completed because instance has configured geo replicated secondary instance.\n\n * 400 InvalidManagedServerDnsZonePartner - Invalid DNS zone partner resource id specified in properties.\n\n * 400 ManagementServiceFeatureDisabled - User attempted to use a feature which is disabled.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 404 ResourceDoesNotExist - Resource with the name '{0}' does not exist. To continue, specify a valid resource name.\n\n * 404 ResourceNotFound - The requested resource was not found.\n\n * 405 InvalidVcoreValue - vCore value {0} is not valid. Please specify a valid vCore value.\n\n * 405 InvalidHardwareGenerationValue - HardwareGeneration {0} is not valid. Please specify a valid HardwareGeneration value.\n\n * 405 InvalidStorageSizeValue - \"Invalid storage size: {0} GB. Storage size must be specified between {1} and {2} gigabytes, in increments of {3} GB.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 409 ConflictingServerOperation - An operation is currently in progress for the server.\n\n * 409 SubscriptionDisabled - Subscription is disabled.\n\n * 409 ServerAlreadyExists - Duplicate server name.\n\n * 409 ServerOverridePreconditionFailed - Failed to apply server override on category '{0}', because physical db or instance '{1}' in server '{2}' is currently not in 'Ready' or 'Deactivated' state.\n\n * 409 ServerDisabled - Server is disabled.\n\n * 409 ManagedInstanceIsBusy - The server '{0}' is currently busy. Please wait a few minutes before trying again.\n\n * 409 ServerQuotaExceeded - Server cannot be added to a subscription because it will exceed quota.\n\n * 409 ConflictingManagedInstanceOperation - An operation is currently in progress for the managed instance.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation.\n\n * 500 GatewayInternalServerError - The server encountered an unexpected exception.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout." + "description": "*** Error Responses: ***\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 HkCannotSwitchToInactive - The database cannot proceed with pricing-tier update as it has memory-optimized objects. Please drop such objects and try again.\n\n * 400 ManagedInstanceInvalidStorageSizeLessThenCurrentSizeUsed - Invalid storage size: Storage size limit ({0} GB) is less that current storage used ({1} GB). Please specify higher storage size limit.\n\n * 400 InstanceTimezoneUpdateNotSupported - Instance timezone update not supported.\n\n * 400 CreateManagedInstanceWithNonDefaultTimezoneNotSupported - Create Managed Instance with non-default timezone not supported.\n\n * 400 ManagedInstanceIpAddressRangeLimit - Cannot create a Managed Instance as there are not enough available ip addresses in the selected subnet\n\n * 400 VnetDelegationNotAllowed - User tried to inject Managed Server to subnet which is delegated.\n\n * 400 SubnetHasResourcesOfDifferentType - User tried to create MI in subnet that has resources of different type.\n\n * 400 UpdateManagedServerWithMaintenanceWindowNotAllowed - Update of Managed Instance with maintenance window settings is not allowed.\n\n * 400 VnetPrepareNIPFailed - User tried to prepare subnet that has a conflict with NetworkIntentPolicy.\n\n * 400 InvalidUsername - Supplied user name contains invalid characters.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 InstancePoolNotEnoughCapacity - An instance pool does not have enough capacity\n\n * 400 ServerNotFound - The requested server was not found.\n\n * 400 TokenTooLong - The provided token is too long.\n\n * 400 ManagedInstanceSloUpdateFailed - SLO '{0}' operation cannot succeed as the memory usage of '{1}' exceeds the quota.\n\n * 400 ManagedInstanceLocalStorageUpdateSloDisabled - Update SLO for managed instances with local storage is not supported yet.\n\n * 400 InvalidLoginName - The provided login name is invalid.\n\n * 400 RegionDoesNotSupportVersion - A user attempted to create a server of a specified version in a location where that server version isn't supported.\n\n * 400 PasswordTooShort - The provided password is too short\n\n * 400 PasswordTooLong - The provided password is too long.\n\n * 400 PasswordNotComplex - The provided password is not complex enough.\n\n * 400 GatewayInvalidEdition - '{0}' is not a valid database edition in this version of SQL Server.\n\n * 400 InvalidSubnetResourceId - The provided subnet resource ID for the managed instance create or update is invalid.\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 InvalidLocation - An invalid location was specified.\n\n * 400 VnetInWrongRegion - Virtual network is in wrong region.\n\n * 400 InvalidServerName - Invalid server name specified.\n\n * 400 VnetAddressRangeError - Virtual network address range is invalid.\n\n * 400 VnetConfigIsNotAllowed - Virtual network configuration is not allowed.\n\n * 400 InvalidCollation - Invalid collation.\n\n * 400 InvalidIdentifier - The identifier contains NULL or an invalid unicode character.\n\n * 400 ManagedInstanceClassicVnetNotSupported - Managed Instance cannot be joined to a classic virtual network.\n\n * 400 AlterDbDeactivatedNotSupported - Database Operation failed for Server '{0}', Database '{1}' due to unexpected delay. Please try again.\n\n * 400 RegionDoesNotAllowProvisioning - The selected location is not accepting new Windows Azure SQL Database servers. This may change at a later time.\n\n * 400 VnetConfigHasNsg - User tried to inject Managed Server subnet with Network Security Groups.\n\n * 400 VnetConfigHasNoUdr - User tried to inject Managed Server subnet without default User Defined Route Table.\n\n * 400 VnetConfigHasInvalidUdr - User tried to inject Managed Server subnet with invalid User Defined Route Table.\n\n * 400 VnetConfigHasInvalidDns - User tried to inject Managed Server subnet with invalid custom DNS.\n\n * 400 VnetConfigHasServiceEndpoints - User tried to inject Managed Server subnet with service endpoints.\n\n * 400 VnetSubnetIsInUse - User tried to inject Managed Server subnet that is not empty.\n\n * 400 VnetSubnetIsLocked - User tried to inject Managed Server subnet that is in locked scope.\n\n * 400 VnetSubnetIsGateway - User tried to inject Managed Server subnet that is Gateway subnet.\n\n * 400 VnetSubnetIsUnknown - User tried to inject Managed Server subnet that does not exist.\n\n * 400 VnetSubnetConflictWithIntendedPolicy - User tried to inject Managed Server subnet that has a conflict with IntendedPolicy.\n\n * 400 NameAlreadyExists - The provided name already exists.\n\n * 400 ManagedInstanceInvalidEditionForSku - The specified edition {0} is not consistent with the specified SKU {1}.\n\n * 400 ProvisioningDisabled - Displays error message from resources operation authorizer as is, without changes\n\n * 400 ManagedInstanceInvalidLicenseType - The specified license type {0} is not valid.\n\n * 400 ManagedInstanceUpdateSloInProgress - \"The operation could not be completed because a service tier change is in progress for managed instance '{0}.' Please wait for the operation in progress to complete and try again.\"\n\n * 400 VnetResourceNotFound - Resource not found: '{0}'.\n\n * 400 InvalidTimezone - Invalid timezone.\n\n * 400 UnableToResolveRemoteServer - The remote partner server name could not be resolved due to an invalid server name or DNS connectivity issues.\n\n * 400 InstanceCollationUpdateNotSupported - User cannot change instance collation on Managed Instance.\n\n * 400 CreateManagedInstanceWithNonDefaultCollationNotSupported - User can create a Managed Instance only with collation 'SQL_Latin1_General_CP1_CI_AS'.\n\n * 400 ManagedInstanceOperationInProgress - The operation could not be completed because {0} operation is in progress. Please wait for the operation in progress to complete and try again.\n\n * 400 ManagedInstanceExceedMaxAzureStorage - The operation could not be completed because total allocated storage size for General Purpose instance would exceed {0}. Please reduce the number of database files and retry operation.\n\n * 400 ManagedInstanceHasGeoReplica - The operation could not be completed because instance has configured geo replicated secondary instance.\n\n * 400 InvalidManagedServerDnsZonePartner - The resource URI of the geo-primary managed instance specified in the create request is invalid. Please ensure that the property is of the format /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/managedInstances/{managedInstanceName}\n\n * 400 ProvisioningDisabled - Displays error message from resources operation authorizer as is, without changes\n\n * 400 ManagementServiceFeatureDisabled - User attempted to use a feature which is disabled.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 InvalidMinimalTlsVersion - Invalid minimal TLS version.\n\n * 400 InvalidMaintenanceWindowSettings - Invalid maintenance window settings.\n\n * 400 InvalidMaintenanceWindowProperty - Invalid maintenance window property was specified.\n\n * 400 InvalidMaintenanceWindowPropertyNull - Invalid maintenance window with required properties null.\n\n * 400 InvalidMaintenanceWindowTypeWithPropertySpecified - Maintenance window type must not have certain properties specified.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 404 ResourceDoesNotExist - Resource with the name '{0}' does not exist. To continue, specify a valid resource name.\n\n * 404 ResourceNotFound - The requested resource was not found.\n\n * 405 InvalidVcoreValue - vCore value {0} is not valid. Please specify a valid vCore value.\n\n * 405 InvalidHardwareGenerationValue - HardwareGeneration {0} is not valid. Please specify a valid HardwareGeneration value.\n\n * 405 InvalidStorageSizeValue - \"Invalid storage size: {0} GB. Storage size must be specified between {1} and {2} gigabytes, in increments of {3} GB.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 409 ConflictingServerOperation - An operation is currently in progress for the server.\n\n * 409 SubscriptionDisabled - Subscription is disabled.\n\n * 409 ServerAlreadyExists - Duplicate server name.\n\n * 409 ServerOverridePreconditionFailed - Failed to apply server override on category '{0}', because physical db or instance '{1}' in server '{2}' is currently not in 'Ready' or 'Deactivated' state.\n\n * 409 ServerDisabled - Server is disabled.\n\n * 409 ManagedInstanceIsBusy - The server '{0}' is currently busy. Please wait a few minutes before trying again.\n\n * 409 ServerQuotaExceeded - Server cannot be added to a subscription because it will exceed quota.\n\n * 409 ConflictingManagedInstanceOperation - An operation is currently in progress for the managed instance.\n\n * 409 MiDropFailedOnAuthLocks - User tried to drop last Managed Instance in subnet that has Lock applied on resource(s).\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation.\n\n * 500 GatewayInternalServerError - The server encountered an unexpected exception.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout." }, "202": { "description": "Accepted" @@ -276,7 +276,7 @@ } }, "default": { - "description": "*** Error Responses: ***\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 HkCannotSwitchToInactive - The database cannot proceed with pricing-tier update as it has memory-optimized objects. Please drop such objects and try again.\n\n * 400 ManagedInstanceInvalidStorageSizeLessThenCurrentSizeUsed - Invalid storage size: Storage size limit ({0} GB) is less that current storage used ({1} GB). Please specify higher storage size limit.\n\n * 400 InstanceTimezoneUpdateNotSupported - Instance timezone update not supported.\n\n * 400 CreateManagedInstanceWithNonDefaultTimezoneNotSupported - Create Managed Instance with non-default timezone not supported.\n\n * 400 ManagedInstanceIpAddressRangeLimit - Cannot create a Managed Instance as there are not enough available ip addresses in the selected subnet\n\n * 400 VnetDelegationNotAllowed - User tried to inject Managed Server to subnet which is delegated.\n\n * 400 SubnetHasResourcesOfDifferentType - User tried to create MI in subnet that has resources of different type.\n\n * 400 InvalidUsername - Supplied user name contains invalid characters.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 InstancePoolNotEnoughCapacity - An instance pool does not have enough vCore capacity\n\n * 400 ServerNotFound - The requested server was not found.\n\n * 400 TokenTooLong - The provided token is too long.\n\n * 400 ManagedInstanceSloUpdateFailed - SLO '{0}' operation cannot succeed as the memory usage of '{1}' exceeds the quota.\n\n * 400 ManagedInstanceLocalStorageUpdateSloDisabled - Update SLO for managed instances with local storage is not supported yet.\n\n * 400 InvalidLoginName - The provided login name is invalid.\n\n * 400 RegionDoesNotSupportVersion - A user attempted to create a server of a specified version in a location where that server version isn't supported.\n\n * 400 PasswordTooShort - The provided password is too short\n\n * 400 PasswordTooLong - The provided password is too long.\n\n * 400 PasswordNotComplex - The provided password is not complex enough.\n\n * 400 GatewayInvalidEdition - '{0}' is not a valid database edition in this version of SQL Server.\n\n * 400 InvalidSubnetResourceId - The provided subnet resource ID for the managed instance create or update is invalid.\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 InvalidLocation - An invalid location was specified.\n\n * 400 VnetInWrongRegion - Virtual network is in wrong region.\n\n * 400 InvalidServerName - Invalid server name specified.\n\n * 400 VnetAddressRangeError - Virtual network address range is invalid.\n\n * 400 VnetConfigIsNotAllowed - Virtual network configuration is not allowed.\n\n * 400 InvalidCollation - Invalid collation.\n\n * 400 InvalidIdentifier - The identifier contains NULL or an invalid unicode character.\n\n * 400 ManagedInstanceClassicVnetNotSupported - Managed Instance cannot be joined to a classic virtual network.\n\n * 400 AlterDbDeactivatedNotSupported - Database Operation failed for Server '{0}', Database '{1}' due to unexpected delay. Please try again.\n\n * 400 RegionDoesNotAllowProvisioning - The selected location is not accepting new Windows Azure SQL Database servers. This may change at a later time.\n\n * 400 VnetConfigHasNsg - User tried to inject Managed Server subnet with Network Security Groups.\n\n * 400 VnetConfigHasNoUdr - User tried to inject Managed Server subnet without default User Defined Route Table.\n\n * 400 VnetConfigHasInvalidUdr - User tried to inject Managed Server subnet with invalid User Defined Route Table.\n\n * 400 VnetConfigHasInvalidDns - User tried to inject Managed Server subnet with invalid custom DNS.\n\n * 400 VnetConfigHasServiceEndpoints - User tried to inject Managed Server subnet with service endpoints.\n\n * 400 VnetSubnetIsInUse - User tried to inject Managed Server subnet that is not empty.\n\n * 400 VnetSubnetIsLocked - User tried to inject Managed Server subnet that is in locked scope.\n\n * 400 VnetSubnetIsGateway - User tried to inject Managed Server subnet that is Gateway subnet.\n\n * 400 VnetSubnetIsUnknown - User tried to inject Managed Server subnet that does not exist.\n\n * 400 VnetSubnetConflictWithIntendedPolicy - User tried to inject Managed Server subnet that has a conflict with IntendedPolicy.\n\n * 400 NameAlreadyExists - The provided name already exists.\n\n * 400 ManagedInstanceInvalidEditionForSku - The specified edition {0} is not consistent with the specified SKU {1}.\n\n * 400 ProvisioningDisabled - Displays error message from resources operation authorizer as is, without changes\n\n * 400 ManagedInstanceInvalidLicenseType - The specified license type {0} is not valid.\n\n * 400 ManagedInstanceUpdateSloInProgress - \"The operation could not be completed because a service tier change is in progress for managed instance '{0}.' Please wait for the operation in progress to complete and try again.\"\n\n * 400 VnetResourceNotFound - Resource not found: '{0}'.\n\n * 400 InvalidTimezone - Invalid timezone.\n\n * 400 UnableToResolveRemoteServer - The remote partner server name could not be resolved due to an invalid server name or DNS connectivity issues.\n\n * 400 InstanceCollationUpdateNotSupported - User cannot change instance collation on Managed Instance.\n\n * 400 CreateManagedInstanceWithNonDefaultCollationNotSupported - User can create a Managed Instance only with collation 'SQL_Latin1_General_CP1_CI_AS'.\n\n * 400 ManagedInstanceOperationInProgress - The operation could not be completed because {0} operation is in progress. Please wait for the operation in progress to complete and try again.\n\n * 400 ManagedInstanceExceedMaxAzureStorage - The operation could not be completed because total allocated storage size for General Purpose instance would exceed {0}. Please reduce the number of database files and retry operation.\n\n * 400 ManagedInstanceHasGeoReplica - The operation could not be completed because instance has configured geo replicated secondary instance.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 404 ResourceDoesNotExist - Resource with the name '{0}' does not exist. To continue, specify a valid resource name.\n\n * 404 ResourceNotFound - The requested resource was not found.\n\n * 405 InvalidVcoreValue - vCore value {0} is not valid. Please specify a valid vCore value.\n\n * 405 InvalidHardwareGenerationValue - HardwareGeneration {0} is not valid. Please specify a valid HardwareGeneration value.\n\n * 405 InvalidStorageSizeValue - \"Invalid storage size: {0} GB. Storage size must be specified between {1} and {2} gigabytes, in increments of {3} GB.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 409 ConflictingServerOperation - An operation is currently in progress for the server.\n\n * 409 SubscriptionDisabled - Subscription is disabled.\n\n * 409 ServerAlreadyExists - Duplicate server name.\n\n * 409 ServerOverridePreconditionFailed - Failed to apply server override on category '{0}', because physical db or instance '{1}' in server '{2}' is currently not in 'Ready' or 'Deactivated' state.\n\n * 409 ServerDisabled - Server is disabled.\n\n * 409 ManagedInstanceIsBusy - The server '{0}' is currently busy. Please wait a few minutes before trying again.\n\n * 409 ServerQuotaExceeded - Server cannot be added to a subscription because it will exceed quota.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation.\n\n * 500 GatewayInternalServerError - The server encountered an unexpected exception.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout." + "description": "*** Error Responses: ***\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 HkCannotSwitchToInactive - The database cannot proceed with pricing-tier update as it has memory-optimized objects. Please drop such objects and try again.\n\n * 400 ManagedInstanceInvalidStorageSizeLessThenCurrentSizeUsed - Invalid storage size: Storage size limit ({0} GB) is less that current storage used ({1} GB). Please specify higher storage size limit.\n\n * 400 InstanceTimezoneUpdateNotSupported - Instance timezone update not supported.\n\n * 400 CreateManagedInstanceWithNonDefaultTimezoneNotSupported - Create Managed Instance with non-default timezone not supported.\n\n * 400 ManagedInstanceIpAddressRangeLimit - Cannot create a Managed Instance as there are not enough available ip addresses in the selected subnet\n\n * 400 VnetDelegationNotAllowed - User tried to inject Managed Server to subnet which is delegated.\n\n * 400 SubnetHasResourcesOfDifferentType - User tried to create MI in subnet that has resources of different type.\n\n * 400 UpdateManagedServerWithMaintenanceWindowNotAllowed - Update of Managed Instance with maintenance window settings is not allowed.\n\n * 400 VnetPrepareNIPFailed - User tried to prepare subnet that has a conflict with NetworkIntentPolicy.\n\n * 400 InvalidUsername - Supplied user name contains invalid characters.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 InstancePoolNotEnoughCapacity - An instance pool does not have enough capacity\n\n * 400 ServerNotFound - The requested server was not found.\n\n * 400 TokenTooLong - The provided token is too long.\n\n * 400 ManagedInstanceSloUpdateFailed - SLO '{0}' operation cannot succeed as the memory usage of '{1}' exceeds the quota.\n\n * 400 ManagedInstanceLocalStorageUpdateSloDisabled - Update SLO for managed instances with local storage is not supported yet.\n\n * 400 InvalidLoginName - The provided login name is invalid.\n\n * 400 RegionDoesNotSupportVersion - A user attempted to create a server of a specified version in a location where that server version isn't supported.\n\n * 400 PasswordTooShort - The provided password is too short\n\n * 400 PasswordTooLong - The provided password is too long.\n\n * 400 PasswordNotComplex - The provided password is not complex enough.\n\n * 400 GatewayInvalidEdition - '{0}' is not a valid database edition in this version of SQL Server.\n\n * 400 InvalidSubnetResourceId - The provided subnet resource ID for the managed instance create or update is invalid.\n\n * 400 SubscriptionNotFound - The requested subscription was not found.\n\n * 400 InvalidLocation - An invalid location was specified.\n\n * 400 VnetInWrongRegion - Virtual network is in wrong region.\n\n * 400 InvalidServerName - Invalid server name specified.\n\n * 400 VnetAddressRangeError - Virtual network address range is invalid.\n\n * 400 VnetConfigIsNotAllowed - Virtual network configuration is not allowed.\n\n * 400 InvalidCollation - Invalid collation.\n\n * 400 InvalidIdentifier - The identifier contains NULL or an invalid unicode character.\n\n * 400 ManagedInstanceClassicVnetNotSupported - Managed Instance cannot be joined to a classic virtual network.\n\n * 400 AlterDbDeactivatedNotSupported - Database Operation failed for Server '{0}', Database '{1}' due to unexpected delay. Please try again.\n\n * 400 RegionDoesNotAllowProvisioning - The selected location is not accepting new Windows Azure SQL Database servers. This may change at a later time.\n\n * 400 VnetConfigHasNsg - User tried to inject Managed Server subnet with Network Security Groups.\n\n * 400 VnetConfigHasNoUdr - User tried to inject Managed Server subnet without default User Defined Route Table.\n\n * 400 VnetConfigHasInvalidUdr - User tried to inject Managed Server subnet with invalid User Defined Route Table.\n\n * 400 VnetConfigHasInvalidDns - User tried to inject Managed Server subnet with invalid custom DNS.\n\n * 400 VnetConfigHasServiceEndpoints - User tried to inject Managed Server subnet with service endpoints.\n\n * 400 VnetSubnetIsInUse - User tried to inject Managed Server subnet that is not empty.\n\n * 400 VnetSubnetIsLocked - User tried to inject Managed Server subnet that is in locked scope.\n\n * 400 VnetSubnetIsGateway - User tried to inject Managed Server subnet that is Gateway subnet.\n\n * 400 VnetSubnetIsUnknown - User tried to inject Managed Server subnet that does not exist.\n\n * 400 VnetSubnetConflictWithIntendedPolicy - User tried to inject Managed Server subnet that has a conflict with IntendedPolicy.\n\n * 400 NameAlreadyExists - The provided name already exists.\n\n * 400 ManagedInstanceInvalidEditionForSku - The specified edition {0} is not consistent with the specified SKU {1}.\n\n * 400 ProvisioningDisabled - Displays error message from resources operation authorizer as is, without changes\n\n * 400 ManagedInstanceInvalidLicenseType - The specified license type {0} is not valid.\n\n * 400 ManagedInstanceUpdateSloInProgress - \"The operation could not be completed because a service tier change is in progress for managed instance '{0}.' Please wait for the operation in progress to complete and try again.\"\n\n * 400 VnetResourceNotFound - Resource not found: '{0}'.\n\n * 400 InvalidTimezone - Invalid timezone.\n\n * 400 UnableToResolveRemoteServer - The remote partner server name could not be resolved due to an invalid server name or DNS connectivity issues.\n\n * 400 InstanceCollationUpdateNotSupported - User cannot change instance collation on Managed Instance.\n\n * 400 CreateManagedInstanceWithNonDefaultCollationNotSupported - User can create a Managed Instance only with collation 'SQL_Latin1_General_CP1_CI_AS'.\n\n * 400 ManagedInstanceOperationInProgress - The operation could not be completed because {0} operation is in progress. Please wait for the operation in progress to complete and try again.\n\n * 400 ManagedInstanceExceedMaxAzureStorage - The operation could not be completed because total allocated storage size for General Purpose instance would exceed {0}. Please reduce the number of database files and retry operation.\n\n * 400 ManagedInstanceHasGeoReplica - The operation could not be completed because instance has configured geo replicated secondary instance.\n\n * 400 ProvisioningDisabled - Displays error message from resources operation authorizer as is, without changes\n\n * 400 ManagementServiceFeatureDisabled - User attempted to use a feature which is disabled.\n\n * 400 MismatchingResourceGroupNameWithUrl - The provided resource group name did not match the name in the Url.\n\n * 400 MismatchingSubscriptionWithUrl - The provided subscription did not match the subscription in the Url.\n\n * 400 InvalidMinimalTlsVersion - Invalid minimal TLS version.\n\n * 400 InvalidMaintenanceWindowSettings - Invalid maintenance window settings.\n\n * 400 InvalidMaintenanceWindowProperty - Invalid maintenance window property was specified.\n\n * 400 InvalidMaintenanceWindowPropertyNull - Invalid maintenance window with required properties null.\n\n * 400 InvalidMaintenanceWindowTypeWithPropertySpecified - Maintenance window type must not have certain properties specified.\n\n * 404 ServerNotInSubscription - Specified server does not exist on the specified subscription.\n\n * 404 ManagedInstanceNotInSubscriptionResourceGroup - Specified managed instance does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 404 ResourceDoesNotExist - Resource with the name '{0}' does not exist. To continue, specify a valid resource name.\n\n * 404 ResourceNotFound - The requested resource was not found.\n\n * 405 InvalidVcoreValue - vCore value {0} is not valid. Please specify a valid vCore value.\n\n * 405 InvalidHardwareGenerationValue - HardwareGeneration {0} is not valid. Please specify a valid HardwareGeneration value.\n\n * 405 InvalidStorageSizeValue - \"Invalid storage size: {0} GB. Storage size must be specified between {1} and {2} gigabytes, in increments of {3} GB.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 409 ConflictingServerOperation - An operation is currently in progress for the server.\n\n * 409 SubscriptionDisabled - Subscription is disabled.\n\n * 409 ServerAlreadyExists - Duplicate server name.\n\n * 409 ServerOverridePreconditionFailed - Failed to apply server override on category '{0}', because physical db or instance '{1}' in server '{2}' is currently not in 'Ready' or 'Deactivated' state.\n\n * 409 ServerDisabled - Server is disabled.\n\n * 409 ManagedInstanceIsBusy - The server '{0}' is currently busy. Please wait a few minutes before trying again.\n\n * 409 ServerQuotaExceeded - Server cannot be added to a subscription because it will exceed quota.\n\n * 409 ConflictingManagedInstanceOperation - An operation is currently in progress for the managed instance.\n\n * 409 MiDropFailedOnAuthLocks - User tried to drop last Managed Instance in subnet that has Lock applied on resource(s).\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 ConflictingSubscriptionOperation - An operation is currently in progress for the subscription.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation.\n\n * 500 GatewayInternalServerError - The server encountered an unexpected exception.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout." }, "202": { "description": "Accepted" @@ -484,6 +484,10 @@ "instancePoolId": { "description": "The Id of the instance pool this managed server belongs to.", "type": "string" + }, + "minimalTlsVersion": { + "description": "Minimal TLS version. Allowed values: 'None', '1.0', '1.1', '1.2'", + "type": "string" } } }, From 73aeb3aa1a268babe5d127763ce63c35fd3124ff Mon Sep 17 00:00:00 2001 From: Zhenfeng Date: Tue, 25 Feb 2020 18:24:58 -0800 Subject: [PATCH 34/47] [SRP] Add blob service property for container soft delete (#8498) --- .../Microsoft.Storage/stable/2019-06-01/blob.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json index 1b94c675d44d..f865b407ee2e 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json @@ -1151,6 +1151,10 @@ "restorePolicy": { "$ref": "#/definitions/RestorePolicyProperties", "description": "The blob service properties for blob restore policy." + }, + "containerDeleteRetentionPolicy": { + "$ref": "./common.json#/definitions/DeleteRetentionPolicy", + "description": "The blob service properties for container soft delete." } }, "x-ms-client-flatten": true, From 08623d4e761e2a8e1e35d1b7e91200c9eae58b08 Mon Sep 17 00:00:00 2001 From: Akashdeep Goel Date: Tue, 25 Feb 2020 18:25:36 -0800 Subject: [PATCH 35/47] Adds 'Offline' state to provisioning states. (#8509) --- .../Microsoft.DocumentDB/stable/2014-04-01/cosmos-db.json | 2 +- .../Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json | 2 +- .../Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json | 2 +- .../Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json | 2 +- .../Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json | 2 +- .../Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json | 2 +- .../Microsoft.DocumentDB/stable/2019-12-12/cosmos-db.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2014-04-01/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2014-04-01/cosmos-db.json index f9befa81ebd8..290d43b6d86b 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2014-04-01/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2014-04-01/cosmos-db.json @@ -5407,7 +5407,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json index 15b7e026040c..ec9d0a43df71 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json @@ -5407,7 +5407,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json index 34dfff0507c9..52d608c353e1 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-11-06/cosmos-db.json @@ -5407,7 +5407,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json index 42a73a42fa75..694a001a49d5 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-19/cosmos-db.json @@ -5407,7 +5407,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json index 92390fe5f059..0749e8250a8c 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2016-03-31/cosmos-db.json @@ -5407,7 +5407,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json index bb598950972e..72783056d1fa 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json @@ -6543,7 +6543,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-12-12/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-12-12/cosmos-db.json index 811f30368509..3bb80bd08213 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-12-12/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2019-12-12/cosmos-db.json @@ -6608,7 +6608,7 @@ "ProvisioningState": { "type": "string", "readOnly": true, - "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation." + "description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'Offline' - the Cosmos DB account is not active." }, "IPRangeFilter": { "type": "string", From bef5210b95230216509528cbc68efcf015bf7ae8 Mon Sep 17 00:00:00 2001 From: Lei Ni <7233663+leni-msft@users.noreply.github.com> Date: Wed, 26 Feb 2020 11:14:18 +0800 Subject: [PATCH 36/47] Fix x-ms-enum name conflict (#8465) --- .../Microsoft.Storage/stable/2018-11-01/storage.json | 2 +- .../Microsoft.Storage/stable/2019-04-01/storage.json | 2 +- .../Microsoft.Storage/stable/2019-06-01/storage.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2018-11-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2018-11-01/storage.json index 8f187ea9c8d5..d131e422a4bd 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2018-11-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2018-11-01/storage.json @@ -2202,7 +2202,7 @@ "Lifecycle" ], "x-ms-enum": { - "name": "type", + "name": "RuleType", "modelAsString": true } }, diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json index cc80de97f8a6..8ce581604c9e 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json @@ -2319,7 +2319,7 @@ "Lifecycle" ], "x-ms-enum": { - "name": "type", + "name": "RuleType", "modelAsString": true } }, diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json index 5cb20dc4a99f..6ff4cd6a3e02 100644 --- a/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json +++ b/specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json @@ -2933,7 +2933,7 @@ "Lifecycle" ], "x-ms-enum": { - "name": "type", + "name": "RuleType", "modelAsString": true } }, From 17d476740a9ddd43ced9eaaa13f8798c8e7fdbb9 Mon Sep 17 00:00:00 2001 From: Filiz Topatan Date: Tue, 25 Feb 2020 20:38:56 -0800 Subject: [PATCH 37/47] [Deployment Scripts] Deployment scripts error model update (#8481) --- .../2019-10-01-preview/deploymentScripts.json | 45 ++++++------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json index 9d8588cdc097..408639f7e3fc 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json @@ -89,7 +89,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } } @@ -137,7 +137,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } } @@ -177,7 +177,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } } @@ -217,7 +217,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } } @@ -253,7 +253,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } }, @@ -298,7 +298,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } } @@ -340,7 +340,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } } @@ -379,7 +379,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "#/definitions/DeploymentScriptsError" } } }, @@ -676,7 +676,7 @@ }, "error": { "description": "Error that is relayed from the script execution.", - "$ref": "#/definitions/DefaultErrorResponse" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } } }, @@ -817,30 +817,13 @@ } } }, - "DefaultErrorResponse": { - "description": "The details of the error.", - "type": "object", + "DeploymentScriptsError": { "properties": { - "code": { - "description": "One of a server-defined set of error codes.", - "type": "string" - }, - "message": { - "description": "A human-readable representation of the error.", - "type": "string" - }, - "target": { - "description": "The target of the particular error.", - "type": "string" - }, - "details": { - "description": "Detailed errors.", - "type": "array", - "items": { - "$ref": "#/definitions/DefaultErrorResponse" - } + "error": { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse" } - } + }, + "description": "Deployment scripts error response." } }, "parameters": { From 443fe6f9e4633f70f2e7beac4f94d5931cd1ab81 Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Wed, 26 Feb 2020 13:16:08 +0800 Subject: [PATCH 38/47] add package-subscriptions-2019-11 (#8503) --- .../resources/resource-manager/readme.md | 24 +++++++++---------- .../resource-manager/readme.python.md | 12 ++++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md index 1b4315896c9e..bd936dba4148 100644 --- a/specification/resources/resource-manager/readme.md +++ b/specification/resources/resource-manager/readme.md @@ -45,7 +45,7 @@ tag: package-resources-2019-10 ``` ``` yaml $(package-subscriptions) -tag: package-subscriptions-2019-06 +tag: package-subscriptions-2019-11 ``` ``` yaml $(package-links) @@ -57,19 +57,10 @@ tag: package-managedapplications-2018-06 ``` ``` yaml $(package-deploymentscripts) -tag: package-2019-11 +tag: package-deploymentscripts-2019-10-preview ``` - -### Tag: package-2019-11 - -These settings apply only when `--tag=package-2019-11` is specified on the command line. - -```yaml $(tag) == 'package-2019-11' -input-file: - - Microsoft.Resources/stable/2019-11-01/subscriptions.json -``` -### Tag: package-resources-2019-10-preview +### Tag: package-deploymentscripts-2019-10-preview These settings apply only when `--tag=package-deploymentscripts-2019-10-preview` is specified on the command line. @@ -358,6 +349,15 @@ input-file: - Microsoft.Resources/stable/2015-11-01/resources.json ``` +### Tag: package-subscriptions-2019-11 + +These settings apply only when `--tag=package-subscriptions-2019-11` is specified on the command line. + +``` yaml $(tag) == 'package-subscriptions-2019-11' +input-file: +- Microsoft.Resources/stable/2019-11-01/subscriptions.json +``` + ### Tag: package-subscriptions-2019-06 These settings apply only when `--tag=package-subscriptions-2019-06` is specified on the command line. diff --git a/specification/resources/resource-manager/readme.python.md b/specification/resources/resource-manager/readme.python.md index 2a224e187743..811fa34d4d9c 100644 --- a/specification/resources/resource-manager/readme.python.md +++ b/specification/resources/resource-manager/readme.python.md @@ -45,6 +45,7 @@ batch: - tag: package-resources-2017-05 - tag: package-resources-2016-09 - tag: package-resources-2016-02 + - tag: package-subscriptions-2019-11 - tag: package-subscriptions-2019-06 - tag: package-subscriptions-2018-06 - tag: package-subscriptions-2016-06 @@ -314,6 +315,17 @@ python: output-folder: $(python-sdks-folder)/resources/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_02_01 ``` +### Tag: package-subscriptions-2019-11 and python + +These settings apply only when `--tag=package-subscriptions-2019-11 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-subscriptions-2019-11' && $(python) +python: + namespace: azure.mgmt.resource.subscriptions.v2019_11_01 + output-folder: $(python-sdks-folder)/resources/azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2019_11_01 +``` + ### Tag: package-subscriptions-2019-06 and python These settings apply only when `--tag=package-subscriptions-2019-06 --python` is specified on the command line. From 0061ab32649535d6f135a7b7e8ead7a06cc1b202 Mon Sep 17 00:00:00 2001 From: azuresdkci Date: Wed, 26 Feb 2020 05:17:17 +0000 Subject: [PATCH 39/47] regenerated all-api-versions --- specification/resources/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/readme.md b/specification/resources/resource-manager/readme.md index bd936dba4148..24bf2e9957bc 100644 --- a/specification/resources/resource-manager/readme.md +++ b/specification/resources/resource-manager/readme.md @@ -612,7 +612,6 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: - - $(this-folder)/Microsoft.Resources/stable/2019-11-01/subscriptions.json - $(this-folder)/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json - $(this-folder)/Microsoft.Features/stable/2015-12-01/features.json - $(this-folder)/Microsoft.Authorization/stable/2016-09-01/locks.json @@ -651,6 +650,7 @@ input-file: - $(this-folder)/Microsoft.Resources/stable/2016-07-01/resources.json - $(this-folder)/Microsoft.Resources/stable/2016-02-01/resources.json - $(this-folder)/Microsoft.Resources/stable/2015-11-01/resources.json + - $(this-folder)/Microsoft.Resources/stable/2019-11-01/subscriptions.json - $(this-folder)/Microsoft.Resources/stable/2019-06-01/subscriptions.json - $(this-folder)/Microsoft.Resources/stable/2018-06-01/subscriptions.json - $(this-folder)/Microsoft.Resources/stable/2016-06-01/subscriptions.json From 7752e1575955c38641d577551db23ca01667d96a Mon Sep 17 00:00:00 2001 From: abebts2000 <54288923+abebts2000@users.noreply.github.com> Date: Wed, 26 Feb 2020 12:37:57 -0800 Subject: [PATCH 40/47] Added redis cache publisher schema for azure event grid. (#8486) * Added redis cache Event Schema to Event Grid DP Repo * removed commented section --- .../stable/2018-01-01/RedisCache.json | 87 +++++++++++++++++++ specification/eventgrid/data-plane/readme.md | 2 + 2 files changed, 89 insertions(+) create mode 100644 specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json diff --git a/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json b/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json new file mode 100644 index 000000000000..7bab3caac3a0 --- /dev/null +++ b/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json @@ -0,0 +1,87 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-01-01", + "title": "Schema of Redis Cache events published to Azure Event Grid", + "description": "Describes the schema of the Redis Cache events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent." + }, + "paths": {}, + "definitions": { + "RedisPatchingCompletedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Cache.PatchingCompleted event.", + "type": "object", + "properties": { + "timestamp": { + "description": "The time at which the event occurred.", + "format": "date-time", + "type": "string" + }, + "name": { + "description": "The name of this event.", + "type": "string" + }, + "status": { + "description": "The status of this event. Failed or succeeded ", + "type": "string" + } + } + }, + "RedisScalingCompletedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Cache.ScalingCompleted event.", + "type": "object", + "properties": { + "timestamp": { + "description": "The time at which the event occurred.", + "format": "date-time", + "type": "string" + }, + "name": { + "description": "The name of this event.", + "type": "string" + }, + "status": { + "description": "The status of this event. Failed or succeeded ", + "type": "string" + } + } + }, + "RedisExportRDBCompletedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Cache.ExportRDBCompleted event.", + "type": "object", + "properties": { + "timestamp": { + "description": "The time at which the event occurred.", + "format": "date-time", + "type": "string" + }, + "name": { + "description": "The name of this event.", + "type": "string" + }, + "status": { + "description": "The status of this event. Failed or succeeded ", + "type": "string" + } + } + }, + "RedisImportRDBCompletedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Cache.ImportRDBCompleted event.", + "type": "object", + "properties": { + "timestamp": { + "description": "The time at which the event occurred.", + "format": "date-time", + "type": "string" + }, + "name": { + "description": "The name of this event.", + "type": "string" + }, + "status": { + "description": "The status of this event. Failed or succeeded ", + "type": "string" + } + } + } + } +} diff --git a/specification/eventgrid/data-plane/readme.md b/specification/eventgrid/data-plane/readme.md index 9d7fa706249b..aa5a71eb52c0 100644 --- a/specification/eventgrid/data-plane/readme.md +++ b/specification/eventgrid/data-plane/readme.md @@ -57,6 +57,7 @@ input-file: - Microsoft.SignalRService/stable/2018-01-01/SignalRService.json - Microsoft.KeyVault/stable/2018-01-01/KeyVault.json - Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json +- Microsoft.Cache/stable/2018-01-01/RedisCache.json ``` --- @@ -137,6 +138,7 @@ input-file: - $(this-folder)/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json - $(this-folder)/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json - $(this-folder)/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json + - $(this-folder)/Microsoft.Cache/stable/2018-01-01/RedisCache.json ``` From b3895f12b09d3d43a90f348bc85afbe2ae5cea88 Mon Sep 17 00:00:00 2001 From: gkostal Date: Wed, 26 Feb 2020 16:37:10 -0800 Subject: [PATCH 41/47] [Hub Generated] Review request for Microsoft.Attestation to add version preview/2018-09-01-preview (#8478) --- .../2018-09-01-preview/attestation.json | 107 +++++++++++++++++- .../examples/Create_AttestationProvider.json | 28 +++-- .../examples/Delete_AttestationProvider.json | 5 +- .../examples/Get_AttestationProvider.json | 16 ++- .../Get_AttestationProvidersList.json | 6 +- ...testationProvidersListByResourceGroup.json | 6 +- .../examples/Update_AttestationProvider.json | 35 ++++++ 7 files changed, 181 insertions(+), 22 deletions(-) create mode 100644 specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Update_AttestationProvider.json diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/attestation.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/attestation.json index bbee9ff59cd9..3813af740c8c 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/attestation.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/attestation.json @@ -63,7 +63,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Attestation/attestationProviders/{providerName}": { "get": { "tags": [ - "AttestationProvider" + "AttestationProviders" ], "operationId": "AttestationProviders_Get", "description": "Get the status of Attestation Provider.", @@ -107,7 +107,7 @@ }, "put": { "tags": [ - "AttestationProvider" + "AttestationProviders" ], "operationId": "AttestationProviders_Create", "description": "Creates or updates the Attestation Provider.", @@ -136,6 +136,7 @@ { "name": "creationParams", "in": "body", + "required": true, "description": "Client supplied parameters.", "schema": { "$ref": "#/definitions/AttestationServiceCreationParams" @@ -164,9 +165,63 @@ } } }, + "patch": { + "tags": [ + "AttestationProviders" + ], + "operationId": "AttestationProviders_Update", + "description": "Updates the Attestation Provider.", + "x-ms-examples": { + "AttestationProviders_Update": { + "$ref": "./examples/Update_AttestationProvider.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "name": "providerName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the attestation service" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "updateParams", + "in": "body", + "required": true, + "description": "Client supplied parameters.", + "schema": { + "$ref": "#/definitions/AttestationServicePatchParams" + }, + "x-ms-parameter-location": "method" + } + ], + "responses": { + "200": { + "description": "Updated attestation service", + "schema": { + "$ref": "#/definitions/AttestationProvider" + } + }, + "default": { + "description": "Error result from Attestation service", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + }, "delete": { "tags": [ - "AttestationProvider" + "AttestationProviders" ], "operationId": "AttestationProviders_Delete", "description": "Delete Attestation Service.", @@ -344,7 +399,7 @@ ], "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Resource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" } ], "properties": { @@ -363,6 +418,10 @@ "status" ], "properties": { + "trustModel": { + "type": "string", + "description": "Trust model for the attestation service instance." + }, "status": { "type": "string", "description": "Status of attestation service.", @@ -417,8 +476,46 @@ } } }, + "AttestationServicePatchParams": { + "description": "Parameters for patching an attestation service instance", + "x-ms-azure-resource": true, + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "The tags that will be assigned to the attestation service instance." + } + } + }, "AttestationServiceCreationParams": { - "description": "Client supplied parameters passed to attestation service.", + "description": "Parameters for creating an attestation service instance", + "required": [ + "location", + "properties" + ], + "x-ms-azure-resource": true, + "properties": { + "location": { + "type": "string", + "description": "The supported Azure location where the attestation service instance should be created." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "The tags that will be assigned to the attestation service instance." + }, + "properties": { + "$ref": "#/definitions/AttestationServiceCreationSpecificParams", + "description": "Properties of the attestation service instance" + } + } + }, + "AttestationServiceCreationSpecificParams": { + "description": "Client supplied parameters used to create a new attestation service instance.", "properties": { "attestationPolicy": { "type": "string", diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Create_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Create_AttestationProvider.json index e222f28aa981..582915a46a9e 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Create_AttestationProvider.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Create_AttestationProvider.json @@ -3,29 +3,43 @@ "resourceGroupName": "MyResourceGroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2018-09-01-preview", - "providerName": "MyAttestationProvider", + "providerName": "myattestationprovider", "creationParams": "test" }, "responses": { "200": { "body": { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/MyAttestationProvider", - "name": "MyAttestationProvider", + "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/myattestationprovider", + "name": "myattestationprovider", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", + "tags": { + "Property1": "Value1", + "Property2": "Value2", + "Property3": "Value3" + }, "properties": { + "trustModel": "Isolated", "status": "Ready", - "attestUri": "https://sample-attestation.attestation.azure.net" + "attestUri": "https://superservice.attestation.azure.net" } } }, "201": { "body": { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/MyAttestationProvider", - "name": "MyAttestationProvider", + "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/myattestationprovider", + "name": "myattestationprovider", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", + "tags": { + "Property1": "Value1", + "Property2": "Value2", + "Property3": "Value3" + }, "properties": { + "trustModel": "Isolated", "status": "Ready", - "attestUri": "https://sample-attestation.attestation.azure.net" + "attestUri": "https://superservice.attestation.azure.net" } } } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Delete_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Delete_AttestationProvider.json index 3659e54a0f78..0d6c4bfa5158 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Delete_AttestationProvider.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Delete_AttestationProvider.json @@ -1,9 +1,10 @@ { "parameters": { - "resourceGroupName": "MyResourceGroup", + "resourceGroupName": "sample-resource-group", + "serviceName": "sampleservicename", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2018-09-01-preview", - "providerName": "MyAttestationProvider" + "providerName": "myattestationprovider" }, "responses": { "202": { diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvider.json index 4df31a7c93e9..2b5f58020741 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvider.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvider.json @@ -3,16 +3,24 @@ "resourceGroupName": "MyResourceGroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2018-09-01-preview", - "providerName": "MyAttestationProvider" + "providerName": "myattestationprovider" }, "responses": { "200": { "body": { - "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/MyAttestationProvider", - "name": "MyAttestationProvider", + "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/myattestationprovider", + "name": "myattestationprovider", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", + "tags": { + "Property1": "Value1", + "Property2": "Value2", + "Property3": "Value3" + }, "properties": { - "status": "Ready" + "trustModel": "Isolated", + "status": "Ready", + "attestUri": "https://superservice.attestation.azure.net" } } } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersList.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersList.json index 4ab27be179e5..045f93991e77 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersList.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersList.json @@ -8,9 +8,10 @@ "body": { "value": [ { - "id": "subscriptions/6c96b33e-f5b8-40a6-9011-5cb1c58b0915/resourceGroups/testrg1/providers/Microsoft.Attestation/attestationProviders/MyAttestationProvider", - "name": "MyAttestationProvider", + "id": "subscriptions/6c96b33e-f5b8-40a6-9011-5cb1c58b0915/resourceGroups/testrg1/providers/Microsoft.Attestation/attestationProviders/myattestationprovider", + "name": "myattestationprovider", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", "properties": { "status": "Ready" } @@ -19,6 +20,7 @@ "id": "subscriptions/6c96b33e-f5b8-40a6-9011-5cb1c58b0915/resourceGroups/testrg2/providers/Microsoft.Attestation/attestationProviders/codes2", "name": "codes2", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", "properties": { "status": "Ready" } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersListByResourceGroup.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersListByResourceGroup.json index 7e19bb3bcb1b..9be2ab2ed038 100644 --- a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersListByResourceGroup.json +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Get_AttestationProvidersListByResourceGroup.json @@ -9,9 +9,10 @@ "body": { "value": [ { - "id": "subscriptions/6c96b33e-f5b8-40a6-9011-5cb1c58b0915/resourceGroups/testrg1/providers/Microsoft.Attestation/attestationProviders/MyAttestationProvider", - "name": "MyAttestationProvider", + "id": "subscriptions/6c96b33e-f5b8-40a6-9011-5cb1c58b0915/resourceGroups/testrg1/providers/Microsoft.Attestation/attestationProviders/myattestationprovider", + "name": "myattestationprovider", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", "properties": { "status": "Ready" } @@ -20,6 +21,7 @@ "id": "subscriptions/6c96b33e-f5b8-40a6-9011-5cb1c58b0915/resourceGroups/testrg1/providers/Microsoft.Attestation/attestationProviders/codes2", "name": "codes2", "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", "properties": { "status": "Ready" } diff --git a/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Update_AttestationProvider.json b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Update_AttestationProvider.json new file mode 100644 index 000000000000..1c49d1af4165 --- /dev/null +++ b/specification/attestation/resource-manager/Microsoft.Attestation/preview/2018-09-01-preview/examples/Update_AttestationProvider.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "resourceGroupName": "MyResourceGroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2018-09-01-preview", + "providerName": "myattestationprovider", + "updateParams": { + "tags": { + "Property1": "Value1", + "Property2": "Value2", + "Property3": "Value3" + } + } + }, + "responses": { + "200": { + "body": { + "id": "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Attestation/attestationProviders/myattestationprovider", + "name": "myattestationprovider", + "type": "Microsoft.Attestation/attestationProviders", + "location": "East US", + "tags": { + "Property1": "Value1", + "Property2": "Value2", + "Property3": "Value3" + }, + "properties": { + "trustModel": "Isolated", + "status": "Ready", + "attestUri": "https://superservice.attestation.azure.net" + } + } + } + } +} From dfb3b73e1ed31b4cfbee921d7166e3627174cc46 Mon Sep 17 00:00:00 2001 From: ramoka178 <57157576+ramoka178@users.noreply.github.com> Date: Wed, 26 Feb 2020 16:47:17 -0800 Subject: [PATCH 42/47] Include Tags in GetSubscription and Deployment APIs (#8268) * changes to get subscription * tags for deployments * fixes from another fork * added extension --- .../examples/PutDeploymentAtScope.json | 12 ++++++++++ .../examples/PutDeploymentAtTenant.json | 12 ++++++++++ .../stable/2019-10-01/resources.json | 22 +++++++++++++++++++ .../2019-11-01/examples/GetSubscription.json | 6 ++++- .../2019-11-01/examples/GetSubscriptions.json | 12 ++++++++-- .../stable/2019-11-01/subscriptions.json | 8 +++++++ 6 files changed, 69 insertions(+), 3 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json index aa313b602623..0847aa88c28a 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json @@ -11,6 +11,10 @@ }, "parameters": {}, "mode": "Incremental" + }, + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" } } }, @@ -72,6 +76,10 @@ "resourceName": "location-lock" } ] + }, + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" } } }, @@ -132,6 +140,10 @@ "resourceName": "location-lock" } ] + }, + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" } } } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json index 91e4625635e4..3c52837d995b 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json @@ -10,6 +10,10 @@ }, "parameters": {}, "mode": "Incremental" + }, + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" } } }, @@ -71,6 +75,10 @@ "resourceName": "location-lock" } ] + }, + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" } } }, @@ -131,6 +139,10 @@ "resourceName": "location-lock" } ] + }, + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" } } } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json index f1150a583811..20622e8dfdb3 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/resources.json @@ -4291,6 +4291,13 @@ "properties": { "$ref": "#/definitions/DeploymentProperties", "description": "The deployment properties." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Deployment tags" } }, "required": [ @@ -4307,6 +4314,13 @@ "properties": { "$ref": "#/definitions/DeploymentProperties", "description": "The deployment properties." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Deployment tags" } }, "required": [ @@ -4735,6 +4749,13 @@ "properties": { "$ref": "#/definitions/DeploymentPropertiesExtended", "description": "Deployment properties." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Deployment tags" } }, "x-ms-azure-resource": true, @@ -5139,6 +5160,7 @@ "description": "The list of tag values." } }, + "x-ms-azure-resource": true, "description": "Tag details." }, "TagsListResult": { diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscription.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscription.json index 087ec2b7b555..8cfe1e927c77 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscription.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscription.json @@ -21,7 +21,11 @@ { "tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7" } - ] + ], + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" + } } } } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscriptions.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscriptions.json index 98c7aad42602..af57fe5468bf 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscriptions.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/examples/GetSubscriptions.json @@ -22,7 +22,11 @@ { "tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7" } - ] + ], + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" + } }, { "id": "/subscriptions/72ac930a-f34e-42d8-b06d-dc2a9e12ed71", @@ -43,7 +47,11 @@ { "tenantId": "f7fb6af2-321d-47c8-9c0f-b0239eaad39a" } - ] + ], + "tags": { + "tagKey1": "tagValue1", + "tagKey2": "tagValue2" + } } ], "nextLink": "..." diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/subscriptions.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/subscriptions.json index 7055cc937a64..a10bc931ed11 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/subscriptions.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-11-01/subscriptions.json @@ -356,6 +356,14 @@ "$ref": "#/definitions/ManagedByTenant" }, "description": "An array containing the tenants managing the subscription." + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string", + "description": "The additional properties. " + }, + "description": "The tags attached to the subscription." } }, "description": "Subscription information." From 2385528ee2d745a81b312920432bbb248d259167 Mon Sep 17 00:00:00 2001 From: Praneeth Sanapathi Date: Wed, 26 Feb 2020 17:13:07 -0800 Subject: [PATCH 43/47] Remove readonly flag from microsoftSessionAddress properties in BgpSession; add an example for IxRs directPeeringType (#8517) --- .../CreatePeeringWithExchangeRouteServer.json | 134 ++++++++++++++++++ .../preview/2020-01-01-preview/peering.json | 9 +- 2 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/examples/CreatePeeringWithExchangeRouteServer.json diff --git a/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/examples/CreatePeeringWithExchangeRouteServer.json b/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/examples/CreatePeeringWithExchangeRouteServer.json new file mode 100644 index 000000000000..abef881df319 --- /dev/null +++ b/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/examples/CreatePeeringWithExchangeRouteServer.json @@ -0,0 +1,134 @@ +{ + "parameters": { + "subscriptionId": "subId", + "resourceGroupName": "rgName", + "peeringName": "peeringName", + "api-version": "2020-01-01-preview", + "peering": { + "sku": { + "name": "Premium_Direct_Free" + }, + "kind": "Direct", + "properties": { + "direct": { + "connections": [ + { + "bandwidthInMbps": 10000, + "sessionAddressProvider": "Peer", + "useForPeeringService": true, + "peeringDBFacilityId": 99999, + "bgpSession": { + "sessionPrefixV4": "192.168.0.0/24", + "microsoftSessionIPv4Address": "192.168.0.123", + "peerSessionIPv4Address": "192.168.0.234", + "maxPrefixesAdvertisedV4": 1000, + "maxPrefixesAdvertisedV6": 100 + }, + "connectionIdentifier": "5F4CB5C7-6B43-4444-9338-9ABC72606C16" + } + ], + "peerAsn": { + "id": "/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1" + }, + "directPeeringType": "IxRs" + }, + "peeringLocation": "peeringLocation0" + }, + "location": "eastus" + } + }, + "responses": { + "200": { + "body": { + "sku": { + "name": "Premium_Direct_Free", + "tier": "Premium", + "family": "Direct", + "size": "Free" + }, + "kind": "Direct", + "properties": { + "direct": { + "connections": [ + { + "bandwidthInMbps": 10000, + "provisionedBandwidthInMbps": 10000, + "sessionAddressProvider": "Peer", + "useForPeeringService": true, + "peeringDBFacilityId": 99999, + "connectionState": "Active", + "bgpSession": { + "sessionPrefixV4": "192.168.0.0/24", + "microsoftSessionIPv4Address": "192.168.0.123", + "peerSessionIPv4Address": "192.168.0.234", + "sessionStateV4": "Established", + "sessionStateV6": "Established", + "maxPrefixesAdvertisedV4": 1000, + "maxPrefixesAdvertisedV6": 100 + }, + "connectionIdentifier": "5F4CB5C7-6B43-4444-9338-9ABC72606C16" + } + ], + "useForPeeringService": true, + "peerAsn": { + "id": "/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1" + }, + "directPeeringType": "IxRs" + }, + "peeringLocation": "peeringLocation0", + "provisioningState": "Succeeded" + }, + "location": "eastus", + "name": "peeringName", + "id": "/subscriptions/subId/resourceGroups/rgName/providers/Microsoft.Peering/peerings/peeringName", + "type": "Microsoft.Peering/peerings" + } + }, + "201": { + "body": { + "sku": { + "name": "Premium_Direct_Free", + "tier": "Premium", + "family": "Direct", + "size": "Free" + }, + "kind": "Direct", + "properties": { + "direct": { + "connections": [ + { + "bandwidthInMbps": 10000, + "provisionedBandwidthInMbps": 0, + "sessionAddressProvider": "Peer", + "useForPeeringService": true, + "peeringDBFacilityId": 99999, + "connectionState": "PendingApproval", + "bgpSession": { + "sessionPrefixV4": "192.168.0.0/24", + "microsoftSessionIPv4Address": "192.168.0.123", + "peerSessionIPv4Address": "192.168.0.234", + "sessionStateV4": "PendingAdd", + "sessionStateV6": "PendingAdd", + "maxPrefixesAdvertisedV4": 1000, + "maxPrefixesAdvertisedV6": 100 + }, + "connectionIdentifier": "5F4CB5C7-6B43-4444-9338-9ABC72606C16" + } + ], + "useForPeeringService": true, + "peerAsn": { + "id": "/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1" + }, + "directPeeringType": "IxRs" + }, + "peeringLocation": "peeringLocation0", + "provisioningState": "Succeeded" + }, + "location": "eastus", + "name": "peeringName", + "id": "/subscriptions/subId/resourceGroups/rgName/providers/Microsoft.Peering/peerings/peeringName", + "type": "Microsoft.Peering/peerings" + } + } + } +} diff --git a/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/peering.json b/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/peering.json index 9ab619f144b0..361ecf8332b2 100644 --- a/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/peering.json +++ b/specification/peering/resource-manager/Microsoft.Peering/preview/2020-01-01-preview/peering.json @@ -995,6 +995,9 @@ }, "Create an exchange peering": { "$ref": "./examples/CreateExchangePeering.json" + }, + "Create a peering with exchange route server": { + "$ref": "./examples/CreatePeeringWithExchangeRouteServer.json" } } }, @@ -2222,13 +2225,11 @@ }, "microsoftSessionIPv4Address": { "description": "The IPv4 session address on Microsoft's end.", - "type": "string", - "readOnly": true + "type": "string" }, "microsoftSessionIPv6Address": { "description": "The IPv6 session address on Microsoft's end.", - "type": "string", - "readOnly": true + "type": "string" }, "peerSessionIPv4Address": { "description": "The IPv4 session address on peer's end.", From 86cf9319b54024d47b79e6ac3b344c042f8a5515 Mon Sep 17 00:00:00 2001 From: Kerwin Date: Thu, 27 Feb 2020 10:26:36 +0800 Subject: [PATCH 44/47] add cli.md for databricks (#8521) --- .../databricks/resource-manager/readme.cli.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 specification/databricks/resource-manager/readme.cli.md diff --git a/specification/databricks/resource-manager/readme.cli.md b/specification/databricks/resource-manager/readme.cli.md new file mode 100644 index 000000000000..aed267b657de --- /dev/null +++ b/specification/databricks/resource-manager/readme.cli.md @@ -0,0 +1,20 @@ +## CLI + +These settings don't need to apply `--cli` on the command line. + +``` yaml +cli: + cli-name: databricks + package-name: azure-mgmt-databricks + namespace: azure.mgmt.databricks + test-scenario: + - name: Create or update workspace + - name: Create or update workspace with custom parameters + - name: Get a workspace with custom parameters + - name: Get a workspace + - name: Lists workspaces + - name: Lists workspaces + - name: Operations + - name: Update a workspace's tags. + - name: Delete a workspace +``` \ No newline at end of file From 5238b236f1b6e4685029680a802508aa10529454 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Wed, 26 Feb 2020 20:16:25 -0800 Subject: [PATCH 45/47] Reverting to local Common.json to satisify autorest against md file. --- .../preview/2020-02-01-preview/Common.json | 80 +++++++++++++++++++ .../2020-02-01-preview/MediaGraphs.json | 2 +- .../stable/2018-07-01/Common.json | 15 ++-- .../mediaservices/resource-manager/readme.md | 7 +- 4 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json new file mode 100644 index 000000000000..bea6dd7c7650 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -0,0 +1,80 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Media Services", + "version": "2018-07-01" + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "Impersonate your user account" + } + } + }, + "paths": {}, + "definitions": { + "Resource": { + "description": "The core properties of ARM resources.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource ID for the resource." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource." + } + }, + "x-ms-azure-resource": true + }, + "TrackedResource": { + "description": "The resource model definition for a ARM tracked resource.", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The Azure Region of the resource." + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProxyResource": { + "description": "The resource model definition for a ARM proxy resource.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json index a641b02b7eb5..5e38e2ae333f 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json @@ -359,7 +359,7 @@ "MediaGraph": { "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "$ref": "./Common.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json index 4905e51bfcf1..bea6dd7c7650 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json @@ -18,27 +18,28 @@ "paths": {}, "definitions": { "Resource": { + "description": "The core properties of ARM resources.", "properties": { "id": { "readOnly": true, "type": "string", - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + "description": "Fully qualified resource ID for the resource." }, "name": { "readOnly": true, "type": "string", - "description": "The name of the resource" + "description": "The name of the resource." }, "type": { "readOnly": true, "type": "string", - "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." + "description": "The type of the resource." } }, "x-ms-azure-resource": true }, "TrackedResource": { - "description": "The resource model definition for a ARM tracked top level resource", + "description": "The resource model definition for a ARM tracked resource.", "properties": { "tags": { "type": "object", @@ -58,7 +59,7 @@ "read", "create" ], - "description": "The geo-location where the resource lives" + "description": "The Azure Region of the resource." } }, "allOf": [ @@ -68,7 +69,7 @@ ] }, "ProxyResource": { - "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags", + "description": "The resource model definition for a ARM proxy resource.", "allOf": [ { "$ref": "#/definitions/Resource" @@ -76,4 +77,4 @@ ] } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md index e76afcb8f395..db3b5caa0fc4 100644 --- a/specification/mediaservices/resource-manager/readme.md +++ b/specification/mediaservices/resource-manager/readme.md @@ -308,7 +308,7 @@ directive: reason: Output not required for job update ``` -## Multi-API/Profile support for AutoRest v3 generators +## Multi-API/Profile support for AutoRest v3 generators AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. @@ -354,11 +354,10 @@ input-file: ``` -If there are files that should not be in the `all-api-versions` set, +If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' -#exclude-file: +#exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` - From 5085954bee7daca27d85b264c31e5d18e42e7726 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 27 Feb 2020 09:18:44 -0800 Subject: [PATCH 46/47] Fixing prettier --- .../Microsoft.Media/preview/2020-02-01-preview/Common.json | 2 +- .../Microsoft.Media/stable/2018-07-01/Common.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json index bea6dd7c7650..8ffd3bd1f71a 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -77,4 +77,4 @@ ] } } -} \ No newline at end of file +} diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json index bea6dd7c7650..8ffd3bd1f71a 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json @@ -77,4 +77,4 @@ ] } } -} \ No newline at end of file +} From 75ca0a4d056b9d28e7ae0fe9538e4ddc538e2e1f Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 26 Mar 2020 12:53:07 -0700 Subject: [PATCH 47/47] Updating Common.json to match API version --- .../Microsoft.Media/preview/2019-09-01-preview/Common.json | 2 +- .../Microsoft.Media/preview/2020-02-01-preview/Common.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2019-09-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2019-09-01-preview/Common.json index 8ffd3bd1f71a..a940d0c41995 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2019-09-01-preview/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2019-09-01-preview/Common.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Azure Media Services", - "version": "2018-07-01" + "version": "2019-09-01-preview" }, "securityDefinitions": { "azure_auth": { diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json index 8ffd3bd1f71a..1745b2883a4b 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/Common.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Azure Media Services", - "version": "2018-07-01" + "version": "2020-02-01-preview" }, "securityDefinitions": { "azure_auth": {