From 2f3519625261f09adcdf8b2676642f70c07d23ae Mon Sep 17 00:00:00 2001
From: hivyas <61890270+hivyas@users.noreply.github.com>
Date: Fri, 15 Oct 2021 13:58:00 -0700
Subject: [PATCH] Removed OnvifDeviceGetRequestBody and
 OnVifDeviceDiscoverRequestBody (#16371)

* Removed OnvifDeviceGetRequestBody and OnVifDeviceDiscoverRequestBody

* adding required to discoverduration

* removing assetsink

* making discoveryDuration optional
---
 .../preview/1.1.0/AzureVideoAnalyzer.json     | 37 ----------------
 .../AzureVideoAnalyzerSdkDefinitions.json     | 43 +++----------------
 2 files changed, 6 insertions(+), 74 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": [
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."
     }
   }