Merge branch 'master' of https://github.com/v-Ajnava/azure-rest-api-s…

…pecs into mstsplitswagger
Azure · Apr 20, 2020 · 199415f · 199415f
2 parents 7204c83 + 179468a
commit 199415f
Show file tree

Hide file tree

Showing 115 changed files with 2,331 additions and 509 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/specification/appconfiguration/resource-manager/readme.python.md b/specification/appconfiguration/resource-manager/readme.python.md
@@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.
 
-``` yaml $(python)
+``` yaml !$(track2)
 python-mode: create
 python:
   azure-arm: true
@@ -15,13 +15,28 @@ python:
   package-version: 0.1.0
   clear-output-folder: true
 ```
-``` yaml $(python) && $(python-mode) == 'update'
+
+These settings apply only when `--track2` is specified on the command line.
+
+``` yaml $(track2)
+azure-arm: true
+license-header: MICROSOFT_MIT_NO_VERSION
+package-name: azure-mgmt-appconfiguration
+no-namespace-folders: true
+package-version: 0.1.0
+```
+
+``` yaml $(python-mode) == 'update'
 python:
   no-namespace-folders: true
   output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
+no-namespace-folders: true
+output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
 ```
-``` yaml $(python) && $(python-mode) == 'create'
+``` yaml $(python-mode) == 'create'
 python:
   basic-setup-py: true
   output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
+basic-setup-py: true
+output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
 ```
diff --git a/...on/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backup.json b/...on/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backup.json
@@ -181,6 +181,20 @@
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
+    },
+    "TopParameter": {
+      "description": "OData top parameter.",
+      "name": "$top",
+      "in": "query",
+      "type": "string",
+      "x-ms-parameter-location": "method"
+    },
+    "SkipParameter": {
+      "description": "OData skip parameter.",
+      "name": "$skip",
+      "in": "query",
+      "type": "string",
+      "x-ms-parameter-location": "method"
     }
   },
   "securityDefinitions": {

diff --git a/...in/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json b/...in/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json
@@ -16,7 +16,7 @@
     "application/json"
   ],
   "paths": {
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations": {
       "get": {
         "x-ms-examples": {
           "Returns the list of backup locations.": {
@@ -37,6 +37,12 @@
           },
           {
             "$ref": "Backup.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "Backup.json#/parameters/TopParameter"
+          },
+          {
+            "$ref": "Backup.json#/parameters/SkipParameter"
           }
         ],
         "responses": {
@@ -52,7 +58,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}": {
       "get": {
         "x-ms-examples": {
           "Returns a specific backup location based on name.": {
@@ -129,17 +135,23 @@
             }
           }
         },
-        "x-ms-long-running-operation": true
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/createBackup": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/createBackup": {
       "post": {
         "x-ms-examples": {
           "Back up a specific location.": {
             "$ref": "./examples/BackupLocations/Backup.json"
           }
         },
         "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        },
         "description": "Back up a specific location.",
         "tags": [
           "BackupLocations"

diff --git a/...n/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backups.json b/...n/azsadmin/resource-manager/backup/Microsoft.Backup.Admin/preview/2018-09-01/Backups.json
@@ -16,7 +16,7 @@
     "application/json"
   ],
   "paths": {
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups": {
       "get": {
         "x-ms-examples": {
           "Returns a list of backups from a location.": {
@@ -40,6 +40,12 @@
           },
           {
             "$ref": "Backup.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "Backup.json#/parameters/TopParameter"
+          },
+          {
+            "$ref": "Backup.json#/parameters/SkipParameter"
           }
         ],
         "responses": {
@@ -55,7 +61,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups/{backup}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups/{backup}": {
       "get": {
         "x-ms-examples": {
           "Returns a backup from a location based on name.": {
@@ -94,7 +100,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups/{backup}/restore": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Backup.Admin/backupLocations/{location}/backups/{backup}/restore": {
       "post": {
         "x-ms-examples": {
           "Restore a backup.": {
@@ -137,7 +143,10 @@
             "description": "ACCEPTED"
           }
         },
-        "x-ms-long-running-operation": true
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
       }
     }
   },

diff --git a/specification/azsadmin/resource-manager/backup/readme.md b/specification/azsadmin/resource-manager/backup/readme.md
@@ -53,11 +53,10 @@ csharp:
   clear-output-folder: true
 ```
 
-## Multi-API/Profile support for AutoRest v3 generators 
+## Multi-API/Profile support for AutoRest v3 generators  
 
-AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
-
-This block is updated by an automatic script. Edits may be lost!
+AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. 
+This block is updated by an automatic script. Edits may be lost! 
 
 ``` yaml $(tag) == 'all-api-versions' /* autogenerated */
 # include the azure profile definitions from the standard location
@@ -69,13 +68,12 @@ input-file:
   - $(this-folder)/Microsoft.Backup.Admin/preview/2018-09-01/BackupLocations.json
   - $(this-folder)/Microsoft.Backup.Admin/preview/2018-09-01/Backups.json
 
-```
-
-If there are files that should not be in the `all-api-versions` set, 
-uncomment the  `exclude-file` section below and add the file paths.
+``` 
+If there are files that should not be in the `all-api-versions` set,  
+uncomment the  `exclude-file` section below and add the file paths. 
 
 ``` yaml $(tag) == 'all-api-versions'
-#exclude-file: 
-#  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
-```
 
+#exclude-file:  
+#  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json 
+```
diff --git a/...ification/azsadmin/resource-manager/infrastructureinsights/readme.azsautogen.md b/...ification/azsadmin/resource-manager/infrastructureinsights/readme.azsautogen.md
@@ -0,0 +1,12 @@
+# AutoRest v3 generators
+
+> see https://aka.ms/autorest
+
+``` yaml
+input-file:
+  - $(this-folder)/Microsoft.InfrastructureInsights.Admin/preview/2016-05-01/InfrastructureInsights.json
+  - $(this-folder)/Microsoft.InfrastructureInsights.Admin/preview/2016-05-01/Alert.json
+  - $(this-folder)/Microsoft.InfrastructureInsights.Admin/preview/2016-05-01/RegionHealth.json
+  - $(this-folder)/Microsoft.InfrastructureInsights.Admin/preview/2016-05-01/ResourceHealth.json
+  - $(this-folder)/Microsoft.InfrastructureInsights.Admin/preview/2016-05-01/ServiceHealth.json
+```
diff --git a/specification/azsadmin/resource-manager/infrastructureinsights/readme.md b/specification/azsadmin/resource-manager/infrastructureinsights/readme.md
@@ -60,9 +60,11 @@ csharp:
   clear-output-folder: true
 ```
 
-## Multi-API/Profile support for AutoRest v3 generators 
+## Multi-API/Profile support for AutoRest v3 generators
 
-AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.
+AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. 
+
+> see https://aka.ms/autorest
 
 This block is updated by an automatic script. Edits may be lost!
 
@@ -80,11 +82,10 @@ input-file:
 
 ```
 
-If there are files that should not be in the `all-api-versions` set, 
-uncomment the  `exclude-file` section below and add the file paths.
-
-``` yaml $(tag) == 'all-api-versions'
-#exclude-file: 
-#  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json
-```
+If there are files that should not be in the `all-api-versions` set,  
+uncomment the  `exclude-file` section below and add the file paths. 
 
+``` yaml $(tag) == 'all-api-versions' 
+#exclude-file:  
+#  - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json 
+```
diff --git a/...-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/AcquiredPlan.json b/...-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/AcquiredPlan.json
@@ -146,7 +146,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewAcquiredPlanParameter"
+            "$ref": "#/parameters/AcquiredPlanDefinitionParameter"
           }
         ],
         "responses": {
@@ -268,8 +268,8 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "NewAcquiredPlanParameter": {
-      "name": "newAcquiredPlan",
+    "AcquiredPlanDefinitionParameter": {
+      "name": "acquiredPlanDefinition",
       "in": "body",
       "description": "The new acquired plan.",
       "required": true,

diff --git a/...ger/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DelegatedProvider.json b/...ger/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DelegatedProvider.json
@@ -76,7 +76,7 @@
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "Subscriptions.json#/definitions/Subscription"
+              "$ref": "Subscriptions.json#/definitions/SubscriptionDefinition"
             }
           }
         }

diff --git a/...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DirectoryTenant.json b/...nager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/DirectoryTenant.json
@@ -146,7 +146,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewDirectoryTenantParameter"
+            "$ref": "#/parameters/DirectoryTenantDefinitionParameter"
           }
         ],
         "responses": {
@@ -220,9 +220,9 @@
       "in": "path",
       "x-ms-parameter-location": "method"
     },
-    "NewDirectoryTenantParameter": {
+    "DirectoryTenantDefinitionParameter": {
       "description": "New directory tenant properties.",
-      "name": "newTenant",
+      "name": "tenantDefinition",
       "required": true,
       "in": "body",
       "schema": {

diff --git a/...esource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Offer.json b/...esource-manager/subscriptions/Microsoft.Subscriptions.Admin/preview/2015-11-01/Offer.json
@@ -49,7 +49,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers": {
       "get": {
         "x-ms-examples": {
           "Get the list of offers under a resource group.": {
@@ -85,7 +85,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}": {
       "get": {
         "x-ms-examples": {
           "Get the specified offer.": {
@@ -145,7 +145,7 @@
             "$ref": "Subscriptions.json#/parameters/ApiVersionParameter"
           },
           {
-            "$ref": "#/parameters/NewOfferParameter"
+            "$ref": "#/parameters/OfferDefinitionParameter"
           }
         ],
         "responses": {
@@ -198,7 +198,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metrics": {
       "get": {
         "x-ms-examples": {
           "Get the offer metrics.": {
@@ -234,7 +234,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/metricDefinitions": {
       "get": {
         "x-ms-examples": {
           "Get the metric definitions.": {
@@ -270,7 +270,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/link": {
       "post": {
         "x-ms-examples": {
           "Links a plan to an offer.": {
@@ -309,7 +309,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Subscriptions.Admin/offers/{offer}/unlink": {
       "post": {
         "x-ms-examples": {
           "Unlink a plan from an offer.": {
@@ -508,9 +508,9 @@
     }
   },
   "parameters": {
-    "NewOfferParameter": {
+    "OfferDefinitionParameter": {
       "description": "New offer.",
-      "name": "newOffer",
+      "name": "offerDefinition",
       "in": "body",
       "required": true,
       "schema": {