Skip to content

Commit

Permalink
Updating new version
Browse files Browse the repository at this point in the history
  • Loading branch information
@microsoft-rin
microsoft-rin committed Feb 13, 2020
1 parent 6c08aad commit a2f8210
Show file tree
Hide file tree
Showing 7 changed files with 327 additions and 220 deletions.
215 changes: 131 additions & 84 deletions ...ediaservices/resource-manager/Microsoft.Media/preview/2020-02-01-preview/MediaGraphs.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"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",
"schemes": [
"https"
],
"consumes": [
"application/json"
],
Expand Down Expand Up @@ -36,7 +36,6 @@
"state": {
"type": "string",
"enum": [
"Creating",
"Running",
"Starting",
"Stopped",
Expand All @@ -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."
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -248,19 +200,19 @@
},
"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",
"required": [
"@odata.type",
"url"
],
"description": "Base class for endpoints"
"description": "Base class for endpoints."
},
"MediaGraphAssetSink": {
"x-ms-discriminator-value": "#Microsoft.Media.MediaGraphAssetSink",
Expand Down Expand Up @@ -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",
Expand All @@ -305,19 +257,19 @@
"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",
"required": [
"username",
"password"
],
"description": "Username/password credential pair"
"description": "Username/password credential pair."
},
"MediaGraphClearEndpoint": {
"x-ms-discriminator-value": "#Microsoft.Media.MediaGraphClearEndpoint",
Expand All @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -403,7 +359,7 @@
"MediaGraph": {
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
"$ref": "./Common.json#/definitions/ProxyResource"
}
],
"properties": {
Expand All @@ -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",
Expand Down Expand Up @@ -584,12 +575,6 @@
"$ref": "#/definitions/MediaGraph"
}
},
"201": {
"description": "Created",
"schema": {
"$ref": "#/definitions/MediaGraph"
}
},
"default": {
"description": "Detailed error information.",
"schema": {
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -776,17 +763,77 @@
}
}
},
"/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",
"description": "Get the operation result of a Media Graph in the Media Services account.",
"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.",
Expand Down Expand Up @@ -863,4 +910,4 @@
"description": "The Version of the API to be used with the client request."
}
}
}
}
Loading

0 comments on commit a2f8210

Please sign in to comment.