From f2d2d4fcc9658b6c0075753f97d2cd87ad178b52 Mon Sep 17 00:00:00 2001 From: zyxyoshine Date: Fri, 19 Jul 2019 11:41:54 +0800 Subject: [PATCH 1/3] copy spec content from previous version --- .../preview/2019-05-01/Drive.json | 250 ++++++++++++++++++ .../preview/2019-05-01/Volume.json | 231 ++++++++++++++++ .../2019-05-01/examples/Drive/Get.json | 38 +++ .../2019-05-01/examples/Drive/List.json | 41 +++ .../2019-05-01/examples/Volume/Get.json | 33 +++ .../2019-05-01/examples/Volume/List.json | 36 +++ 6 files changed, 629 insertions(+) create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json create mode 100644 specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json 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 new file mode 100644 index 000000000000..bd3f9ca72ad5 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Drive.json @@ -0,0 +1,250 @@ +{ + "swagger": "2.0", + "info": { + "description": "Drive operation endpoints and objects.", + "title": "FabricAdminClient", + "version": "2018-10-01" + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/drives/{drive}": { + "get": { + "x-ms-examples": { + "Return the requested a storage drive.": { + "$ref": "./examples/Drive/Get.json" + } + }, + "tags": [ + "Drives" + ], + "description": "Return the requested a storage drive.", + "operationId": "Drives_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": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" + }, + { + "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + }, + { + "$ref": "#/parameters/DriveParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Drive" + } + }, + "404": { + "description": "NOT FOUND" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/drives": { + "get": { + "x-ms-examples": { + "Returns a list of all storage drives at a location.": { + "$ref": "./examples/Drive/List.json" + } + }, + "tags": [ + "Drives" + ], + "description": "Returns a list of all storage drives at a location.", + "operationId": "Drives_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": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" + }, + { + "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DriveList" + } + }, + "404": { + "description": "NOT FOUND" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-odata": "#/definitions/Drive" + } + } + }, + "definitions": { + "Drive": { + "description": "Representation of a drive resource.", + "type": "object", + "properties": { + "properties": { + "description": "Properties of a drive.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/DriveModel" + } + }, + "allOf": [ + { + "$ref": "../2016-05-01/Fabric.json#/definitions/Resource" + } + ] + }, + "DriveModel": { + "description": "Properties of a drive.", + "type": "object", + "properties": { + "storageNode": { + "description": "Node that the drive is physically connected.", + "type": "string" + }, + "serialNumber": { + "description": "Serial number of the drive.", + "type": "string" + }, + "healthStatus": { + "description": "Health status of the drive.", + "type": "string" + }, + "operationalStatus": { + "description": "Operational status of the drive.", + "type": "string" + }, + "usage": { + "description": "Intended usage of the drive.", + "type": "string" + }, + "canPool": { + "description": "Indicate whether the drive can be added to the pool.", + "type": "boolean" + }, + "cannotPoolReason": { + "description": "Specify the reasons why the drive cannot be added to the pool.", + "type": "string" + }, + "physicalLocation": { + "description": "Indicate where the hardware is located.", + "type": "string" + }, + "model": { + "description": "Model of the drive.", + "type": "string" + }, + "mediaType": { + "description": "Media type of the drive.", + "type": "string" + }, + "capacityGB": { + "description": "Total capacity in GB of the drive.", + "format": "int32", + "type": "integer" + }, + "description": { + "description": "Detailed description for HealthStatus/OperationalStatus. Empty if HealthStatus/OperationalStatus is Healthy/Ok.", + "type": "string" + }, + "action": { + "description": "Detailed recommended action for HealthStatus/OperationalStatus. Empty if HealthStatus/OperationalStatus is Healthy/Ok.", + "type": "string" + } + } + }, + "DriveList": { + "description": "Pageable list of storage drives.", + "type": "object", + "properties": { + "value": { + "description": "List of storage drives.", + "type": "array", + "items": { + "$ref": "#/definitions/Drive" + } + }, + "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": "2018-10-01" + }, + "DriveParameter": { + "name": "drive", + "description": "Name of the storage drive.", + "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 new file mode 100644 index 000000000000..5e0ff0ee01e1 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/Volume.json @@ -0,0 +1,231 @@ +{ + "swagger": "2.0", + "info": { + "description": "Volume operation endpoints and objects.", + "title": "FabricAdminClient", + "version": "2018-10-01" + }, + "host": "adminmanagement.local.azurestack.external", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/volumes/{volume}": { + "get": { + "x-ms-examples": { + "Return the requested a storage volume.": { + "$ref": "./examples/Volume/Get.json" + } + }, + "tags": [ + "Volumes" + ], + "description": "Return the requested a storage volume.", + "operationId": "Volumes_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": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" + }, + { + "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + }, + { + "$ref": "#/parameters/VolumeParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Volume" + } + }, + "404": { + "description": "NOT FOUND" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/volumes": { + "get": { + "x-ms-examples": { + "Returns a list of all storage volumes at a location.": { + "$ref": "./examples/Volume/List.json" + } + }, + "tags": [ + "Volumes" + ], + "description": "Returns a list of all storage volumes at a location.", + "operationId": "Volumes_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": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" + }, + { + "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "../2016-05-01/Fabric.json#/parameters/FilterParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/VolumeList" + } + }, + "404": { + "description": "NOT FOUND" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-odata": "#/definitions/Volume" + } + } + }, + "definitions": { + "Volume": { + "description": "Representation of a volume resource.", + "type": "object", + "properties": { + "properties": { + "description": "Properties of a volume.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/VolumeModel" + } + }, + "allOf": [ + { + "$ref": "../2016-05-01/Fabric.json#/definitions/Resource" + } + ] + }, + "VolumeModel": { + "description": "Properties of a volume.", + "type": "object", + "properties": { + "totalCapacityGB": { + "description": "Total capacity in GB of the volume.", + "format": "int32", + "type": "integer" + }, + "remainingCapacityGB": { + "description": "Remaining capacity in GB of the volume.", + "format": "int32", + "type": "integer" + }, + "healthStatus": { + "description": "Health status of the volume.", + "type": "string" + }, + "operationalStatus": { + "description": "Operational status of the volume.", + "type": "string" + }, + "repairStatus": { + "description": "Repair status of the volume. Empty if no repair job running, something like 'Running, 90%' when repairing.", + "type": "string" + }, + "description": { + "description": "Detailed description for HealthStatus/OperationalStatus. Empty if HealthStatus/OperationalStatus is Healthy/Ok.", + "type": "string" + }, + "action": { + "description": "Detailed recommended action for HealthStatus/OperationalStatus. Empty if HealthStatus/OperationalStatus is Healthy/Ok.", + "type": "string" + }, + "volumeLabel": { + "description": "Volume label.", + "type": "string" + } + } + }, + "VolumeList": { + "description": "Pageable list of storage volumes.", + "type": "object", + "properties": { + "value": { + "description": "List of storage volumes.", + "type": "array", + "items": { + "$ref": "#/definitions/Volume" + } + }, + "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": "2018-10-01" + }, + "VolumeParameter": { + "name": "volume", + "description": "Name of the storage volume.", + "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/Drive/Get.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json new file mode 100644 index 000000000000..a86097ae0e11 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2018-10-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "resourceGroupName": "System.local", + "location": "local", + "scaleUnit": "S-Cluster", + "storageSubSystem": "S-Cluster.azurestack.local", + "drive": "14848052-5f5d-4206-97a5-2f7b1ed41705" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/drives/fafadf46-ce35-8e64-aa57-8b0be39d7c64", + "name": "fafadf46-ce35-8e64-aa57-8b0be39d7c64", + "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/drives", + "location": "local", + "tags": {}, + "properties": { + "storageNode": "local/HC1n22r0409", + "serialNumber": "S2CXNAAH200330", + "healthStatus": "Healthy", + "operationalStatus": "OK", + "usage": "Journal", + "canPool": false, + "cannotPoolReason": "In a Pool", + "physicalLocation": "Slot 0", + "model": "MZ7KM1T6HAJM00D3", + "mediaType": "SSD", + "capacityGB": 1490, + "description": "", + "action": "" + } + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json new file mode 100644 index 000000000000..7ec8d3b3ac04 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "api-version": "2018-10-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "resourceGroupName": "System.local", + "location": "local", + "scaleUnit": "S-Cluster", + "storageSubSystem": "S-Cluster.azurestack.local" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/drives/fafadf46-ce35-8e64-aa57-8b0be39d7c64", + "name": "fafadf46-ce35-8e64-aa57-8b0be39d7c64", + "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/drives", + "location": "local", + "tags": {}, + "properties": { + "storageNode": "local/HC1n22r0409", + "serialNumber": "S2CXNAAH200330", + "healthStatus": "Healthy", + "operationalStatus": "OK", + "usage": "Journal", + "canPool": false, + "cannotPoolReason": "In a Pool", + "physicalLocation": "Slot 0", + "model": "MZ7KM1T6HAJM00D3", + "mediaType": "SSD", + "capacityGB": 1490, + "description": "", + "action": "" + } + } + ] + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json new file mode 100644 index 000000000000..0d1a6d95ede4 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2018-10-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "resourceGroupName": "System.local", + "location": "local", + "scaleUnit": "S-Cluster", + "storageSubSystem": "S-Cluster.azurestack.local", + "volume": "28fbffa4" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/volumes/05c1cbb7", + "name": "05c1cbb7", + "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/volumes", + "location": "local", + "tags": {}, + "properties": { + "totalCapacityGB": 30797, + "remainingCapacityGB": 30416, + "healthStatus": "Healthy", + "operationalStatus": "OK", + "repairStatus": "", + "description": "", + "action": "", + "volumeLabel": "SU1_Volume" + } + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json new file mode 100644 index 000000000000..d7607bf8ba01 --- /dev/null +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "api-version": "2018-10-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "resourceGroupName": "System.local", + "location": "local", + "scaleUnit": "S-Cluster", + "storageSubSystem": "S-Cluster.azurestack.local" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/volumes/05c1cbb7", + "name": "05c1cbb7", + "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/volumes", + "location": "local", + "tags": {}, + "properties": { + "totalCapacityGB": 30797, + "remainingCapacityGB": 30416, + "healthStatus": "Healthy", + "operationalStatus": "OK", + "repairStatus": "", + "description": "", + "action": "", + "volumeLabel": "SU1_Volume" + } + } + ] + } + }, + "404": {} + } +} From 8cd2f783c596eee330b6a825d51ac406cc45a801 Mon Sep 17 00:00:00 2001 From: zyxyoshine Date: Fri, 19 Jul 2019 11:55:13 +0800 Subject: [PATCH 2/3] Update Volume and Drive API for Azure Stack Fabric Admin to 2019-05-01 --- .../preview/2019-05-01/Drive.json | 32 +++++++++------ .../preview/2019-05-01/Volume.json | 12 ++---- .../2019-05-01/examples/Drive/Get.json | 40 ++++++++++--------- .../2019-05-01/examples/Drive/List.json | 38 +++++++++--------- .../2019-05-01/examples/Volume/Get.json | 27 ++++++------- .../2019-05-01/examples/Volume/List.json | 25 ++++++------ .../resource-manager/fabric/readme.md | 31 +++++++++++++- 7 files changed, 120 insertions(+), 85 deletions(-) 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 bd3f9ca72ad5..08cb5519a49d 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 @@ -3,7 +3,7 @@ "info": { "description": "Drive operation endpoints and objects.", "title": "FabricAdminClient", - "version": "2018-10-01" + "version": "2019-05-01" }, "host": "adminmanagement.local.azurestack.external", "schemes": [ @@ -42,7 +42,7 @@ "$ref": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" }, { - "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + "$ref": "../2018-10-01/StorageSubSystem.json#/parameters/StorageSubSystemParameter" }, { "$ref": "#/parameters/DriveParameter" @@ -90,7 +90,7 @@ "$ref": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" }, { - "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + "$ref": "../2018-10-01/StorageSubSystem.json#/parameters/StorageSubSystemParameter" }, { "$ref": "#/parameters/ApiVersionParameter" @@ -158,14 +158,6 @@ "description": "Intended usage of the drive.", "type": "string" }, - "canPool": { - "description": "Indicate whether the drive can be added to the pool.", - "type": "boolean" - }, - "cannotPoolReason": { - "description": "Specify the reasons why the drive cannot be added to the pool.", - "type": "string" - }, "physicalLocation": { "description": "Indicate where the hardware is located.", "type": "string" @@ -174,6 +166,22 @@ "description": "Model of the drive.", "type": "string" }, + "firmwareVersion": { + "description": "The firmware version of the drive.", + "type": "string" + }, + "isIndicationEnabled": { + "description": "Indicate whether the drive's identification LEDs are active or not.", + "type": "boolean" + }, + "manufacturer": { + "description": "The name of the drive's manufacturer.", + "type": "string" + }, + "storagePool": { + "description": "The storage pool where the drive is located.", + "type": "string" + }, "mediaType": { "description": "Media type of the drive.", "type": "string" @@ -218,7 +226,7 @@ "description": "Client API Version.", "required": true, "type": "string", - "default": "2018-10-01" + "default": "2019-05-01" }, "DriveParameter": { "name": "drive", 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 5e0ff0ee01e1..14d8cb07fe5a 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 @@ -3,7 +3,7 @@ "info": { "description": "Volume operation endpoints and objects.", "title": "FabricAdminClient", - "version": "2018-10-01" + "version": "2019-05-01" }, "host": "adminmanagement.local.azurestack.external", "schemes": [ @@ -42,7 +42,7 @@ "$ref": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" }, { - "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + "$ref": "../2018-10-01/StorageSubSystem.json#/parameters/StorageSubSystemParameter" }, { "$ref": "#/parameters/VolumeParameter" @@ -90,7 +90,7 @@ "$ref": "../2016-05-01/ScaleUnit.json#/parameters/ScaleUnitParameter" }, { - "$ref": "StorageSubSystem.json#/parameters/StorageSubSystemParameter" + "$ref": "../2018-10-01/StorageSubSystem.json#/parameters/StorageSubSystemParameter" }, { "$ref": "#/parameters/ApiVersionParameter" @@ -156,10 +156,6 @@ "description": "Operational status of the volume.", "type": "string" }, - "repairStatus": { - "description": "Repair status of the volume. Empty if no repair job running, something like 'Running, 90%' when repairing.", - "type": "string" - }, "description": { "description": "Detailed description for HealthStatus/OperationalStatus. Empty if HealthStatus/OperationalStatus is Healthy/Ok.", "type": "string" @@ -199,7 +195,7 @@ "description": "Client API Version.", "required": true, "type": "string", - "default": "2018-10-01" + "default": "2019-05-01" }, "VolumeParameter": { "name": "volume", diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json index a86097ae0e11..e64a1ee5ce59 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/Get.json @@ -1,33 +1,35 @@ { "parameters": { - "api-version": "2018-10-01", - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "resourceGroupName": "System.local", - "location": "local", - "scaleUnit": "S-Cluster", - "storageSubSystem": "S-Cluster.azurestack.local", - "drive": "14848052-5f5d-4206-97a5-2f7b1ed41705" + "api-version": "2019-05-01", + "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", + "resourceGroupName": "System.redmond", + "location": "redmond", + "scaleUnit": "s-cluster", + "storageSubSystem": "s-cluster.v.masd.stbtest.microsoft.com", + "drive": "{bc489b66-faa7-41f0-bee7-bcba258f10fb}:PD:{0801e862-5bee-a657-7b19-6d1504372ecc}" }, "responses": { "200": { "body": { - "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/drives/fafadf46-ce35-8e64-aa57-8b0be39d7c64", - "name": "fafadf46-ce35-8e64-aa57-8b0be39d7c64", + "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/scaleUnits/s-cluster/storageSubSystems/s-cluster.v.masd.stbtest.microsoft.com/drives/{bc489b66-faa7-41f0-bee7-bcba258f10fb}:PD:{0801e862-5bee-a657-7b19-6d1504372ecc}", + "name": "redmond/s-cluster/s-cluster.v.masd.stbtest.microsoft.com/{bc489b66-faa7-41f0-bee7-bcba258f10fb}:PD:{0801e862-5bee-a657-7b19-6d1504372ecc}", "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/drives", - "location": "local", + "location": "redmond", "tags": {}, "properties": { - "storageNode": "local/HC1n22r0409", - "serialNumber": "S2CXNAAH200330", + "storageNode": "redmond/v-Host4", + "serialNumber": "4GV095AX", "healthStatus": "Healthy", "operationalStatus": "OK", - "usage": "Journal", - "canPool": false, - "cannotPoolReason": "In a Pool", - "physicalLocation": "Slot 0", - "model": "MZ7KM1T6HAJM00D3", - "mediaType": "SSD", - "capacityGB": 1490, + "usage": "Capacity", + "physicalLocation": "Integrated : Adapter 1 : Port 0 : Target 0 : LUN 4", + "model": "Virtual Disk", + "firmwareVersion": "1.0", + "isIndicationEnabled": false, + "manufacturer": "Msft", + "storagePool": "SU1_Pool", + "mediaType": "HDD", + "capacityGB": 1024, "description": "", "action": "" } diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json index 7ec8d3b3ac04..f4b50c143471 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Drive/List.json @@ -1,34 +1,36 @@ { "parameters": { - "api-version": "2018-10-01", - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "resourceGroupName": "System.local", - "location": "local", - "scaleUnit": "S-Cluster", - "storageSubSystem": "S-Cluster.azurestack.local" + "api-version": "2019-05-01", + "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", + "resourceGroupName": "System.redmond", + "location": "redmond", + "scaleUnit": "s-cluster", + "storageSubSystem": "s-cluster.v.masd.stbtest.microsoft.com" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/drives/fafadf46-ce35-8e64-aa57-8b0be39d7c64", - "name": "fafadf46-ce35-8e64-aa57-8b0be39d7c64", + "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/scaleUnits/s-cluster/storageSubSystems/s-cluster.v.masd.stbtest.microsoft.com/drives/{bc489b66-faa7-41f0-bee7-bcba258f10fb}:PD:{0801e862-5bee-a657-7b19-6d1504372ecc}", + "name": "redmond/s-cluster/s-cluster.v.masd.stbtest.microsoft.com/{bc489b66-faa7-41f0-bee7-bcba258f10fb}:PD:{0801e862-5bee-a657-7b19-6d1504372ecc}", "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/drives", - "location": "local", + "location": "redmond", "tags": {}, "properties": { - "storageNode": "local/HC1n22r0409", - "serialNumber": "S2CXNAAH200330", + "storageNode": "redmond/v-Host4", + "serialNumber": "4GV095AX", "healthStatus": "Healthy", "operationalStatus": "OK", - "usage": "Journal", - "canPool": false, - "cannotPoolReason": "In a Pool", - "physicalLocation": "Slot 0", - "model": "MZ7KM1T6HAJM00D3", - "mediaType": "SSD", - "capacityGB": 1490, + "usage": "Capacity", + "physicalLocation": "Integrated : Adapter 1 : Port 0 : Target 0 : LUN 4", + "model": "Virtual Disk", + "firmwareVersion": "1.0", + "isIndicationEnabled": false, + "manufacturer": "Msft", + "storagePool": "SU1_Pool", + "mediaType": "HDD", + "capacityGB": 1024, "description": "", "action": "" } diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json index 0d1a6d95ede4..ffbeee06959c 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/Get.json @@ -1,30 +1,29 @@ { "parameters": { - "api-version": "2018-10-01", - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "resourceGroupName": "System.local", - "location": "local", - "scaleUnit": "S-Cluster", - "storageSubSystem": "S-Cluster.azurestack.local", - "volume": "28fbffa4" + "api-version": "2019-05-01", + "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", + "resourceGroupName": "System.redmond", + "location": "redmond", + "scaleUnit": "s-cluster", + "storageSubSystem": "s-cluster.v.masd.stbtest.microsoft.com", + "volume": "48f356d4-362d-49cb-a021-fafffbe0e8ad" }, "responses": { "200": { "body": { - "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/volumes/05c1cbb7", - "name": "05c1cbb7", + "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/scaleUnits/s-cluster/storageSubSystems/s-cluster.v.masd.stbtest.microsoft.com/volumes/48f356d4-362d-49cb-a021-fafffbe0e8ad", + "name": "redmond/s-cluster/s-cluster.v.masd.stbtest.microsoft.com/48f356d4-362d-49cb-a021-fafffbe0e8ad", "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/volumes", - "location": "local", + "location": "redmond", "tags": {}, "properties": { - "totalCapacityGB": 30797, - "remainingCapacityGB": 30416, + "totalCapacityGB": 1375, + "remainingCapacityGB": 1317, "healthStatus": "Healthy", "operationalStatus": "OK", - "repairStatus": "", "description": "", "action": "", - "volumeLabel": "SU1_Volume" + "volumeLabel": "ObjStore_1" } } }, diff --git a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json index d7607bf8ba01..984dc9e01cd5 100644 --- a/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json +++ b/specification/azsadmin/resource-manager/fabric/Microsoft.Fabric.Admin/preview/2019-05-01/examples/Volume/List.json @@ -1,31 +1,30 @@ { "parameters": { - "api-version": "2018-10-01", - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "resourceGroupName": "System.local", - "location": "local", - "scaleUnit": "S-Cluster", - "storageSubSystem": "S-Cluster.azurestack.local" + "api-version": "2019-05-01", + "subscriptionId": "72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d", + "resourceGroupName": "System.redmond", + "location": "redmond", + "scaleUnit": "s-cluster", + "storageSubSystem": "s-cluster.v.masd.stbtest.microsoft.com" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/36e98cad-c8a5-4580-bef7-af878a237908/resourceGroups/System.local/providers/Microsoft.Fabric.Admin/fabricLocations/local/scaleUnits/S-Cluster/storageSubSystems/S-Cluster.azurestack.local/volumes/05c1cbb7", - "name": "05c1cbb7", + "id": "/subscriptions/72526b2b-4b61-4700-8f0c-7bb7ae9b6a2d/resourceGroups/System.redmond/providers/Microsoft.Fabric.Admin/fabricLocations/redmond/scaleUnits/s-cluster/storageSubSystems/s-cluster.v.masd.stbtest.microsoft.com/volumes/48f356d4-362d-49cb-a021-fafffbe0e8ad", + "name": "redmond/s-cluster/s-cluster.v.masd.stbtest.microsoft.com/48f356d4-362d-49cb-a021-fafffbe0e8ad", "type": "Microsoft.Fabric.Admin/fabricLocations/scaleUnits/storageSubSystems/volumes", - "location": "local", + "location": "redmond", "tags": {}, "properties": { - "totalCapacityGB": 30797, - "remainingCapacityGB": 30416, + "totalCapacityGB": 1375, + "remainingCapacityGB": 1317, "healthStatus": "Healthy", "operationalStatus": "OK", - "repairStatus": "", "description": "", "action": "", - "volumeLabel": "SU1_Volume" + "volumeLabel": "ObjStore_1" } } ] diff --git a/specification/azsadmin/resource-manager/fabric/readme.md b/specification/azsadmin/resource-manager/fabric/readme.md index 3fb1723bbc71..a2c2f7027c1e 100644 --- a/specification/azsadmin/resource-manager/fabric/readme.md +++ b/specification/azsadmin/resource-manager/fabric/readme.md @@ -24,7 +24,7 @@ These are the global settings for the Fabric API. title: FabricAdminClient description: Fabric Admin Client openapi-type: arm -tag: package-2016-05-01 +tag: package-2019-05-01 ``` ### Tag: package-2016-05-01 @@ -87,6 +87,35 @@ input-file: - "Microsoft.Fabric.Admin/preview/2018-10-01/Volume.json" ``` +### Tag: package-2019-05-01 + +These settings apply only when `--tag=package-2019-05-01` is specified on the command line. + +``` yaml $(tag) == 'package-2019-05-01' +input-file: + - "Microsoft.Fabric.Admin/preview/2016-05-01/ApplicationOperationResults.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/ComputeOperationResults.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/Fabric.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGateway.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/EdgeGatewayPool.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/FabricLocation.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/FileShare.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/InfraRole.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/InfraRoleInstance.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/IpPool.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/LogicalNetwork.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/LogicalSubnet.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/MacAddressPool.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/NetworkOperationResults.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnit.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/ScaleUnitNode.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/SlbMuxInstance.json" + - "Microsoft.Fabric.Admin/preview/2016-05-01/StorageOperationResults.json" + - "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" +``` + --- # Code Generation From 9f593cf6ef607427b1eea531c2a78404ac8f6f8d Mon Sep 17 00:00:00 2001 From: zyxyoshine Date: Fri, 19 Jul 2019 11:58:22 +0800 Subject: [PATCH 3/3] add the missing word --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 563283df46c7..164445d4e8ad 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1524,3 +1524,4 @@ Turbonomic Zerto Corent Carbonite +LEDs