From 6bf3a735ca31f072a4a329f2fc156a9e1914fb1e Mon Sep 17 00:00:00 2001 From: Risong Na Date: Thu, 13 Feb 2020 12:10:13 -0800 Subject: [PATCH] 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 +}