From 9156f1ada45d7c0859444dd78584643c50a098b4 Mon Sep 17 00:00:00 2001 From: brianbl Date: Wed, 14 Nov 2018 14:41:47 -0800 Subject: [PATCH] Updates to the 2018-07-01 version of the MediaServices API All enums, use 'modelAsString' instead of 'modelAsExtensible' streamingservice, add "Standard" to LiveEncoding.encodingType encoding, remove top and skip from query parms and add orderby accountfilters and aasetsandassefilters, remove required attribute for PresentationTimeRange properties Updated readme.md to add "opt-in-extensible-enums: true" to csharp build --- .../stable/2018-07-01/AccountFilters.json | 12 +-- .../stable/2018-07-01/Accounts.json | 6 +- .../2018-07-01/AssetsAndAssetFilters.json | 16 +--- .../stable/2018-07-01/ContentKeyPolicies.json | 10 +- .../stable/2018-07-01/Encoding.json | 91 +++++++++++-------- ...StreamingPoliciesAndStreamingLocators.json | 10 +- .../jobs-list-all-filter-by-created.json | 81 +++++++++++++++++ .../jobs-list-all-filter-by-lastmodified.json | 81 +++++++++++++++++ ...obs-list-all-filter-by-name-and-state.json | 49 ++++++++++ .../jobs-list-all-filter-by-name.json | 81 +++++++++++++++++ .../jobs-list-all-filter-by-state-eq.json | 80 ++++++++++++++++ .../jobs-list-all-filter-by-state-ne.json | 80 ++++++++++++++++ ...transforms-list-all-filter-by-created.json | 38 ++++++++ ...forms-list-all-filter-by-lastmodified.json | 38 ++++++++ .../transforms-list-all-filter-by-name.json | 66 ++++++++++++++ .../examples/transforms-list-all.json | 8 +- .../stable/2018-07-01/streamingservice.json | 3 +- .../mediaservices/resource-manager/readme.md | 1 + 18 files changed, 672 insertions(+), 79 deletions(-) create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-created.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-lastmodified.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name-and-state.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-eq.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-ne.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-created.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-lastmodified.json create mode 100644 specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-name.json diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AccountFilters.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AccountFilters.json index 394858b78b72..0113e2c1450a 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AccountFilters.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AccountFilters.json @@ -60,14 +60,6 @@ } }, "type": "object", - "required": [ - "startTimestamp", - "endTimestamp", - "presentationWindowDuration", - "liveBackoffDuration", - "timescale", - "forceEndTimestamp" - ], "description": "The presentation time range, this is asset related and not recommended for Account Filter." }, "FilterTrackPropertyCondition": { @@ -110,7 +102,7 @@ "description": "The bitrate." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The track property type." }, @@ -136,7 +128,7 @@ "description": "The not equal operation." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The track property condition operation." } diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Accounts.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Accounts.json index de3b1611dd08..ed122a0cce52 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Accounts.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Accounts.json @@ -124,7 +124,7 @@ "description": "The number of milliseconds." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The metric unit", "readOnly": true, @@ -153,7 +153,7 @@ "description": "The sum." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The metric aggregation type", "readOnly": true, @@ -277,7 +277,7 @@ "description": "A secondary storage account for the Media Services account." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The type of the storage account." } diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json index 852662a7dbd1..4f54bed9ddb2 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json @@ -84,7 +84,7 @@ "description": "The Asset is encrypted with Media Services client-side encryption." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The Asset encryption format. One of None or MediaStorageEncryption.", "readOnly": true, @@ -264,14 +264,6 @@ } }, "type": "object", - "required": [ - "startTimestamp", - "endTimestamp", - "presentationWindowDuration", - "liveBackoffDuration", - "timescale", - "forceEndTimestamp" - ], "description": "The presentation time range, this is asset related and not recommended for Account Filter." }, "FilterTrackPropertyCondition": { @@ -314,7 +306,7 @@ "description": "The bitrate." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The track property type." }, @@ -340,7 +332,7 @@ "description": "The not equal operation." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The track property condition operation." } @@ -498,7 +490,7 @@ "description": "The SAS URL will allow read, write and delete access to the container." } ], - "modelAsExtensible": true + "modelAsString": true } }, "expiryTime": { diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json index 61ae2a86aa25..372adf53c003 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json @@ -152,7 +152,7 @@ "description": "Passing the video portion of protected content to an Unknown Output is allowed but with constrained resolution." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Configures Unknown output handling settings of the license." }, @@ -263,7 +263,7 @@ "description": "Persistent license. Allows offline playback." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The license type." }, @@ -299,7 +299,7 @@ "description": "Ultraviolet streaming content type." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The PlayReady content type." } @@ -500,7 +500,7 @@ "description": "JSON Web Token." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The type of token." }, @@ -634,7 +634,7 @@ "description": "Content key can be persisted and the valid duration is limited by the Rental Duration value" } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The rental and lease key type." }, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json index 5a61e0b30833..27ea36af4f7e 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json @@ -117,7 +117,7 @@ "description": "Specifies that the output audio is to be encoded into HE-AAC v2 profile." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The encoding profile to be used when encoding audio with AAC." } @@ -242,7 +242,7 @@ "description": "Pad the output (with either letterbox or pillar box) to honor the output resolution, while ensuring that the active video region in the output has the same aspect ratio as the input. For example, if the input is 1920x1080 and the encoding preset asks for 1280x1280, then the output will be at 1280x1280, which contains an inner rectangle of 1280x720 at aspect ratio of 16:9, and pillar box regions 280 pixels wide at the left and right." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The resizing mode - how the input video will be resized to fit the desired output resolution(s). Default is AutoSize" } @@ -361,7 +361,7 @@ "description": "Apply bottom field first processing of input video." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The field parity for de-interlacing, defaults to Auto." }, @@ -383,7 +383,7 @@ "description": "Apply automatic pixel adaptive de-interlacing on each frame in the input video." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The deinterlacing mode. Defaults to AutoPixelAdaptive." } @@ -457,7 +457,7 @@ "description": "Rotate 270 degrees clockwise." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The rotation, if any, to be applied to the input video, before it is encoded. Default is Auto" }, @@ -588,7 +588,7 @@ "description": "High 4:4:4 predictive profile." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Which profile of the H.264 standard should be used when encoding this layer. Default is Auto." }, @@ -624,7 +624,7 @@ "description": "Context Adaptive Variable Length Coder (CAVLC) entropy encoding." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The entropy mode to be used for this layer. If not specified, the encoder chooses the mode that is appropriate for the profile and level." } @@ -667,7 +667,7 @@ "description": "Tells the encoder to use settings that are optimized to produce higher quality output at the expense of slower overall encode time." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Tells the encoder how to choose its encoding settings. The default value is Balanced." }, @@ -847,7 +847,7 @@ "description": "Produces a set of 5 GOP-aligned MP4 files, ranging from 1600kbps to 400 kbps, and stereo AAC audio. Resolution starts at 480p and goes down to 360p." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The built-in preset to be used for encoding videos." } @@ -919,7 +919,7 @@ "description": "Generate both audio and video insights. Fails if either audio or video Insights fail." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The type of insights to be extracted. If not set then based on the content the type will selected. If the content is audi only then only audio insights are extraced and if it is video only." } @@ -983,7 +983,7 @@ "description": "Tells the service that if this TransformOutput fails, then allow any other TransformOutput to continue." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "A Transform can define more than one outputs. This property defines what the service should do when one output fails - either continue to produce other outputs, or, stop the other outputs. The overall Job state will not reflect failures of outputs that are specified with 'ContinueJob'. The default is 'StopProcessingJob'." }, @@ -1010,7 +1010,7 @@ "description": "Used for TransformOutputs that should take precedence over others." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Sets the relative priority of the TransformOutputs within a Transform. This sets the priority that the service uses for processing TransformOutputs. The default priority is Normal." }, @@ -1221,7 +1221,7 @@ "description": "The job is being scheduled to run on an available resource. This is a transient state, between queued and processing states." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Describes the state of the JobOutput.", "readOnly": true, @@ -1300,7 +1300,7 @@ "description": "There was a problem with the format of the input (not valid media file, or an unsupported file/codec), check the validity of the input files." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Error code describing the error.", "readOnly": true, @@ -1344,7 +1344,7 @@ "description": "The error is related to data in the input files." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Helps with categorization of errors.", "readOnly": true, @@ -1368,7 +1368,7 @@ "description": "Issue may be resolved after waiting for a period of time and resubmitting the same Job." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Indicates that it may be possible to retry the Job. If retry is unsuccessful, please contact Azure support via Azure Portal.", "readOnly": true, @@ -1473,7 +1473,7 @@ "description": "The job is being scheduled to run on an available resource. This is a transient state, between queued and processing states." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "The current state of the job.", "readOnly": true, @@ -1524,7 +1524,7 @@ "description": "Used for TransformOutputs that should take precedence over others." } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Priority with which the job should be processed. Higher priority jobs are processed before lower priority jobs. If not set, the default is normal." }, @@ -1670,18 +1670,11 @@ "description": "Restricts the set of items returned." }, { - "name": "$top", + "name": "$orderby", "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." - }, - { - "name": "$skip", - "in": "query", - "required": false, - "type": "integer", - "description": "Specifies a non-negative integer n that excludes the first n items of the queried collection from the result. The service returns items starting at position n+1." + "type": "string", + "description": "Specifies the the key by which the result collection should be ordered." } ], "x-ms-pageable": { @@ -1691,6 +1684,15 @@ "x-ms-examples": { "Lists the Transforms": { "$ref": "examples/transforms-list-all.json" + }, + "Lists the Transforms filter by name": { + "$ref": "examples/transforms-list-all-filter-by-name.json" + }, + "Lists the Transforms filter by created": { + "$ref": "examples/transforms-list-all-filter-by-created.json" + }, + "Lists the Transforms filter by lastmodified": { + "$ref": "examples/transforms-list-all-filter-by-lastmodified.json" } } } @@ -1951,18 +1953,11 @@ "description": "Restricts the set of items returned." }, { - "name": "$top", + "name": "$orderby", "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." - }, - { - "name": "$skip", - "in": "query", - "required": false, - "type": "integer", - "description": "Specifies a non-negative integer n that excludes the first n items of the queried collection from the result. The service returns items starting at position n+1." + "type": "string", + "description": "Specifies the the key by which the result collection should be ordered." } ], "x-ms-pageable": { @@ -1972,6 +1967,24 @@ "x-ms-examples": { "Lists all of the Jobs for the Transform.": { "$ref": "examples/jobs-list-all.json" + }, + "Lists Jobs for the Transform filter by name.": { + "$ref": "examples/jobs-list-all-filter-by-name.json" + }, + "Lists Jobs for the Transform filter by state equal.": { + "$ref": "examples/jobs-list-all-filter-by-state-eq.json" + }, + "Lists Jobs for the Transform filter by state not equal.": { + "$ref": "examples/jobs-list-all-filter-by-state-ne.json" + }, + "Lists Jobs for the Transform filter by name and state.": { + "$ref": "examples/jobs-list-all-filter-by-name-and-state.json" + }, + "Lists Jobs for the Transform filter by created.": { + "$ref": "examples/jobs-list-all-filter-by-created.json" + }, + "Lists Jobs for the Transform filter by lastmodified.": { + "$ref": "examples/jobs-list-all-filter-by-lastmodified.json" } } } @@ -2147,7 +2160,7 @@ }, "patch": { "summary": "Update Job", - "description": "Updates a Job.", + "description": "Update is only supported for description and priority. Updating Priority will take effect when the Job state is Queued or Scheduled and depending on the timing the priority update may be ignored.", "operationId": "Jobs_Update", "responses": { "200": { diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json index c827450bc364..5bdd16a6c42c 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json @@ -47,7 +47,7 @@ "description": "Track FourCC" } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Track property type" }, @@ -69,7 +69,7 @@ "description": "Equal operation" } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Track property condition operation" }, @@ -414,7 +414,7 @@ "description": "Envelope Encryption" } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Encryption type of Content Key", "readOnly": true, @@ -478,7 +478,7 @@ "description": "Download protocol" } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Streaming protocol" }, @@ -510,7 +510,7 @@ "description": "CommonEncryptionCbcs scheme" } ], - "modelAsExtensible": true + "modelAsString": true }, "description": "Encryption scheme" }, diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-created.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-created.json new file mode 100644 index 000000000000..395cecb25446 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-created.json @@ -0,0 +1,81 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "transformName": "exampleTransform", + "$filter": "properties/created ge 2018-09-27T22:56:18.5507138Z and properties/created le 2018-09-27T22:56:28.5507138Z", + "$orderby": "properties/created" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "job2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job2", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "2018-09-27T22:56:18.5507138Z", + "state": "Processing", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job2 input" + } + ] + }, + "lastModified": "2018-09-27T22:56:18.5507138Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Processing", + "progress": 50, + "label": "example-custom-label", + "assetName": "job2 output" + } + ], + "priority": "Low", + "correlationData": {} + } + }, + { + "name": "job3", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job3", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "2018-09-27T22:56:28.5507138Z", + "state": "Finished", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job3 input" + } + ] + }, + "lastModified": "2018-09-27T22:56:28.5507138Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Finished", + "progress": 100, + "label": "example-custom-label", + "assetName": "job3 output" + } + ], + "priority": "Low", + "correlationData": {} + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-lastmodified.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-lastmodified.json new file mode 100644 index 000000000000..f62722d0e0be --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-lastmodified.json @@ -0,0 +1,81 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "transformName": "exampleTransform", + "$filter": "properties/lastmodified ge 2018-09-27T22:56:18.5821662Z and properties/lastmodified le 2018-09-27T22:56:28.5821662Z", + "$orderby": "properties/lastmodified desc" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "job3", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job3", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "2018-09-27T22:56:28.5821662Z", + "state": "Finished", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job3 input" + } + ] + }, + "lastModified": "2018-09-27T22:56:28.5821662Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Finished", + "progress": 100, + "label": "example-custom-label", + "assetName": "job3 output" + } + ], + "priority": "Low", + "correlationData": {} + } + }, + { + "name": "job2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job2", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "2018-09-27T22:56:18.5821662Z", + "state": "Processing", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job2 input" + } + ] + }, + "lastModified": "2018-09-27T22:56:18.5821662Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Processing", + "progress": 50, + "label": "example-custom-label", + "assetName": "job2 output" + } + ], + "priority": "Low", + "correlationData": {} + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name-and-state.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name-and-state.json new file mode 100644 index 000000000000..95975da8908e --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name-and-state.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "transformName": "exampleTransform", + "$filter": "name eq 'job3' and properties/state eq Microsoft.Media.JobState'finished'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "job3", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job3", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Finished", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job3 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Finished", + "progress": 100, + "label": "example-custom-label", + "assetName": "job3 output" + } + ], + "priority": "Low", + "correlationData": {} + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name.json new file mode 100644 index 000000000000..6b082f7e48d2 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-name.json @@ -0,0 +1,81 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "transformName": "exampleTransform", + "$filter": "name eq 'job1' or name eq 'job2'", + "$orderby": "name" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "job1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job1", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Queued", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job1 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Queued", + "progress": 0, + "label": "example-custom-label", + "assetName": "job1 output" + } + ], + "priority": "Low", + "correlationData": {} + } + }, + { + "name": "job2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job2", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Processing", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job2 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Processing", + "progress": 50, + "label": "example-custom-label", + "assetName": "job2 output" + } + ], + "priority": "Low", + "correlationData": {} + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-eq.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-eq.json new file mode 100644 index 000000000000..f089816e8da7 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-eq.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "transformName": "exampleTransform", + "$filter": "properties/state eq Microsoft.Media.JobState'Processing'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "job2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job2", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Processing", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job2 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Processing", + "progress": 50, + "label": "example-custom-label", + "assetName": "job2 output" + } + ], + "priority": "Low", + "correlationData": {} + } + }, + { + "name": "job3", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job3", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Processing", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job3 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Processing", + "progress": 50, + "label": "example-custom-label", + "assetName": "job3 output" + } + ], + "priority": "Low", + "correlationData": {} + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-ne.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-ne.json new file mode 100644 index 000000000000..2fef3a6c39dd --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/jobs-list-all-filter-by-state-ne.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "transformName": "exampleTransform", + "$filter": "properties/state ne Microsoft.Media.JobState'processing'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "job1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job1", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Queued", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job1 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Queued", + "progress": 0, + "label": "example-custom-label", + "assetName": "job1 output" + } + ], + "priority": "Low", + "correlationData": {} + } + }, + { + "name": "job4", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/exampleTransform/jobs/job4", + "type": "Microsoft.Media/mediaservices/transforms/jobs", + "properties": { + "created": "0001-01-01T00:00:00Z", + "state": "Finished", + "input": { + "@odata.type": "#Microsoft.Media.JobInputs", + "inputs": [ + { + "@odata.type": "#Microsoft.Media.JobInputAsset", + "files": [], + "assetName": "job4 input" + } + ] + }, + "lastModified": "0001-01-01T00:00:00Z", + "outputs": [ + { + "@odata.type": "#Microsoft.Media.JobOutputAsset", + "state": "Finished", + "progress": 100, + "label": "example-custom-label", + "assetName": "job4 output" + } + ], + "priority": "Low", + "correlationData": {} + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-created.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-created.json new file mode 100644 index 000000000000..cf729aa5a250 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-created.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "$filter": "properties/created gt 2018-09-27T22:56:07.7621546Z and properties/created le 2018-09-27T22:56:17.7621546Z", + "$orderby": "properties/created" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "sampleEncodeAndVideoIndex", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/sampleEncodeAndVideoIndex", + "type": "Microsoft.Media/mediaservices/transforms", + "properties": { + "created": "2018-09-27T22:56:17.7621546-07:00", + "description": "A sample Transform using the Video Analyzer.", + "lastModified": "2018-09-27T22:56:17.7621546-07:00", + "outputs": [ + { + "onError": "StopProcessingJob", + "relativePriority": "Normal", + "preset": { + "@odata.type": "#Microsoft.Media.VideoAnalyzerPreset", + "insightsToExtract": "AllInsights" + } + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-lastmodified.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-lastmodified.json new file mode 100644 index 000000000000..28153774e318 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-lastmodified.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "$filter": "properties/lastmodified gt 2018-09-27T22:56:07.7840953Z and properties/lastmodified le 2018-09-27T22:56:17.7840953Z", + "$orderby": "properties/lastmodified desc" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "sampleEncodeAndVideoIndex", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/sampleEncodeAndVideoIndex", + "type": "Microsoft.Media/mediaservices/transforms", + "properties": { + "created": "2018-09-27T22:56:17.7840953-07:00", + "description": "A sample Transform using the Video Analyzer.", + "lastModified": "2018-09-27T22:56:17.7840953-07:00", + "outputs": [ + { + "onError": "StopProcessingJob", + "relativePriority": "Normal", + "preset": { + "@odata.type": "#Microsoft.Media.VideoAnalyzerPreset", + "insightsToExtract": "AllInsights" + } + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-name.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-name.json new file mode 100644 index 000000000000..84a76f252fb5 --- /dev/null +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all-filter-by-name.json @@ -0,0 +1,66 @@ +{ + "parameters": { + "api-version": "2018-07-01", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "contosoresources", + "accountName": "contosomedia", + "$filter": "(name eq 'sampleEncode') or (name eq 'sampleEncodeAndVideoIndex')", + "$orderby": "name desc" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "sampleEncodeAndVideoIndex", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/sampleEncodeAndVideoIndex", + "type": "Microsoft.Media/mediaservices/transforms", + "properties": { + "created": "2018-09-27T22:56:07.5846087-07:00", + "description": "A sample Transform using the Standard Encoder with a built-in preset, as well as the Video Analyzer.", + "lastModified": "2018-09-27T22:56:07.5846087-07:00", + "outputs": [ + { + "onError": "StopProcessingJob", + "relativePriority": "Normal", + "preset": { + "@odata.type": "#Microsoft.Media.VideoAnalyzerPreset", + "insightsToExtract": "AllInsights" + } + }, + { + "onError": "StopProcessingJob", + "relativePriority": "Normal", + "preset": { + "@odata.type": "#Microsoft.Media.BuiltInStandardEncoderPreset", + "presetName": "AdaptiveStreaming" + } + } + ] + } + }, + { + "name": "sampleEncode", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/sampleEncode", + "type": "Microsoft.Media/mediaservices/transforms", + "properties": { + "created": "2018-09-27T22:56:07.5846087-07:00", + "description": "A sample Transform using the Standard Encoder with a built in preset.", + "lastModified": "2018-09-27T22:56:07.5846087-07:00", + "outputs": [ + { + "onError": "StopProcessingJob", + "relativePriority": "Normal", + "preset": { + "@odata.type": "#Microsoft.Media.BuiltInStandardEncoderPreset", + "presetName": "AdaptiveStreaming" + } + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all.json index 645652fafd00..0b53d7c2160e 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/transforms-list-all.json @@ -14,9 +14,9 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/sampleEncode", "type": "Microsoft.Media/mediaservices/transforms", "properties": { - "created": "2018-08-23T15:09:34.2372568-04:00", + "created": "2018-07-26T19:11:48.9717921-07:00", "description": "A sample Transform using the Standard Encoder with a built in preset.", - "lastModified": "2018-08-23T15:09:34.2372568-04:00", + "lastModified": "2018-07-26T19:11:48.9717921-07:00", "outputs": [ { "onError": "StopProcessingJob", @@ -34,9 +34,9 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contosoresources/providers/Microsoft.Media/mediaservices/contosomedia/transforms/sampleEncodeAndVideoIndex", "type": "Microsoft.Media/mediaservices/transforms", "properties": { - "created": "2018-08-23T15:09:34.2422668-04:00", + "created": "2018-07-26T19:11:48.9767793-07:00", "description": "A sample Transform using the Standard Encoder with a built-in preset, as well as the Video Analyzer.", - "lastModified": "2018-08-23T15:09:34.2422668-04:00", + "lastModified": "2018-07-26T19:11:48.9767793-07:00", "outputs": [ { "onError": "StopProcessingJob", diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/streamingservice.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/streamingservice.json index cb6ca579a967..2b14f5aa4000 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/streamingservice.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/streamingservice.json @@ -1323,7 +1323,8 @@ "description": "The encoding type for Live Event. This value is specified at creation time and cannot be updated.", "enum": [ "None", - "Basic" + "Basic", + "Standard" ], "x-ms-enum": { "name": "LiveEventEncodingType", diff --git a/specification/mediaservices/resource-manager/readme.md b/specification/mediaservices/resource-manager/readme.md index d82feeb7b6d7..2e6e552a8d80 100644 --- a/specification/mediaservices/resource-manager/readme.md +++ b/specification/mediaservices/resource-manager/readme.md @@ -117,6 +117,7 @@ csharp: namespace: Microsoft.Azure.Management.Media output-folder: $(csharp-sdks-folder)/Media/Management.Media/Generated clear-output-folder: true + opt-in-extensible-enums: true ``` ## Python