From e891270a8b0f62d04dcd8bffcec97f4c16f1b56b Mon Sep 17 00:00:00 2001 From: Vishnu Priya Ananthu Sundaram Date: Thu, 26 Mar 2020 11:42:40 -0700 Subject: [PATCH 1/6] Cumulative commit message: commit 6ecda64dcb393720f871a662e75e4acfec5373a6 Author: Yuxing Zhou Date: Sat Jan 4 02:25:35 2020 +0800 [Azure Stack] Update fabric storage admin specs for new generation with autorest-beta (#8038) commit 9e551f0eab4057d4c2f54c333c7aa2a1a564c125 Author: bganapa Date: Tue Nov 12 11:44:22 2019 -0800 Reset to Stackadmin2 (#7766) --- .../preview/2016-05-01/Fabric.json | 14 ++ .../preview/2016-05-01/FileShare.json | 6 + .../preview/2018-10-01/StorageSubSystem.json | 6 + .../preview/2019-05-01/Drive.json | 6 + .../preview/2019-05-01/NasCluster.json | 207 ------------------ .../preview/2019-05-01/Volume.json | 6 + .../2019-05-01/examples/NasCluster/Get.json | 26 --- .../2019-05-01/examples/NasCluster/List.json | 29 --- .../fabric/readme.azsautogen.md | 71 ++++++ .../resource-manager/fabric/readme.md | 53 ----- 10 files changed, 109 insertions(+), 315 deletions(-) delete mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json delete mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json delete mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json create mode 100644 specification/azsadmin/resource-manager/fabric/readme.azsautogen.md diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json index c5f330cd75d5..4892ab4fcf57 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json @@ -191,6 +191,20 @@ "in": "query", "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/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json index 7726d7c276c8..5a99b2037a77 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json @@ -88,6 +88,12 @@ }, { "$ref": "Fabric.json#/parameters/FilterParameter" + }, + { + "$ref": "Fabric.json#/parameters/TopParameter" + }, + { + "$ref": "Fabric.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json index 5cbd44d07ee9..20dd46ceae88 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json @@ -91,6 +91,12 @@ }, { "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/TopParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json index a49309035b87..dc0c9da808f2 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json @@ -97,6 +97,12 @@ }, { "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/TopParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json deleted file mode 100644 index e93aa4081d80..000000000000 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "description": "Nas Cluster operation endpoints and objects.", - "title": "FabricAdminClient", - "version": "2019-05-01" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/nasClusters/{nasCluster}": { - "get": { - "x-ms-examples": { - "Return the requested a nas cluster.": { - "$ref": "./examples/NasCluster/Get.json" - } - }, - "tags": [ - "NasClusters" - ], - "description": "Return the requested nas cluster.", - "operationId": "NasClusters_Get", - "parameters": [ - { - "$ref": "../2016-05-01/Fabric.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../2016-05-01/Fabric.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "../2016-05-01/Fabric.json#/parameters/LocationParameter" - }, - { - "$ref": "#/parameters/NasClusterParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/NasCluster" - } - }, - "default": { - "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/nasClusters": { - "get": { - "x-ms-examples": { - "Returns a list of all storage nas clusters at a location.": { - "$ref": "./examples/NasCluster/List.json" - } - }, - "tags": [ - "NasClusters" - ], - "description": "Returns a list of all nas clusters at a location.", - "operationId": "NasClusters_List", - "parameters": [ - { - "$ref": "../2016-05-01/Fabric.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../2016-05-01/Fabric.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "../2016-05-01/Fabric.json#/parameters/LocationParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/NasClusterList" - } - }, - "default": { - "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-odata": "#/definitions/NasCluster" - } - } - }, - "definitions": { - "NasCluster": { - "description": "Representation of a nas cluster resource.", - "type": "object", - "properties": { - "properties": { - "description": "Properties of a nas cluster.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/NasClusterModel" - } - }, - "allOf": [ - { - "$ref": "../2016-05-01/Fabric.json#/definitions/Resource" - } - ] - }, - "NasClusterModel": { - "description": "Properties of a nas cluster.", - "type": "object", - "properties": { - "clusterName": { - "description": "Name of nas cluster", - "type": "string", - "readOnly": true - }, - "portalUri": { - "description": "The portal Uri of Nas Cluster", - "type": "string", - "readOnly": true - }, - "size": { - "description": "The size of Nas Cluster in bytes", - "format": "int64", - "type": "integer", - "readOnly": true - }, - "sizeRemaining": { - "description": "The remaining size of Nas Cluster in bytes", - "format": "int64", - "type": "integer", - "readOnly": true - } - } - }, - "NasClusterList": { - "description": "Pageable list of nas clusters.", - "type": "object", - "properties": { - "value": { - "description": "List of nas clusters.", - "type": "array", - "items": { - "$ref": "#/definitions/NasCluster" - } - }, - "nextLink": { - "description": "URI to the next page.", - "type": "string" - } - } - } - }, - "parameters": { - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "description": "Client API Version.", - "required": true, - "type": "string", - "default": "2019-05-01" - }, - "NasClusterParameter": { - "name": "nasCluster", - "description": "Name of the nas cluster.", - "in": "path", - "required": true, - "type": "string", - "x-ms-parameter-location": "method" - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json index 316cfe034ae4..53c132086ac8 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json @@ -97,6 +97,12 @@ }, { "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/TopParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json deleted file mode 100644 index ba17aab46318..000000000000 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "parameters": { - "api-version": "2019-05-01", - "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", - "resourceGroupName": "System.redmond", - "location": "redmond", - "nasCluster": "bc489b66-faa7-41f0-bee7-bcba258f10fb" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/nasClusters/bc489b66-faa7-41f0-bee7-bcba258f10fb", - "name": "redmond/bc489b66-faa7-41f0-bee7-bcba258f10fb", - "type": "Microsoft.Fabric.Admin/fabricLocations/nasClusters", - "location": "redmond", - "tags": {}, - "properties": { - "size": 193273528320, - "sizeRemaining": 20185522176, - "clusterName": "IsilonR430", - "portalUri": "https://100.85.198.239:8080/" - } - } - } - } -} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json deleted file mode 100644 index fb2283a82cc9..000000000000 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "api-version": "2019-05-01", - "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", - "resourceGroupName": "System.redmond", - "location": "redmond" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/nasClusters/bc489b66-faa7-41f0-bee7-bcba258f10fb", - "name": "redmond/bc489b66-faa7-41f0-bee7-bcba258f10fb", - "type": "Microsoft.Fabric.Admin/fabricLocations/nasClusters", - "location": "redmond", - "tags": {}, - "properties": { - "size": 193273528320, - "sizeRemaining": 20185522176, - "clusterName": "IsilonR430", - "portalUri": "https://100.85.198.239:8080/" - } - } - ] - } - } - } -} diff --git a/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md b/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md new file mode 100644 index 000000000000..e302204ab546 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md @@ -0,0 +1,71 @@ +# Fabric Admin + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for Fabric Admin. + +--- +## Getting Started +To build the SDK for Fabric Admin, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: + +> `autorest` + +To see additional help and options, run: + +> `autorest --help` +--- + +## Configuration + +### Basic Information +These are the global settings for the Fabric API. + +``` yaml +title: FabricAdminClient +description: Fabric Admin Client +openapi-type: arm +tag: package-2019-05-01 +``` + +``` yaml +input-file: + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ApplicationOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ComputeOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGateway.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGatewayPool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/FabricLocation.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/InfraRole.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/InfraRoleInstance.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/IpPool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/LogicalNetwork.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/LogicalSubnet.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/MacAddressPool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/NetworkOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnit.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnitNode.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/SlbMuxInstance.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StorageOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json +``` + +--- +# Code Generation + +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.AzureStack.Management.Fabric.Admin + payload-flattening-threshold: 1 + output-folder: $(csharp-sdks-folder)/Generated + clear-output-folder: true +``` diff --git a/specification/azsadmin/resource-manager/fabric/readme.md b/specification/azsadmin/resource-manager/fabric/readme.md index 66c605b587f4..948e78debd0d 100644 --- a/specification/azsadmin/resource-manager/fabric/readme.md +++ b/specification/azsadmin/resource-manager/fabric/readme.md @@ -114,7 +114,6 @@ input-file: - "Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json" - "Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json" - "Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json" - - "Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json" ``` ## Suppression @@ -130,7 +129,6 @@ directive: reason: externalDNSIPAddress02 is a customized name, no camel case restriction needed. ``` ---- # Code Generation ## C# @@ -147,54 +145,3 @@ csharp: output-folder: $(csharp-sdks-folder)/Generated clear-output-folder: true ``` - -## 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! - -``` yaml $(tag) == 'all-api-versions' /* autogenerated */ -# include the azure profile definitions from the standard location -require: $(this-folder)/../../../../profiles/readme.md - -# all the input files across all versions -input-file: - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ApplicationOperationResults.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ComputeOperationResults.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGateway.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGatewayPool.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/FabricLocation.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/InfraRole.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/InfraRoleInstance.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/IpPool.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/LogicalNetwork.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StoragePool.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StorageSystem.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/Volume.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/LogicalSubnet.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/MacAddressPool.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/NetworkOperationResults.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnit.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnitNode.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/SlbMuxInstance.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StorageOperationResults.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/Drive.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/Volume.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json - - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.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 -``` - From da932d4b84c7df3b71efd8c54bb8ec503c3b4c38 Mon Sep 17 00:00:00 2001 From: Vishnu Priya Ananthu Sundaram Date: Mon, 25 May 2020 22:41:05 -0700 Subject: [PATCH 2/6] Address PR comments --- .../preview/2016-05-01/Common.json | 18 ++++++++++++++++++ .../preview/2016-05-01/Fabric.json | 14 -------------- .../preview/2016-05-01/FileShare.json | 4 ++-- .../preview/2018-10-01/StorageSubSystem.json | 4 ++-- .../preview/2019-05-01/Drive.json | 4 ++-- .../preview/2019-05-01/Volume.json | 4 ++-- 6 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json new file mode 100644 index 000000000000..cb12030d45f5 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "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" + } + } +} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json index 4892ab4fcf57..c5f330cd75d5 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json @@ -191,20 +191,6 @@ "in": "query", "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/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json index 5a99b2037a77..4860d6ab336d 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json @@ -90,10 +90,10 @@ "$ref": "Fabric.json#/parameters/FilterParameter" }, { - "$ref": "Fabric.json#/parameters/TopParameter" + "$ref": "Common.json#/parameters/TopParameter" }, { - "$ref": "Fabric.json#/parameters/SkipParameter" + "$ref": "Common.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json index 20dd46ceae88..909c95d7085c 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json @@ -93,10 +93,10 @@ "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" }, { - "$ref": "../2016-05-01/Fabric.json#/parameters/TopParameter" + "$ref": "../2016-05-01/Common.json#/parameters/TopParameter" }, { - "$ref": "../2016-05-01/Fabric.json#/parameters/SkipParameter" + "$ref": "../2016-05-01/Common.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json index dc0c9da808f2..c668fc776cfa 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json @@ -99,10 +99,10 @@ "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" }, { - "$ref": "../2016-05-01/Fabric.json#/parameters/TopParameter" + "$ref": "../2016-05-01/Common.json#/parameters/TopParameter" }, { - "$ref": "../2016-05-01/Fabric.json#/parameters/SkipParameter" + "$ref": "../2016-05-01/Common.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json index 53c132086ac8..05be0b86dfbf 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json @@ -99,10 +99,10 @@ "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" }, { - "$ref": "../2016-05-01/Fabric.json#/parameters/TopParameter" + "$ref": "../2016-05-01/Common.json#/parameters/TopParameter" }, { - "$ref": "../2016-05-01/Fabric.json#/parameters/SkipParameter" + "$ref": "../2016-05-01/Common.json#/parameters/SkipParameter" } ], "responses": { From efb3311b7b41f51fb5ff36f5c682f4d23b27a1e4 Mon Sep 17 00:00:00 2001 From: Vishnu Priya Ananthu Sundaram Date: Mon, 25 May 2020 22:57:30 -0700 Subject: [PATCH 3/6] Fix semantic issue --- .../preview/2016-05-01/Common.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json index cb12030d45f5..395b55e41a6c 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2016-05-01/Common.json @@ -1,4 +1,21 @@ { + "swagger": "2.0", + "info": { + "version": "2016-05-01", + "title": "FabricAdminClient", + "description": "The common parameters for Fabric Management specs." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": {}, "parameters": { "TopParameter": { "description": "OData top parameter.", From c5d6dc05cf13ea5a550c34cd48f579c182c68eee Mon Sep 17 00:00:00 2001 From: Vishnu Priya Ananthu Sundaram Date: Mon, 3 Aug 2020 11:56:57 -0700 Subject: [PATCH 4/6] Reset NasCluster files to master --- .../preview/2019-05-01/NasCluster.json | 207 ++++++++++++++++++ .../2019-05-01/examples/NasCluster/Get.json | 26 +++ .../2019-05-01/examples/NasCluster/List.json | 29 +++ 3 files changed, 262 insertions(+) create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json new file mode 100644 index 000000000000..e93aa4081d80 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json @@ -0,0 +1,207 @@ +{ + "swagger": "2.0", + "info": { + "description": "Nas Cluster operation endpoints and objects.", + "title": "FabricAdminClient", + "version": "2019-05-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/nasClusters/{nasCluster}": { + "get": { + "x-ms-examples": { + "Return the requested a nas cluster.": { + "$ref": "./examples/NasCluster/Get.json" + } + }, + "tags": [ + "NasClusters" + ], + "description": "Return the requested nas cluster.", + "operationId": "NasClusters_Get", + "parameters": [ + { + "$ref": "../2016-05-01/Fabric.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/NasClusterParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/NasCluster" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/nasClusters": { + "get": { + "x-ms-examples": { + "Returns a list of all storage nas clusters at a location.": { + "$ref": "./examples/NasCluster/List.json" + } + }, + "tags": [ + "NasClusters" + ], + "description": "Returns a list of all nas clusters at a location.", + "operationId": "NasClusters_List", + "parameters": [ + { + "$ref": "../2016-05-01/Fabric.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/NasClusterList" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 Bad Request.\n\n * 500 Internal Server Error." + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-odata": "#/definitions/NasCluster" + } + } + }, + "definitions": { + "NasCluster": { + "description": "Representation of a nas cluster resource.", + "type": "object", + "properties": { + "properties": { + "description": "Properties of a nas cluster.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/NasClusterModel" + } + }, + "allOf": [ + { + "$ref": "../2016-05-01/Fabric.json#/definitions/Resource" + } + ] + }, + "NasClusterModel": { + "description": "Properties of a nas cluster.", + "type": "object", + "properties": { + "clusterName": { + "description": "Name of nas cluster", + "type": "string", + "readOnly": true + }, + "portalUri": { + "description": "The portal Uri of Nas Cluster", + "type": "string", + "readOnly": true + }, + "size": { + "description": "The size of Nas Cluster in bytes", + "format": "int64", + "type": "integer", + "readOnly": true + }, + "sizeRemaining": { + "description": "The remaining size of Nas Cluster in bytes", + "format": "int64", + "type": "integer", + "readOnly": true + } + } + }, + "NasClusterList": { + "description": "Pageable list of nas clusters.", + "type": "object", + "properties": { + "value": { + "description": "List of nas clusters.", + "type": "array", + "items": { + "$ref": "#/definitions/NasCluster" + } + }, + "nextLink": { + "description": "URI to the next page.", + "type": "string" + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2019-05-01" + }, + "NasClusterParameter": { + "name": "nasCluster", + "description": "Name of the nas cluster.", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] +} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json new file mode 100644 index 000000000000..ba17aab46318 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/Get.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", + "resourceGroupName": "System.redmond", + "location": "redmond", + "nasCluster": "bc489b66-faa7-41f0-bee7-bcba258f10fb" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/nasClusters/bc489b66-faa7-41f0-bee7-bcba258f10fb", + "name": "redmond/bc489b66-faa7-41f0-bee7-bcba258f10fb", + "type": "Microsoft.Fabric.Admin/fabricLocations/nasClusters", + "location": "redmond", + "tags": {}, + "properties": { + "size": 193273528320, + "sizeRemaining": 20185522176, + "clusterName": "IsilonR430", + "portalUri": "https://100.85.198.239:8080/" + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json new file mode 100644 index 000000000000..fb2283a82cc9 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/NasCluster/List.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2019-05-01", + "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", + "resourceGroupName": "System.redmond", + "location": "redmond" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/nasClusters/bc489b66-faa7-41f0-bee7-bcba258f10fb", + "name": "redmond/bc489b66-faa7-41f0-bee7-bcba258f10fb", + "type": "Microsoft.Fabric.Admin/fabricLocations/nasClusters", + "location": "redmond", + "tags": {}, + "properties": { + "size": 193273528320, + "sizeRemaining": 20185522176, + "clusterName": "IsilonR430", + "portalUri": "https://100.85.198.239:8080/" + } + } + ] + } + } + } +} From afb9047c0fe976095c8b0b7d7423d3a8c6a2cdbc Mon Sep 17 00:00:00 2001 From: Vishnu Priya Ananthu Sundaram Date: Mon, 3 Aug 2020 12:07:15 -0700 Subject: [PATCH 5/6] Add nascluster changes --- .../preview/2019-05-01/NasCluster.json | 6 ++++++ .../azsadmin/resource-manager/fabric/readme.azsautogen.md | 1 + specification/azsadmin/resource-manager/fabric/readme.md | 1 + 3 files changed, 8 insertions(+) diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json index e93aa4081d80..6c401faf4622 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json @@ -85,6 +85,12 @@ }, { "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + }, + { + "$ref": "../2016-05-01/Common.json#/parameters/TopParameter" + }, + { + "$ref": "../2016-05-01/Common.json#/parameters/SkipParameter" } ], "responses": { diff --git a/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md b/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md index e302204ab546..351a32ded328 100644 --- a/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md +++ b/specification/azsadmin/resource-manager/fabric/readme.azsautogen.md @@ -50,6 +50,7 @@ input-file: - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json" ``` --- diff --git a/specification/azsadmin/resource-manager/fabric/readme.md b/specification/azsadmin/resource-manager/fabric/readme.md index 948e78debd0d..840100979f81 100644 --- a/specification/azsadmin/resource-manager/fabric/readme.md +++ b/specification/azsadmin/resource-manager/fabric/readme.md @@ -114,6 +114,7 @@ input-file: - "Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json" - "Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json" - "Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json" + - "Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.json" ``` ## Suppression From 9ecb90cef16625c4409912655fce1bf8585ebeba Mon Sep 17 00:00:00 2001 From: Vishnu Priya Ananthu Sundaram Date: Sun, 30 Aug 2020 22:34:05 -0700 Subject: [PATCH 6/6] Revert readme.md changes --- .../resource-manager/fabric/readme.md | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/specification/azsadmin/resource-manager/fabric/readme.md b/specification/azsadmin/resource-manager/fabric/readme.md index 840100979f81..742e9b9ab447 100644 --- a/specification/azsadmin/resource-manager/fabric/readme.md +++ b/specification/azsadmin/resource-manager/fabric/readme.md @@ -130,6 +130,7 @@ directive: reason: externalDNSIPAddress02 is a customized name, no camel case restriction needed. ``` +--- # Code Generation ## C# @@ -146,3 +147,53 @@ csharp: output-folder: $(csharp-sdks-folder)/Generated clear-output-folder: true ``` + +## 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! + +``` yaml $(tag) == 'all-api-versions' /* autogenerated */ +# include the azure profile definitions from the standard location +require: $(this-folder)/../../../../profiles/readme.md + +# all the input files across all versions +input-file: + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ApplicationOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ComputeOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGateway.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGatewayPool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/FabricLocation.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/InfraRole.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/InfraRoleInstance.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/IpPool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/LogicalNetwork.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StoragePool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StorageSystem.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/Volume.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/LogicalSubnet.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/MacAddressPool.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/NetworkOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnit.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnitNode.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/SlbMuxInstance.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2016-05-01/StorageOperationResults.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/Drive.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/StorageSubSystem.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2018-10-01/Volume.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json + - $(this-folder)/Microsoft.Fabric.Admin/preview/2019-05-01/NasCluster.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 +```