From 29a04a67037543fc21517b6bcacc1cbc87a460c2 Mon Sep 17 00:00:00 2001
From: Samir Solanki <samirsolanki@outlook.com>
Date: Thu, 8 Mar 2018 15:12:25 -0800
Subject: [PATCH] Diagnostics and Tags are per Api Revision

---
 .../preview/2018-01-01/apimapis.json          | 36 ++++++++++++-------
 .../preview/2018-01-01/apimtags.json          | 32 ++++++++---------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json
index c5b475a4c689..9e1dd8b0477d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimapis.json
@@ -874,7 +874,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/OperationIdParameter"
@@ -1193,7 +1193,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/OperationIdParameter"
@@ -1367,7 +1367,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/OperationIdParameter"
@@ -1483,7 +1483,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
@@ -1534,7 +1534,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimanagement.json#/parameters/PolicyIdParameter"
@@ -1760,7 +1760,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimanagement.json#/parameters/ApiVersionParameter"
@@ -1814,7 +1814,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/SchemaIdParameter"
@@ -1863,7 +1863,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/SchemaIdParameter"
@@ -1915,7 +1915,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/SchemaIdParameter"
@@ -1979,7 +1979,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/SchemaIdParameter"
@@ -2638,7 +2638,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "#/parameters/ApiIdParameter"
+            "$ref": "#/parameters/ApiIdRevParameter"
           },
           {
             "name": "format",
@@ -2834,7 +2834,19 @@
           "x-ms-client-name": "SoapApiType",
           "x-ms-enum": {
             "name": "SoapApiType",
-            "modelAsString": true
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "http",
+                "description": "Imports a SOAP API having a RESTful front end.",
+                "name": "SoapToRest"
+              },
+              {
+                "value": "soap",
+                "description": "Imports the Soap API having a SOAP front end.",
+                "name": "SoapPassThrough"                
+              }
+            ]
           }
         }
       },
diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimtags.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimtags.json
index 85b4a38d78d1..0315b8ef4f7f 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimtags.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2018-01-01/apimtags.json
@@ -360,7 +360,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "name": "$filter",
@@ -422,7 +422,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -471,7 +471,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -523,7 +523,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -578,7 +578,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -629,7 +629,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "name": "$filter",
@@ -691,7 +691,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -740,7 +740,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -792,7 +792,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -856,7 +856,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "#/parameters/TagIdParameter"
@@ -907,7 +907,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimapis.json#/parameters/OperationIdParameter"
@@ -972,7 +972,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimapis.json#/parameters/OperationIdParameter"
@@ -1024,7 +1024,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimapis.json#/parameters/OperationIdParameter"
@@ -1079,7 +1079,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimapis.json#/parameters/OperationIdParameter"
@@ -1137,7 +1137,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "$ref": "./apimapis.json#/parameters/OperationIdParameter"
@@ -1191,7 +1191,7 @@
             "$ref": "./apimanagement.json#/parameters/ServiceNameParameter"
           },
           {
-            "$ref": "./apimapis.json#/parameters/ApiIdParameter"
+            "$ref": "./apimapis.json#/parameters/ApiIdRevParameter"
           },
           {
             "name": "$filter",