From f69845d010aba34b83ef706aab979b7d713a073b Mon Sep 17 00:00:00 2001 From: hivyas <61890270+hivyas@users.noreply.github.com> Date: Tue, 12 Oct 2021 16:19:02 -0700 Subject: [PATCH 1/4] Removed OnvifDeviceGetRequestBody and OnVifDeviceDiscoverRequestBody --- .../AzureVideoAnalyzerSdkDefinitions.json | 43 +++---------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json index 1c4af8acd71b..954f1e1ebc63 100644 --- a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json +++ b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json @@ -42,7 +42,8 @@ "x-ms-enum": { "name": "apiVersionEnum", "modelAsString": false - } + }, + "x-ms-client-default": "1.1" } }, "discriminator": "methodName", @@ -265,8 +266,9 @@ ], "description": "Deletes an existing remote device adapter." }, - "OnvifDeviceDiscoverRequestBody": { + "OnvifDeviceDiscoverRequest": { "type": "object", + "x-ms-discriminator-value": "onvifDeviceDiscover", "allOf": [ { "$ref": "#/definitions/MethodRequest" @@ -278,25 +280,11 @@ "description": "The amount of time that the ONVIF device discovery will wait for supported device responses." } }, - "description": "OnvifDeviceDiscover request body." - }, - "OnvifDeviceDiscoverRequest": { - "type": "object", - "x-ms-discriminator-value": "onvifDeviceDiscover", - "allOf": [ - { - "$ref": "#/definitions/MethodRequest" - } - ], - "properties": { - "onvifDeviceDiscoverRequestBody": { - "$ref": "#/definitions/OnvifDeviceDiscoverRequestBody" - } - }, "description": "Lists all the discoverable ONVIF devices on the same subnet as the Edge Module." }, - "OnvifDeviceGetRequestBody": { + "OnvifDeviceGetRequest": { "type": "object", + "x-ms-discriminator-value": "onvifDeviceGet", "allOf": [ { "$ref": "#/definitions/MethodRequest" @@ -307,28 +295,9 @@ ], "properties": { "endpoint": { - "description": "ONVIF device endpoint.", "$ref": "./AzureVideoAnalyzer.json#/definitions/EndpointBase" } }, - "description": "OnvifDeviceGet request body." - }, - "OnvifDeviceGetRequest": { - "type": "object", - "x-ms-discriminator-value": "onvifDeviceGet", - "allOf": [ - { - "$ref": "#/definitions/MethodRequest" - } - ], - "required": [ - "onvifDeviceGetRequestBody" - ], - "properties": { - "onvifDeviceGetRequestBody": { - "$ref": "#/definitions/OnvifDeviceGetRequestBody" - } - }, "description": "Retrieves properties and media profiles of an ONVIF device." } } From 4bae6a93bc8563581f071612a90cb053afd65673 Mon Sep 17 00:00:00 2001 From: Himani Vyas Date: Tue, 12 Oct 2021 16:38:28 -0700 Subject: [PATCH 2/4] adding required to discoverduration --- .../preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json index 954f1e1ebc63..0b2175f158d8 100644 --- a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json +++ b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json @@ -274,6 +274,9 @@ "$ref": "#/definitions/MethodRequest" } ], + "required": [ + "discoveryDuration" + ], "properties": { "discoveryDuration": { "type": "string", From 2db4b9f0f3a8395fc6baa99662e4f65feb56306a Mon Sep 17 00:00:00 2001 From: Himani Vyas Date: Wed, 13 Oct 2021 14:27:09 -0700 Subject: [PATCH 3/4] removing assetsink --- .../preview/1.1.0/AzureVideoAnalyzer.json | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzer.json b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzer.json index 306293041cf6..01fbb962b84f 100644 --- a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzer.json +++ b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzer.json @@ -1705,43 +1705,6 @@ "description": "Defines a Spatial Analysis person line crossing operation. This requires the Azure Cognitive Services Spatial analysis module to be deployed alongside the Video Analyzer module, please see https://aka.ms/ava-spatial-analysis for more information.", "x-ms-discriminator-value": "#Microsoft.VideoAnalyzer.SpatialAnalysisPersonLineCrossingOperation" }, - "AssetSink": { - "type": "object", - "properties": { - "assetContainerSasUrl": { - "type": "string", - "description": "An Azure Storage SAS URL which points to container, such as the one created for an Azure Media Services asset.", - "example": "https://azurestorage.com/mycontainer?sig=mysecretkey" - }, - "segmentLength": { - "type": "string", - "example": "PT30S", - "description": "When writing media to an asset, wait until at least this duration of media has been accumulated on the Edge. Expressed in increments of 30 seconds, with a minimum of 30 seconds and a recommended maximum of 5 minutes." - }, - "localMediaCachePath": { - "type": "string", - "description": "Path to a local file system directory for temporary caching of media before writing to an Asset. Used when the Edge device is temporarily disconnected from Azure.", - "example": "/var/lib/tmp/" - }, - "localMediaCacheMaximumSizeMiB": { - "type": "string", - "description": "Maximum amount of disk space that can be used for temporary caching of media." - } - }, - "required": [ - "@type", - "assetContainerSasUrl", - "localMediaCachePath", - "localMediaCacheMaximumSizeMiB" - ], - "allOf": [ - { - "$ref": "#/definitions/SinkNodeBase" - } - ], - "description": "Enables a pipeline topology to record media to an Azure Media Services asset for subsequent playback.", - "x-ms-discriminator-value": "#Microsoft.VideoAnalyzer.AssetSink" - }, "RemoteDeviceAdapter": { "type": "object", "required": [ From 7c9185d6d5470057704dde79973cfde28e7985ef Mon Sep 17 00:00:00 2001 From: Himani Vyas Date: Thu, 14 Oct 2021 12:34:16 -0700 Subject: [PATCH 4/4] making discoveryDuration optional --- .../preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json index 0b2175f158d8..954f1e1ebc63 100644 --- a/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json +++ b/specification/videoanalyzer/data-plane/VideoAnalyzer.Edge/preview/1.1.0/AzureVideoAnalyzerSdkDefinitions.json @@ -274,9 +274,6 @@ "$ref": "#/definitions/MethodRequest" } ], - "required": [ - "discoveryDuration" - ], "properties": { "discoveryDuration": { "type": "string",