From ff91d1ccf06ea4b25b7486f359dc45160c32dfb6 Mon Sep 17 00:00:00 2001 From: Risong Na Date: Fri, 31 Jan 2020 16:12:23 -0800 Subject: [PATCH 01/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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/11] 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 +}