From 45e2b46f79c23514d87f2cf65eb7d5786f6cddc9 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Thu, 15 Apr 2021 14:58:54 -0700 Subject: [PATCH 01/17] No changes -- new version directory with old specs --- .../examples/DiskPools_Delete.json | 13 + .../examples/DiskPools_Get.json | 43 + .../DiskPools_ListByResourceGroup.json | 78 + .../DiskPools_ListBySubscription.json | 77 + .../examples/DiskPools_Patch.json | 97 + .../examples/DiskPools_Put.json | 103 ++ .../examples/IscsiTargets_Delete.json | 14 + .../examples/IscsiTargets_Get.json | 50 + .../examples/IscsiTargets_ListByDiskPool.json | 91 + .../examples/IscsiTargets_Patch.json | 115 ++ .../examples/IscsiTargets_Put.json | 120 ++ .../examples/Operations_List.json | 73 + .../2021-04-01-preview/storagepool.json | 1628 +++++++++++++++++ 13 files changed, 2502 insertions(+) create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json new file mode 100644 index 000000000000..d38bf5d9b9ad --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool" + }, + "responses": { + "200": {}, + "204": {}, + "202": {} + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json new file mode 100644 index 000000000000..ea94f3cb191e --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "location": "westus2", + "name": "myDiskPool", + "type": "Microsoft.StoragePool/diskPools", + "properties": { + "availabilityZones": [ + "1" + ], + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "provisioningState": "Succeeded", + "status": "Healthy", + "disks": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" + } + ], + "tier": "Basic" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "tags": { + "env": "int" + } + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json new file mode 100644 index 000000000000..91bfb54f0ce3 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json @@ -0,0 +1,78 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "location": "westus2", + "name": "myDiskPool", + "properties": { + "availabilityZones": [ + "1" + ], + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "provisioningState": "Pending", + "status": "Unknown", + "disks": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" + } + ], + "tier": "Basic" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "tags": { + "env": "int" + }, + "type": "Microsoft.StoragePool/diskPools" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool2", + "location": "westus2", + "name": "myDiskPool2", + "properties": { + "availabilityZones": [ + "1" + ], + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "provisioningState": "Pending", + "status": "Unknown", + "disks": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" + } + ], + "tier": "Basic" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "tags": { + "env": "int" + }, + "type": "Microsoft.StoragePool/diskPools" + } + ], + "nextLink": "" + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json new file mode 100644 index 000000000000..0539edce32d2 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json @@ -0,0 +1,77 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "location": "westus2", + "name": "myDiskPool", + "properties": { + "availabilityZones": [ + "1" + ], + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "provisioningState": "Succeeded", + "status": "Healthy", + "disks": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" + } + ], + "tier": "Basic" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "tags": { + "env": "int" + }, + "type": "Microsoft.StoragePool/diskPools" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool2", + "location": "westus2", + "name": "myDiskPool2", + "properties": { + "availabilityZones": [ + "1" + ], + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "provisioningState": "Succeeded", + "status": "Healthy", + "disks": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" + } + ], + "tier": "Basic" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "tags": { + "env": "int" + }, + "type": "Microsoft.StoragePool/diskPools" + } + ], + "nextLink": "" + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json new file mode 100644 index 000000000000..a6e03a117b6f --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json @@ -0,0 +1,97 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool", + "diskPoolUpdatePayload": { + "tags": { + "key": "value" + }, + "properties": { + "disks": [ + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" + } + ] + } + } + }, + "responses": { + "202": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "name": "myDiskPool", + "type": "Microsoft.StoragePool/diskPools", + "location": "westus2", + "tags": { + "env": "int" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "properties": { + "provisioningState": "Pending", + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "status": "Unknown", + "disks": [ + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" + } + ], + "availabilityZones": [ + "1" + ], + "tier": "Basic" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "name": "myDiskPool", + "type": "Microsoft.StoragePool/diskPools", + "location": "westus2", + "tags": { + "env": "int" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "properties": { + "provisioningState": "Pending", + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "status": "Unknown", + "disks": [ + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" + } + ], + "availabilityZones": [ + "1" + ], + "tier": "Basic" + } + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json new file mode 100644 index 000000000000..6ac93709cd86 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json @@ -0,0 +1,103 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool", + "diskPoolCreatePayload": { + "location": "westus", + "tags": { + "key": "value" + }, + "properties": { + "availabilityZones": [ + "1" + ], + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "disks": [ + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" + } + ], + "tier": "Basic" + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "name": "myDiskPool", + "type": "Microsoft.StoragePool/diskPools", + "location": "westus2", + "tags": { + "env": "int" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "properties": { + "provisioningState": "Pending", + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "status": "Unknown", + "disks": [ + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" + } + ], + "availabilityZones": [ + "1" + ], + "tier": "Basic" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", + "name": "myDiskPool", + "type": "Microsoft.StoragePool/diskPools", + "location": "westus2", + "tags": { + "env": "int" + }, + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, + "properties": { + "provisioningState": "Pending", + "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", + "status": "Unknown", + "disks": [ + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" + }, + { + "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" + } + ], + "availabilityZones": [ + "1" + ], + "tier": "Basic" + } + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json new file mode 100644 index 000000000000..2a61d7310564 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool", + "iscsiTargetName": "myIscsiTarget" + }, + "responses": { + "200": {}, + "204": {}, + "202": {} + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json new file mode 100644 index 000000000000..6a76a26f79a7 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json @@ -0,0 +1,50 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool", + "iscsiTargetName": "myIscsiTarget" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3260" + ], + "tag": 1, + "port": 3260 + } + ], + "provisioningState": "Succeeded", + "status": "Healthy" + } + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json new file mode 100644 index 000000000000..7174b1c34a05 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json @@ -0,0 +1,91 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "tag": 1, + "port": 3260, + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3260" + ] + } + ], + "provisioningState": "Succeeded", + "status": "Healthy" + } + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget2", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server2", + "tpgs": [ + { + "tag": 1, + "port": 3261, + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_2", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3261" + ] + } + ], + "provisioningState": "Succeeded", + "status": "Healthy" + } + } + ], + "nextLink": "" + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json new file mode 100644 index 000000000000..9b5c5b39499e --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json @@ -0,0 +1,115 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool", + "iscsiTargetName": "myIscsiTarget", + "iscsiTargetUpdatePayload": { + "properties": { + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ], + "credentials": { + "username": "some_username", + "password": "some_password" + } + } + ] + } + ] + } + } + }, + "responses": { + "202": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3260" + ], + "tag": 1, + "port": 3260 + } + ], + "provisioningState": "Pending", + "status": "Unknown" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3260" + ], + "tag": 1, + "port": 3260 + } + ], + "provisioningState": "Pending", + "status": "Unknown" + } + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json new file mode 100644 index 000000000000..6a0b24916c65 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json @@ -0,0 +1,120 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool", + "iscsiTargetName": "myIscsiTarget", + "iscsiTargetCreatePayload": { + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ], + "credentials": { + "username": "some_username", + "password": "some_password" + } + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + } + } + ] + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3260" + ], + "tag": 1, + "port": 3260 + } + ], + "provisioningState": "Pending", + "status": "Unknown" + } + } + }, + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", + "name": "myIscsiTarget", + "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "properties": { + "targetIqn": "iqn.2005-03.org.iscsi:server1", + "tpgs": [ + { + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "acls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "attributes": { + "authentication": true, + "prodModeWriteProtect": false + }, + "endpoints": [ + "10.0.0.1:3260" + ], + "tag": 1, + "port": 3260 + } + ], + "provisioningState": "Pending", + "status": "Unknown" + } + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json new file mode 100644 index 000000000000..de57eee22f5c --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json @@ -0,0 +1,73 @@ +{ + "parameters": { + "api-version": "2020-03-15-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.StoragePool/diskPools/read", + "isDataAction": true, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "Disk Pool", + "operation": "Read Microsoft.StoragePool/diskPools", + "description": "Read Disk Pool" + } + }, + { + "name": "Microsoft.StoragePool/diskPools/write", + "isDataAction": true, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "Disk Pool", + "operation": "Create or Update Microsoft.StoragePool/diskPools", + "description": "Create or Update Disk Pool" + } + }, + { + "name": "Microsoft.StoragePool/diskPools/delete", + "isDataAction": true, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "Microsoft.StoragePool/diskPools", + "operation": "Delete Microsoft.StoragePool/diskPools", + "description": "Delete Disk Pool" + } + }, + { + "name": "Microsoft.StoragePool/diskPools/iscsiTargets/read", + "isDataAction": true, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "iSCSI targets", + "operation": "Read Microsoft.StoragePool/diskPools/iscsiTargets", + "description": "Read iSCSI targets" + } + }, + { + "name": "Microsoft.StoragePool/diskPools/iscsiTargets/write", + "isDataAction": true, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "iSCSI targets", + "operation": "Create or Update Microsoft.StoragePool/diskPools/iscsiTargets", + "description": "Create or Update iSCSI targets" + } + }, + { + "name": "Microsoft.StoragePool/diskPools/iscsiTargets/delete", + "isDataAction": true, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "iSCSI targets", + "operation": "Delete Microsoft.StoragePool/diskPools/iscsiTargets", + "description": "Delete iSCSI targets" + } + } + ] + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json new file mode 100644 index 000000000000..dcb1c58d63eb --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -0,0 +1,1628 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-03-15-preview", + "title": "StoragePoolManagement" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "tags": [ + { + "name": "StoragePoolOperations", + "description": "APIs for StoragePool operations." + }, + { + "name": "DiskPools", + "description": "APIs for Disk pool operations." + }, + { + "name": "IscsiTargets", + "description": "APIs for iSCSI target operations." + } + ], + "paths": { + "/providers/Microsoft.StoragePool/operations": { + "get": { + "tags": [ + "StoragePoolOperations" + ], + "operationId": "Operations_List", + "description": "Gets a list of StoragePool operations.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Retrieved RP operations", + "schema": { + "$ref": "#/definitions/StoragePoolOperationListResult" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + }, + "x-ms-examples": { + "List operations": { + "$ref": "./examples/Operations_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StoragePool/diskPools": { + "get": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_ListBySubscription", + "description": "Gets a list of Disk Pools in a subscription", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation completed successfully; retrieved diskPools by subscription", + "schema": { + "$ref": "#/definitions/DiskPoolListResult" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Disk Pools by subscription": { + "$ref": "./examples/DiskPools_ListBySubscription.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools": { + "get": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_ListByResourceGroup", + "description": "Gets a list of DiskPools in a resource group.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation completed successfully; retrieved diskPools by resource group", + "schema": { + "$ref": "#/definitions/DiskPoolListResult" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Disk Pools": { + "$ref": "./examples/DiskPools_ListByResourceGroup.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}": { + "put": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_CreateOrUpdate", + "description": "Create or Update Disk pool.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/DiskPoolCreate" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returned when the create or update operation is successfully completed.", + "schema": { + "$ref": "#/definitions/DiskPool" + } + }, + "201": { + "description": "Accepted -- Create or update request accepted; operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DiskPool" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Create or Update Disk pool": { + "$ref": "./examples/DiskPools_Put.json" + } + } + }, + "patch": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_Update", + "description": "Update a Disk pool.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/DiskPoolUpdate" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returned when the update operation is successfully completed.", + "schema": { + "$ref": "#/definitions/DiskPool" + } + }, + "202": { + "description": "Accepted -- Update request accepted; operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/DiskPool" + } + }, + "default": { + "description": "Error from the RP.", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-examples": { + "Update Disk pool": { + "$ref": "./examples/DiskPools_Patch.json" + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } + }, + "delete": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_Delete", + "description": "Delete a Disk pool.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Delete operation completed successfully." + }, + "204": { + "description": "Resource does not exist in the subscription." + }, + "202": { + "description": "Delete request accepted; operation will complete asynchronously." + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Delete Disk pool": { + "$ref": "./examples/DiskPools_Delete.json" + } + } + }, + "get": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_Get", + "description": "Get a Disk pool.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation completed successfully; retrieved Disk pool.", + "schema": { + "$ref": "#/definitions/DiskPool" + } + }, + "default": { + "description": "Error from the RP.", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-examples": { + "Get Disk pool": { + "$ref": "./examples/DiskPools_Get.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/iscsiTargets": { + "get": { + "tags": [ + "IscsiTargets" + ], + "description": "Get iSCSI Targets in a Disk pool.", + "operationId": "IscsiTargets_ListByDiskPool", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation completed successfully; retrieved iSCSI Targets in a Disk pool.", + "schema": { + "$ref": "#/definitions/IscsiTargetList" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Disk Pools by Resource Group": { + "$ref": "./examples/IscsiTargets_ListByDiskPool.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/iscsiTargets/{iscsiTargetName}": { + "put": { + "tags": [ + "IscsiTargets" + ], + "description": "Create or Update an iSCSI target.", + "operationId": "IscsiTargets_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/IscsiTargetName" + }, + { + "$ref": "#/parameters/IscsiTargetCreate" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returned when the create or update operation is successfully completed.", + "schema": { + "$ref": "#/definitions/IscsiTarget" + } + }, + "201": { + "description": "Accepted -- Create or update request accepted; operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/IscsiTarget" + } + }, + "default": { + "description": "Error from the RP.", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Create or Update iSCSI target": { + "$ref": "./examples/IscsiTargets_Put.json" + } + } + }, + "patch": { + "tags": [ + "IscsiTargets" + ], + "description": "Update an iSCSI target.", + "operationId": "IscsiTargets_Update", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/IscsiTargetName" + }, + { + "$ref": "#/parameters/IscsiTargetUpdate" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK -- Returned when the update operation is successfully completed.", + "schema": { + "$ref": "#/definitions/IscsiTarget" + } + }, + "202": { + "description": "Accepted -- Update request accepted; operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/IscsiTarget" + } + }, + "default": { + "description": "Error from the RP.", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Update iSCSI target": { + "$ref": "./examples/IscsiTargets_Patch.json" + } + } + }, + "delete": { + "tags": [ + "IscsiTargets" + ], + "description": "Delete an iSCSI target.", + "operationId": "IscsiTargets_Delete", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/IscsiTargetName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Delete operation completed successfully." + }, + "204": { + "description": "Resource does not exist in the subscription." + }, + "202": { + "description": "Delete request accepted; operation will complete asynchronously." + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Delete iSCSI target": { + "$ref": "./examples/IscsiTargets_Delete.json" + } + } + }, + "get": { + "tags": [ + "IscsiTargets" + ], + "description": "Get an iSCSI target.", + "operationId": "IscsiTargets_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/IscsiTargetName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation completed successfully; retrieved iSCSI target.", + "schema": { + "$ref": "#/definitions/IscsiTarget" + } + }, + "default": { + "description": "Error from the RP.", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-examples": { + "Get iSCSI target": { + "$ref": "./examples/IscsiTargets_Get.json" + } + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The ID of the target subscription.", + "minLength": 1 + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to use for this operation.", + "minLength": 1 + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group. The name is case insensitive.", + "pattern": "^[-\\w\\._]*[0-9A-Za-z]$", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, + "DiskPoolName": { + "name": "diskPoolName", + "in": "path", + "required": true, + "type": "string", + "pattern": "^[-\\w\\._]+$", + "minLength": 1, + "maxLength": 90, + "description": "The name of the Disk pool.", + "x-ms-parameter-location": "method" + }, + "IscsiTargetName": { + "name": "iscsiTargetName", + "type": "string", + "required": true, + "in": "path", + "description": "The name of the iSCSI target.", + "x-ms-parameter-location": "method" + }, + "DiskPoolCreate": { + "name": "diskPoolCreatePayload", + "required": true, + "in": "body", + "description": "Request payload for Disk pool create operation", + "schema": { + "$ref": "#/definitions/DiskPoolCreate" + }, + "x-ms-parameter-location": "method" + }, + "DiskPoolUpdate": { + "name": "diskPoolUpdatePayload", + "required": true, + "in": "body", + "description": "Request payload for Disk pool update operation.", + "schema": { + "$ref": "#/definitions/DiskPoolUpdate" + }, + "x-ms-parameter-location": "method" + }, + "IscsiTargetCreate": { + "name": "iscsiTargetCreatePayload", + "required": true, + "in": "body", + "description": "Request payload for iSCSI target create operation.", + "schema": { + "$ref": "#/definitions/IscsiTargetCreate" + }, + "x-ms-parameter-location": "method" + }, + "IscsiTargetUpdate": { + "name": "iscsiTargetUpdatePayload", + "required": true, + "in": "body", + "description": "Request payload for iSCSI target operations.", + "schema": { + "$ref": "#/definitions/IscsiTargetUpdate" + }, + "x-ms-parameter-location": "method" + }, + "OperationId": { + "name": "operationId", + "type": "string", + "required": true, + "in": "path", + "description": "The unique uuid of an operation.", + "x-ms-parameter-location": "method" + }, + "Location": { + "name": "location", + "type": "string", + "required": true, + "in": "path", + "description": "The location of the resource.", + "x-ms-parameter-location": "method" + } + }, + "definitions": { + "StoragePoolOperationDisplay": { + "type": "object", + "required": [ + "provider", + "resource", + "operation", + "description" + ], + "description": "Metadata about an operation.", + "additionalProperties": false, + "properties": { + "provider": { + "type": "string", + "description": "Localized friendly form of the resource provider name." + }, + "resource": { + "type": "string", + "description": "Localized friendly form of the resource type related to this action/operation." + }, + "operation": { + "type": "string", + "description": "Localized friendly name for the operation, as it should be shown to the user." + }, + "description": { + "type": "string", + "description": "Localized friendly description for the operation, as it should be shown to the user." + } + } + }, + "StoragePoolRPOperation": { + "type": "object", + "required": [ + "name", + "isDataAction", + "display" + ], + "description": "Description of a StoragePool RP Operation", + "additionalProperties": false, + "properties": { + "name": { + "type": "string", + "description": "The name of the operation being performed on this particular object" + }, + "isDataAction": { + "type": "boolean", + "description": "Indicates whether the operation applies to data-plane." + }, + "actionType": { + "type": "string", + "description": "Indicates the action type." + }, + "display": { + "description": "Additional metadata about RP operation.", + "$ref": "#/definitions/StoragePoolOperationDisplay" + }, + "origin": { + "type": "string", + "description": "The intended executor of the operation; governs the display of the operation in the RBAC UX and the audit logs UX." + } + } + }, + "StoragePoolOperationListResult": { + "type": "object", + "required": [ + "value" + ], + "description": "List of operations supported by the RP.", + "additionalProperties": false, + "properties": { + "value": { + "type": "array", + "description": "An array of operations supported by the StoragePool RP.", + "items": { + "$ref": "#/definitions/StoragePoolRPOperation" + } + }, + "nextLink": { + "description": "URI to fetch the next section of the paginated response.", + "type": "string" + } + } + }, + "DiskPoolListResult": { + "type": "object", + "required": [ + "value" + ], + "description": "List of Disk Pools", + "additionalProperties": false, + "properties": { + "value": { + "description": "An array of Disk pool objects.", + "type": "array", + "items": { + "$ref": "#/definitions/DiskPool" + } + }, + "nextLink": { + "description": "URI to fetch the next section of the paginated response.", + "type": "string", + "readOnly": true + } + } + }, + "DiskPool": { + "type": "object", + "description": "Response for Disk pool request.", + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Properties of Disk pool.", + "$ref": "#/definitions/DiskPoolProperties" + }, + "systemData": { + "description": "Resource metadata required by ARM RPC", + "readOnly": true, + "$ref": "#/definitions/SystemMetadata" + } + }, + "allOf": [ + { + "$ref": "#/definitions/TrackedResource" + } + ] + }, + "DiskPoolCreate": { + "type": "object", + "description": "Request payload for create or update Disk pool request.", + "required": [ + "properties", + "location" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for Disk pool create request.", + "$ref": "#/definitions/DiskPoolCreateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives." + }, + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." + } + }, + "x-ms-azure-resource": true + }, + "DiskPoolUpdate": { + "type": "object", + "description": "Request payload for Update Disk pool request.", + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for Disk pool update request.", + "$ref": "#/definitions/DiskPoolUpdateProperties" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + } + } + }, + "AvailabilityZone": { + "type": "string", + "description": "Availability zone." + }, + "DiskPoolProperties": { + "type": "object", + "description": "Disk pool response properties.", + "required": [ + "availabilityZones", + "subnetId", + "provisioningState", + "status", + "tier" + ], + "properties": { + "provisioningState": { + "description": "State of the operation on the resource.", + "type": "string", + "$ref": "#/definitions/ProvisioningState" + }, + "availabilityZones": { + "type": "array", + "description": "Logical zone for Disk pool resource; example: [\"1\"].", + "items": { + "$ref": "#/definitions/AvailabilityZone" + } + }, + "status": { + "type": "string", + "$ref": "#/definitions/OperationalStatus", + "description": "Operational status of the Disk pool." + }, + "disks": { + "type": "array", + "description": "List of Azure Managed Disks to attach to a Disk pool. Can attach 8 disks at most.", + "items": { + "$ref": "#/definitions/Disk" + }, + "minLength": 0, + "maxLength": 8 + }, + "subnetId": { + "type": "string", + "description": "Azure Resource ID of a Subnet for the Disk pool.", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "additionalCapabilities": { + "type": "array", + "description": "List of additional capabilities for Disk pool.", + "items": { + "$ref": "#/definitions/AdditionalCapability" + } + }, + "tier": { + "description": "Determines the SKU of VM deployed for Disk pool", + "type": "string", + "$ref": "#/definitions/DiskPoolTier" + } + } + }, + "DiskPoolCreateProperties": { + "type": "object", + "description": "Properties for Disk pool create or update request.", + "required": [ + "availabilityZones", + "subnetId", + "tier" + ], + "properties": { + "availabilityZones": { + "type": "array", + "description": "Logical zone for Disk pool resource; example: [\"1\"].", + "items": { + "$ref": "#/definitions/AvailabilityZone" + } + }, + "disks": { + "type": "array", + "description": "List of Azure Managed Disks to attach to a Disk pool. Can attach 8 disks at most.", + "items": { + "$ref": "#/definitions/Disk" + }, + "minLength": 0, + "maxLength": 8 + }, + "subnetId": { + "type": "string", + "description": "Azure Resource ID of a Subnet for the Disk pool.", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "additionalCapabilities": { + "type": "array", + "description": "List of additional capabilities for a Disk pool.", + "items": { + "$ref": "#/definitions/AdditionalCapability" + } + }, + "tier": { + "description": "Determines the SKU of VM deployed for Disk pool", + "type": "string", + "$ref": "#/definitions/DiskPoolTier" + } + } + }, + "DiskPoolUpdateProperties": { + "type": "object", + "description": "Properties for Disk pool update request.", + "properties": { + "disks": { + "type": "array", + "description": "List of Azure Managed Disks to attach to a Disk pool. Can attach 8 disks at most.", + "items": { + "$ref": "#/definitions/Disk" + }, + "minLength": 0, + "maxLength": 8 + } + } + }, + "Disk": { + "type": "object", + "description": "Azure Managed Disk to attach to the Disk pool.", + "required": [ + "id" + ], + "additionalProperties": false, + "properties": { + "id": { + "type": "string", + "description": "Unique Azure Resource ID of the Managed Disk." + } + } + }, + "AdditionalCapability": { + "type": "string", + "description": "Special capability that can be set on the Disk pool." + }, + "IscsiTargetList": { + "type": "object", + "required": [ + "value" + ], + "description": "List of iSCSI Targets.", + "additionalProperties": false, + "properties": { + "value": { + "type": "array", + "description": "An array of iSCSI targets in a Disk pool.", + "items": { + "$ref": "#/definitions/IscsiTarget" + } + }, + "nextLink": { + "description": "URI to fetch the next section of the paginated response.", + "type": "string", + "readOnly": true + } + } + }, + "IscsiTarget": { + "type": "object", + "description": "Response for iSCSI target requests.", + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for iSCSI target operations.", + "$ref": "#/definitions/IscsiTargetProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, + "IscsiTargetCreate": { + "type": "object", + "description": "Payload for iSCSI target create or update requests.", + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for iSCSI target create request.", + "$ref": "#/definitions/IscsiTargetCreateProperties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] + }, + "IscsiTargetUpdate": { + "type": "object", + "description": "Payload for iSCSI target update request.", + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for iSCSI target update request.", + "$ref": "#/definitions/IscsiTargetUpdateProperties" + } + } + }, + "IscsiTargetProperties": { + "type": "object", + "description": "Response properties for iSCSI target operations.", + "required": [ + "tpgs", + "targetIqn", + "provisioningState", + "status" + ], + "properties": { + "provisioningState": { + "description": "State of the operation on the resource.", + "type": "string", + "$ref": "#/definitions/ProvisioningState" + }, + "status": { + "type": "string", + "$ref": "#/definitions/OperationalStatus", + "description": "Operational status of the iSCSI target." + }, + "tpgs": { + "type": "array", + "description": "List of iSCSI target portal groups. Can have 1 portal group at most.", + "items": { + "$ref": "#/definitions/TargetPortalGroup" + }, + "maxLength": 1, + "minLength": 1 + }, + "targetIqn": { + "type": "string", + "description": "iSCSI target IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:server\"." + } + } + }, + "IscsiTargetCreateProperties": { + "type": "object", + "description": "Properties for iSCSI target create or update request.", + "required": [ + "tpgs" + ], + "properties": { + "tpgs": { + "type": "array", + "description": "List of iSCSI target portal groups. Can have 1 portal group at most.", + "items": { + "$ref": "#/definitions/TargetPortalGroupCreate" + }, + "maxLength": 1, + "minLength": 1 + }, + "targetIqn": { + "type": "string", + "description": "iSCSI target IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:server\"." + } + } + }, + "IscsiTargetUpdateProperties": { + "type": "object", + "description": "Properties for iSCSI target update request.", + "required": [ + "tpgs" + ], + "properties": { + "tpgs": { + "type": "array", + "description": "List of iSCSI target portal groups. Can have 1 portal group at most.", + "items": { + "$ref": "#/definitions/TargetPortalGroupUpdate" + }, + "maxLength": 1, + "minLength": 1 + } + } + }, + "TargetPortalGroup": { + "type": "object", + "description": "Response properties for iSCSI target portal group.", + "required": [ + "luns", + "acls", + "attributes", + "endpoints", + "tag", + "port" + ], + "properties": { + "luns": { + "type": "array", + "description": "List of LUNs to be exposed through iSCSI target portal group.", + "items": { + "$ref": "#/definitions/IscsiLun" + }, + "minLength": 1, + "maxLength": 8 + }, + "acls": { + "type": "array", + "description": "Access Control List (ACL) for an iSCSI target portal group.", + "items": { + "$ref": "#/definitions/Acl" + }, + "minLength": 1, + "maxLength": 16 + }, + "attributes": { + "description": "Attributes of an iSCSI target portal group.", + "$ref": "#/definitions/Attributes" + }, + "endpoints": { + "description": "List of private IPv4 addresses to connect to the iSCSI target.", + "type": "array", + "items": { + "type": "string" + } + }, + "tag": { + "type": "integer", + "format": "int32", + "description": "The tag associated with the iSCSI target portal group." + }, + "port": { + "type": "integer", + "format": "int32", + "description": "The port used by iSCSI target portal group." + } + } + }, + "TargetPortalGroupCreate": { + "type": "object", + "description": "Target portal group properties for create or update iSCSI target request.", + "required": [ + "luns", + "acls", + "attributes" + ], + "properties": { + "luns": { + "type": "array", + "description": "List of LUNs to be exposed through the iSCSI target portal group.", + "items": { + "$ref": "#/definitions/IscsiLun" + }, + "minLength": 1, + "maxLength": 8 + }, + "acls": { + "type": "array", + "description": "Access Control List (ACL) for an iSCSI target portal group.", + "items": { + "$ref": "#/definitions/Acl" + }, + "minLength": 1, + "maxLength": 16 + }, + "attributes": { + "description": "Attributes of an iSCSI target portal group.", + "$ref": "#/definitions/Attributes" + } + } + }, + "TargetPortalGroupUpdate": { + "type": "object", + "description": "Target portal group properties for update iSCSI target request.", + "properties": { + "luns": { + "type": "array", + "description": "List of LUNs to be exposed through the iSCSI target portal group.", + "items": { + "$ref": "#/definitions/IscsiLun" + }, + "minLength": 1, + "maxLength": 8 + }, + "acls": { + "type": "array", + "description": "Access Control List (ACL) for an iSCSI target portal group.", + "items": { + "$ref": "#/definitions/Acl" + }, + "minLength": 1, + "maxLength": 16 + } + } + }, + "Acl": { + "type": "object", + "description": "Access Control List (ACL) for an iSCSI target portal group", + "required": [ + "initiatorIqn", + "mappedLuns" + ], + "properties": { + "initiatorIqn": { + "type": "string", + "description": "iSCSI initiator IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:client\"." + }, + "mappedLuns": { + "type": "array", + "description": "List of LUN names mapped to the ACL.", + "items": { + "type": "string" + } + }, + "credentials": { + "description": "Challenge Handshake Authentication Protocol (CHAP) credentials to set for the ACL. Credentials can not be updated for an ACL.", + "x-ms-client-flatten": true, + "x-ms-secret": true, + "x-ms-mutability": [ + "create" + ], + "$ref": "#/definitions/IscsiTargetCredentials" + } + } + }, + "Attributes": { + "type": "object", + "description": "Attributes of a iSCSI target portal group.", + "required": [ + "authentication", + "prodModeWriteProtect" + ], + "properties": { + "authentication": { + "type": "boolean", + "description": "Indicates whether or not authentication is enabled on the ACL." + }, + "prodModeWriteProtect": { + "type": "boolean", + "description": "Indicates whether or not write protect is enabled on the LUNs." + } + }, + "x-ms-mutability": [ + "read", + "create" + ] + }, + "IscsiTargetCredentials": { + "type": "object", + "required": [ + "username", + "password" + ], + "description": "Challenge Handshake Authentication Protocol (CHAP) credentials for an iSCSI target ACL.", + "properties": { + "username": { + "type": "string", + "description": "Username for Challenge Handshake Authentication Protocol (CHAP) authentication.", + "minLength": 7, + "maxLength": 511 + }, + "password": { + "type": "string", + "description": "Password for Challenge Handshake Authentication Protocol (CHAP) authentication.", + "minLength": 12, + "maxLength": 255, + "pattern": "^[-\\w_0-9A-Za-z]*$" + } + } + }, + "IscsiLun": { + "type": "object", + "required": [ + "name", + "managedDiskAzureResourceId" + ], + "description": "LUN to expose the Azure Managed Disk.", + "additionalProperties": false, + "properties": { + "name": { + "type": "string", + "minimum": 1, + "maximum": 90, + "description": "User defined name for iSCSI LUN; example: \"lun0\"" + }, + "managedDiskAzureResourceId": { + "type": "string", + "description": "Azure Resource ID of the Managed Disk." + } + } + }, + "Error": { + "type": "object", + "description": "The resource management error response.", + "properties": { + "error": { + "type": "object", + "description": "RP error response.", + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "ProvisioningState": { + "type": "string", + "enum": [ + "Invalid", + "Succeeded", + "Failed", + "Canceled", + "Pending", + "Creating", + "Updating", + "Deleting" + ], + "x-ms-enum": { + "name": "ProvisioningStates", + "modelAsString": true + }, + "description": "Provisioning state of the iSCSI target.", + "readOnly": true + }, + "OperationalStatus": { + "type": "string", + "enum": [ + "Invalid", + "Unknown", + "Healthy", + "Unhealthy", + "Updating", + "Running", + "Stopped", + "Stopped (deallocated)" + ], + "x-ms-enum": { + "name": "OperationalStatus", + "modelAsString": true + }, + "description": "Operational status of the resource." + }, + "DiskPoolTier": { + "type": "string", + "enum": [ + "Basic", + "Standard", + "Premium" + ], + "x-ms-enum": { + "name": "DiskPoolTier", + "modelAsString": true + }, + "description": "SKU of the VM host part of the Disk pool deployment" + }, + "SystemMetadata": { + "type": "object", + "description": "Resource metadata required by ARM RPC.", + "properties": { + "createdBy": { + "type": "string", + "description": "A string identifier for the identity that created the resource." + }, + "createdByType": { + "type": "string", + "description": "The type of identity that created the resource: user, application, managedIdentity." + }, + "createdAt": { + "type": "string", + "description": "The timestamp of resource creation (UTC)." + }, + "lastModifiedBy": { + "type": "string", + "description": "A string identifier for the identity that last modified the resource." + }, + "lastModifiedByType": { + "type": "string", + "description": "The type of identity that last modified the resource: user, application, managedIdentity." + }, + "lastModifiedAt": { + "type": "string", + "description": "The timestamp of resource last modification (UTC)." + } + } + }, + "TrackedResource": { + "description": "The resource model definition for a ARM tracked top level resource.", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The geo-location where the resource lives." + } + }, + "required": [ + "location" + ], + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "Resource": { + "description": "ARM resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of the resource" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts." + } + }, + "x-ms-azure-resource": true + }, + "ProxyResource": { + "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ErrorAdditionalInfo": { + "properties": { + "type": { + "readOnly": true, + "type": "string", + "description": "The additional info type." + }, + "info": { + "readOnly": true, + "type": "object", + "description": "The additional info." + } + }, + "description": "The resource management error additional info." + }, + "ErrorResponse": { + "properties": { + "code": { + "readOnly": true, + "type": "string", + "description": "The error code." + }, + "message": { + "readOnly": true, + "type": "string", + "description": "The error message." + }, + "target": { + "readOnly": true, + "type": "string", + "description": "The error target." + }, + "details": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResponse" + }, + "description": "The error details." + }, + "additionalInfo": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ErrorAdditionalInfo" + }, + "description": "The error additional info." + } + }, + "description": "The resource management error response." + } + } +} From 937a1c204df27b6a40d886297746fcabfd01e14a Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Thu, 15 Apr 2021 16:44:37 -0700 Subject: [PATCH 02/17] New API version Changes --- .../examples/DiskPoolSkus_List.json | 31 + .../examples/DiskPools_Deallocate.json | 12 + .../examples/DiskPools_Delete.json | 2 +- .../examples/DiskPools_Get.json | 9 +- ...kPools_GetOutboundNetworkDependencies.json | 802 ++++++++++++++++++ .../DiskPools_ListByResourceGroup.json | 16 +- .../DiskPools_ListBySubscription.json | 16 +- .../examples/DiskPools_Patch.json | 16 +- .../examples/DiskPools_Put.json | 25 +- .../examples/DiskPools_Start.json | 12 + .../examples/IscsiTargets_Delete.json | 2 +- .../examples/IscsiTargets_Get.json | 42 +- .../examples/IscsiTargets_ListByDiskPool.json | 73 +- .../examples/IscsiTargets_Patch.json | 110 +-- .../examples/IscsiTargets_Put.json | 97 +-- .../examples/Operations_List.json | 22 +- .../2021-04-01-preview/storagepool.json | 718 ++++++++++------ .../readme.azureresourceschema.md | 8 +- .../storagepool/resource-manager/readme.go.md | 10 +- .../storagepool/resource-manager/readme.md | 10 +- .../resource-manager/readme.python.md | 4 +- .../resource-manager/readme.ruby.md | 8 +- 22 files changed, 1501 insertions(+), 544 deletions(-) create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Deallocate.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_GetOutboundNetworkDependencies.json create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Start.json diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json new file mode 100644 index 000000000000..f47f526bb902 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "api-version": "2021-04-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "location": "eastus" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "availabilityZones": [ + "1", + "2", + "3" + ], + "tier": "Basic" + }, + { + "availabilityZones": [ + "1", + "2" + ], + "tier": "Standard" + } + ] + }, + "nextLink": "null" + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Deallocate.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Deallocate.json new file mode 100644 index 000000000000..2b8f925b849d --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Deallocate.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2021-04-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool" + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json index d38bf5d9b9ad..c20f71ed44eb 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Delete.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool" diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json index ea94f3cb191e..7f2abbbc5462 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Get.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool" @@ -12,6 +12,10 @@ "location": "westus2", "name": "myDiskPool", "type": "Microsoft.StoragePool/diskPools", + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "availabilityZones": [ "1" @@ -23,8 +27,7 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" } - ], - "tier": "Basic" + ] }, "systemData": { "createdAt": "2020-06-24T06:53:57+00:00", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_GetOutboundNetworkDependencies.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_GetOutboundNetworkDependencies.json new file mode 100644 index 000000000000..bb455c80c658 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_GetOutboundNetworkDependencies.json @@ -0,0 +1,802 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "Sample-WestUSResourceGroup", + "diskPoolName": "SampleAse", + "api-version": "2021-04-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "category": "Azure Storage", + "endpoints": [ + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "52.183.104.36", + "port": 80, + "latency": 42.0469, + "isAccessible": true + }, + { + "ipAddress": "52.183.104.36", + "port": 443, + "latency": 41.7038, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "52.183.104.25", + "port": 80, + "latency": 37.326, + "isAccessible": true + }, + { + "ipAddress": "52.183.104.25", + "port": 443, + "latency": 37.513600000000004, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "52.183.104.26", + "port": 80, + "latency": 32.789, + "isAccessible": true + }, + { + "ipAddress": "52.183.104.26", + "port": 443, + "latency": 1.8702, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "52.183.104.28", + "port": 80, + "latency": 36.7378, + "isAccessible": true + }, + { + "ipAddress": "52.183.104.28", + "port": 443, + "latency": 36.7108, + "isAccessible": true + } + ] + }, + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.64", + "port": 80, + "latency": 4.0261000000000005, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.64", + "port": 443, + "latency": 3.8264, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.73", + "port": 80, + "latency": 40.8523, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.73", + "port": 443, + "latency": 40.7501, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.74", + "port": 80, + "latency": 1.2071, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.74", + "port": 443, + "latency": 38.2975, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.76", + "port": 80, + "latency": 59.383700000000005, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.76", + "port": 443, + "latency": 60.0775, + "isAccessible": true + } + ] + }, + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.64", + "port": 80, + "latency": 3.5512, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.64", + "port": 443, + "latency": 2.6777, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.73", + "port": 80, + "latency": 3.5204, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.73", + "port": 443, + "latency": 2.8193, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.74", + "port": 80, + "latency": 3.2720000000000002, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.74", + "port": 443, + "latency": 3.0147, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.76", + "port": 80, + "latency": 3.2387, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.76", + "port": 443, + "latency": 3.2804, + "isAccessible": true + } + ] + }, + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.66.176.16", + "port": 80, + "latency": 43.025200000000005, + "isAccessible": true + }, + { + "ipAddress": "13.66.176.16", + "port": 443, + "latency": 43.1683, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.66.176.25", + "port": 80, + "latency": 41.8598, + "isAccessible": true + }, + { + "ipAddress": "13.66.176.25", + "port": 443, + "latency": 41.9805, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.66.176.26", + "port": 80, + "latency": 30.542900000000003, + "isAccessible": true + }, + { + "ipAddress": "13.66.176.26", + "port": 443, + "latency": 0.98320000000000007, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.66.176.28", + "port": 80, + "latency": 35.9562, + "isAccessible": true + }, + { + "ipAddress": "13.66.176.28", + "port": 443, + "latency": 36.0643, + "isAccessible": true + } + ] + }, + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.64", + "port": 80, + "latency": 3.2829, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.64", + "port": 443, + "latency": 2.3393, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.73", + "port": 80, + "latency": 3.4103000000000003, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.73", + "port": 443, + "latency": 4.1032, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.74", + "port": 80, + "latency": 3.1141, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.74", + "port": 443, + "latency": 3.0247, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.76", + "port": 80, + "latency": 2.834, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.76", + "port": 443, + "latency": 2.8198000000000003, + "isAccessible": true + } + ] + }, + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.64", + "port": 80, + "latency": 1.3855000000000002, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.64", + "port": 443, + "latency": 1.0594000000000001, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.73", + "port": 80, + "latency": 2.4717000000000002, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.73", + "port": 443, + "latency": 2.4827, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.74", + "port": 80, + "latency": 3.395, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.74", + "port": 443, + "latency": 3.1701, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.76", + "port": 80, + "latency": 1.4308, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.76", + "port": 443, + "latency": 22.5866, + "isAccessible": true + } + ] + }, + { + "domainName": "blob.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.64", + "port": 80, + "latency": 2.5372, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.64", + "port": 443, + "latency": 2.4626, + "isAccessible": true + } + ] + }, + { + "domainName": "queue.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.73", + "port": 80, + "latency": 3.7873, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.73", + "port": 443, + "latency": 4.1911000000000005, + "isAccessible": true + } + ] + }, + { + "domainName": "table.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.74", + "port": 80, + "latency": 2.9162000000000003, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.74", + "port": 443, + "latency": 2.7896, + "isAccessible": true + } + ] + }, + { + "domainName": "file.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.77.184.76", + "port": 80, + "latency": 26.723100000000002, + "isAccessible": true + }, + { + "ipAddress": "13.77.184.76", + "port": 443, + "latency": 26.735200000000003, + "isAccessible": true + } + ] + } + ] + }, + { + "category": "Azure SQL Database", + "endpoints": [ + { + "domainName": "database.windows.net", + "endpointDetails": [ + { + "ipAddress": "13.66.226.202", + "port": 1433, + "latency": 1.5964, + "isAccessible": true + } + ] + } + ] + }, + { + "category": "Azure Management", + "endpoints": [ + { + "domainName": "management.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "23.102.135.246", + "port": 443, + "latency": 46.5764, + "isAccessible": true + } + ] + }, + { + "domainName": "admin.core.windows.net", + "endpointDetails": [ + { + "ipAddress": "23.102.135.247", + "port": 443, + "latency": 47.408, + "isAccessible": true + } + ] + }, + { + "domainName": "management.azure.com", + "endpointDetails": [ + { + "ipAddress": "52.151.25.45", + "port": 443, + "latency": 3.9529, + "isAccessible": true + } + ] + } + ] + }, + { + "category": "Azure Active Directory", + "endpoints": [ + { + "domainName": "graph.windows.net", + "endpointDetails": [ + { + "ipAddress": "20.190.133.83", + "port": 443, + "latency": 3.2264, + "isAccessible": true + }, + { + "ipAddress": "20.190.133.81", + "port": 443, + "latency": 3.2264, + "isAccessible": true + }, + { + "ipAddress": "20.190.133.67", + "port": 443, + "latency": 3.2264, + "isAccessible": true + }, + { + "ipAddress": "40.126.5.34", + "port": 443, + "latency": 3.2264, + "isAccessible": true + } + ] + } + ] + }, + { + "category": "Regional Service", + "endpoints": [ + { + "domainName": "gr-prod-mwh.cloudapp.net", + "endpointDetails": [ + { + "ipAddress": "13.66.225.188", + "port": 443, + "latency": 3.3826, + "isAccessible": true + } + ] + }, + { + "domainName": "az-prod.metrics.nsatc.net", + "endpointDetails": [ + { + "ipAddress": "40.77.24.27", + "port": 443, + "latency": 38.5647, + "isAccessible": true + } + ] + } + ] + }, + { + "category": "SSL Certificate Verification", + "endpoints": [ + { + "domainName": "ocsp.msocsp.com", + "endpointDetails": [ + { + "ipAddress": "104.18.25.243", + "port": 80, + "latency": 6.0651, + "isAccessible": true + }, + { + "ipAddress": "104.18.25.243", + "port": 443, + "latency": 12.888, + "isAccessible": true + }, + { + "ipAddress": "104.18.24.243", + "port": 80, + "latency": 6.0651, + "isAccessible": true + }, + { + "ipAddress": "104.18.24.243", + "port": 443, + "latency": 12.888, + "isAccessible": true + } + ] + }, + { + "domainName": "mscrl.microsoft.com", + "endpointDetails": [ + { + "ipAddress": "152.199.4.33", + "port": 80, + "latency": 6.7429000000000006, + "isAccessible": true + }, + { + "ipAddress": "152.199.4.33", + "port": 443, + "latency": 7.4361000000000006, + "isAccessible": true + } + ] + }, + { + "domainName": "crl.microsoft.com", + "endpointDetails": [ + { + "ipAddress": "23.215.102.10", + "port": 80, + "latency": 25.136200000000002, + "isAccessible": true + }, + { + "ipAddress": "23.215.102.10", + "port": 443, + "latency": 25.0085, + "isAccessible": true + }, + { + "ipAddress": "23.215.102.42", + "port": 80, + "latency": 25.136200000000002, + "isAccessible": true + }, + { + "ipAddress": "23.215.102.42", + "port": 443, + "latency": 25.0085, + "isAccessible": true + } + ] + }, + { + "domainName": "www.microsoft.com", + "endpointDetails": [ + { + "ipAddress": "23.49.13.56", + "port": 80, + "latency": 7.9229, + "isAccessible": true + }, + { + "ipAddress": "23.49.13.56", + "port": 443, + "latency": 8.4871, + "isAccessible": true + } + ] + }, + { + "domainName": "crl3.digicert.com", + "endpointDetails": [ + { + "ipAddress": "72.21.91.29", + "port": 80, + "latency": 5.4074, + "isAccessible": true + }, + { + "ipAddress": "72.21.91.29", + "port": 443, + "latency": 5.577, + "isAccessible": true + } + ] + }, + { + "domainName": "ocsp.digicert.com", + "endpointDetails": [ + { + "ipAddress": "72.21.91.29", + "port": 80, + "latency": 6.8989, + "isAccessible": true + }, + { + "ipAddress": "72.21.91.29", + "port": 443, + "latency": 5.6674000000000007, + "isAccessible": true + } + ] + }, + { + "domainName": "cacerts.digicert.com", + "endpointDetails": [ + { + "ipAddress": "104.18.11.39", + "port": 80, + "latency": 10.772400000000001, + "isAccessible": true + }, + { + "ipAddress": "104.18.11.39", + "port": 443, + "latency": 10.7705, + "isAccessible": true + }, + { + "ipAddress": "104.18.10.39", + "port": 80, + "latency": 10.772400000000001, + "isAccessible": true + }, + { + "ipAddress": "104.18.10.39", + "port": 443, + "latency": 10.7705, + "isAccessible": true + } + ] + }, + { + "domainName": "www.thawte.com", + "endpointDetails": [ + { + "ipAddress": "54.69.98.161", + "port": 80, + "latency": 47.532900000000005, + "isAccessible": true + }, + { + "ipAddress": "54.69.98.161", + "port": 443, + "latency": 48.5362, + "isAccessible": true + }, + { + "ipAddress": "35.167.62.148", + "port": 80, + "latency": 47.532900000000005, + "isAccessible": true + }, + { + "ipAddress": "35.167.62.148", + "port": 443, + "latency": 48.5362, + "isAccessible": true + } + ] + } + ] + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json index 91bfb54f0ce3..3dbc63ec7fa2 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListByResourceGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup" }, @@ -12,6 +12,10 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", "location": "westus2", "name": "myDiskPool", + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "availabilityZones": [ "1" @@ -23,8 +27,7 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" } - ], - "tier": "Basic" + ] }, "systemData": { "createdAt": "2020-06-24T06:53:57+00:00", @@ -43,6 +46,10 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool2", "location": "westus2", "name": "myDiskPool2", + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "availabilityZones": [ "1" @@ -54,8 +61,7 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" } - ], - "tier": "Basic" + ] }, "systemData": { "createdAt": "2020-06-24T06:53:57+00:00", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json index 0539edce32d2..27bc4e61a27f 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListBySubscription.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000" }, "responses": { @@ -11,6 +11,10 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", "location": "westus2", "name": "myDiskPool", + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "availabilityZones": [ "1" @@ -22,8 +26,7 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" } - ], - "tier": "Basic" + ] }, "systemData": { "createdAt": "2020-06-24T06:53:57+00:00", @@ -42,6 +45,10 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool2", "location": "westus2", "name": "myDiskPool2", + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "availabilityZones": [ "1" @@ -53,8 +60,7 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myDataDisk_0" } - ], - "tier": "Basic" + ] }, "systemData": { "createdAt": "2020-06-24T06:53:57+00:00", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json index a6e03a117b6f..97950ea96323 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool", @@ -38,6 +38,10 @@ "lastModifiedBy": "alias", "lastModifiedByType": "User" }, + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "provisioningState": "Pending", "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", @@ -52,8 +56,7 @@ ], "availabilityZones": [ "1" - ], - "tier": "Basic" + ] } } }, @@ -74,6 +77,10 @@ "lastModifiedBy": "alias", "lastModifiedByType": "User" }, + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "provisioningState": "Pending", "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", @@ -88,8 +95,7 @@ ], "availabilityZones": [ "1" - ], - "tier": "Basic" + ] } } } diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json index 6ac93709cd86..4350d626ed6d 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool", @@ -9,6 +9,10 @@ "tags": { "key": "value" }, + "sku": { + "name": "Basic_V0", + "tier": "Basic" + }, "properties": { "availabilityZones": [ "1" @@ -21,13 +25,12 @@ { "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" } - ], - "tier": "Basic" + ] } } }, "responses": { - "201": { + "202": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", "name": "myDiskPool", @@ -44,6 +47,10 @@ "lastModifiedBy": "alias", "lastModifiedByType": "User" }, + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "provisioningState": "Pending", "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", @@ -58,8 +65,7 @@ ], "availabilityZones": [ "1" - ], - "tier": "Basic" + ] } } }, @@ -80,6 +86,10 @@ "lastModifiedBy": "alias", "lastModifiedByType": "User" }, + "sku": { + "name": "Basic_0", + "tier": "Basic" + }, "properties": { "provisioningState": "Pending", "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", @@ -94,8 +104,7 @@ ], "availabilityZones": [ "1" - ], - "tier": "Basic" + ] } } } diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Start.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Start.json new file mode 100644 index 000000000000..2b8f925b849d --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Start.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2021-04-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool" + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json index 2a61d7310564..86d454a3624f 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Delete.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json index 6a76a26f79a7..12c107b7e746 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool", @@ -14,33 +14,25 @@ "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "aclMode": "Static", + "luns": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3260" - ], - "tag": 1, - "port": 3260 + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" } ], + "staticAcls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "endpoints": [ + "10.0.0.1:3260" + ], + "port": 3260, "provisioningState": "Succeeded", "status": "Healthy" } diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json index 7174b1c34a05..9e08bb65c781 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool" @@ -15,33 +15,25 @@ "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "aclMode": "Static", + "port": 3260, + "luns": [ { - "tag": 1, - "port": 3260, - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3260" + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "staticAcls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" ] } ], + "endpoints": [ + "10.0.0.1:3260" + ], "provisioningState": "Succeeded", "status": "Healthy" } @@ -52,33 +44,18 @@ "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server2", - "tpgs": [ + "aclMode": "Dynamic", + "port": 3261, + "luns": [ { - "tag": 1, - "port": 3261, - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_2", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3261" - ] + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_2", + "name": "lun0" } ], + "staticAcls": [], + "endpoints": [ + "10.0.0.1:3261" + ], "provisioningState": "Succeeded", "status": "Healthy" } diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json index 9b5c5b39499e..89a3a0a5972d 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json @@ -1,31 +1,23 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool", "iscsiTargetName": "myIscsiTarget", "iscsiTargetUpdatePayload": { "properties": { - "tpgs": [ + "luns": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ], - "credentials": { - "username": "some_username", - "password": "some_password" - } - } + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "staticAcls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" ] } ] @@ -40,33 +32,25 @@ "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "aclMode": "Static", + "luns": [ + { + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" + } + ], + "staticAcls": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3260" - ], - "tag": 1, - "port": 3260 + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] } ], + "endpoints": [ + "10.0.0.1:3260" + ], + "port": 3260, "provisioningState": "Pending", "status": "Unknown" } @@ -79,33 +63,25 @@ "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "aclMode": "Static", + "luns": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3260" - ], - "tag": 1, - "port": 3260 + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" } ], + "staticAcls": [ + { + "initiatorIqn": "iqn.2005-03.org.iscsi:client", + "mappedLuns": [ + "lun0" + ] + } + ], + "endpoints": [ + "10.0.0.1:3260" + ], + "port": 3260, "provisioningState": "Pending", "status": "Unknown" } diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json index 6a0b24916c65..e0564ed9b0f8 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview", + "api-version": "2021-04-01-preview", "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "diskPoolName": "myDiskPool", @@ -8,70 +8,35 @@ "iscsiTargetCreatePayload": { "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "luns": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ], - "credentials": { - "username": "some_username", - "password": "some_password" - } - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - } + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" } - ] + ], + "aclMode": "Dynamic" } } }, "responses": { - "201": { + "202": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "luns": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3260" - ], - "tag": 1, - "port": 3260 + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" } ], + "endpoints": [ + "10.0.0.1:3260" + ], + "port": 3260, + "aclMode": "Dynamic", "provisioningState": "Pending", "status": "Unknown" } @@ -84,33 +49,17 @@ "type": "Microsoft.StoragePool/diskPools/iscsiTargets", "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", - "tpgs": [ + "luns": [ { - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "acls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "attributes": { - "authentication": true, - "prodModeWriteProtect": false - }, - "endpoints": [ - "10.0.0.1:3260" - ], - "tag": 1, - "port": 3260 + "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", + "name": "lun0" } ], + "endpoints": [ + "10.0.0.1:3260" + ], + "port": 3260, + "aclMode": "Dynamic", "provisioningState": "Pending", "status": "Unknown" } diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json index de57eee22f5c..8fd38297b8d4 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/Operations_List.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2020-03-15-preview" + "api-version": "2021-04-01-preview" }, "responses": { "200": { @@ -36,6 +36,26 @@ "description": "Delete Disk Pool" } }, + { + "name": "Microsoft.StoragePool/diskPools/start/action", + "isDataAction": false, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "Microsoft.StoragePool/diskPools", + "operation": "Start Microsoft.StoragePool/diskPools", + "description": "Start Disk Pool" + } + }, + { + "name": "Microsoft.StoragePool/diskPools/deallocate/action", + "isDataAction": false, + "display": { + "provider": "Microsoft.StoragePool", + "resource": "Microsoft.StoragePool/diskPools", + "operation": "Deallocate Microsoft.StoragePool/diskPools", + "description": "Deallocate Disk Pool" + } + }, { "name": "Microsoft.StoragePool/diskPools/iscsiTargets/read", "isDataAction": true, diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index dcb1c58d63eb..269add0313a1 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2020-03-15-preview", + "version": "2021-04-01-preview", "title": "StoragePoolManagement" }, "host": "management.azure.com", @@ -195,7 +195,7 @@ "$ref": "#/definitions/DiskPool" } }, - "201": { + "202": { "description": "Accepted -- Create or update request accepted; operation will complete asynchronously.", "schema": { "$ref": "#/definitions/DiskPool" @@ -209,9 +209,6 @@ } }, "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { "Create or Update Disk pool": { "$ref": "./examples/DiskPools_Put.json" @@ -266,10 +263,7 @@ "$ref": "./examples/DiskPools_Patch.json" } }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - } + "x-ms-long-running-operation": true }, "delete": { "tags": [ @@ -309,9 +303,6 @@ } }, "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { "Delete Disk pool": { "$ref": "./examples/DiskPools_Delete.json" @@ -359,6 +350,167 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StoragePool/locations/{location}/diskPoolSkus": { + "get": { + "tags": [ + "DiskPoolSkus" + ], + "operationId": "DiskPoolSkus_List", + "description": "Lists available Disk Pool Skus.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/Location" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DiskPoolSkuListResult" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Disk Pool Skus": { + "$ref": "./examples/DiskPoolSkus_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/outboundNetworkDependenciesEndpoints": { + "get": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_GetOutboundNetworkDependenciesEndpoints", + "description": "Gets the network endpoints of all outbound dependencies of a Disk Pool", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OutboundEnvironmentEndpointList" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Get Disk Pool outbound network dependencies": { + "$ref": "./examples/DiskPools_GetOutboundNetworkDependencies.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/{diskPoolName}/start": { + "post": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_Start", + "description": "The operation to start a Disk Pool.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Start Disk Pool": { + "$ref": "./examples/DiskPools_Start.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/{diskPoolName}/deallocate": { + "post": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_Deallocate", + "description": "Shuts down the Disk Pool and releases the compute resources. You are not billed for the compute resources that this Disk Pool uses.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Deallocate Disk Pool": { + "$ref": "./examples/DiskPools_Deallocate.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/iscsiTargets": { "get": { "tags": [ @@ -409,7 +561,7 @@ "tags": [ "IscsiTargets" ], - "description": "Create or Update an iSCSI target.", + "description": "Create or Update an iSCSI Target.", "operationId": "IscsiTargets_CreateOrUpdate", "parameters": [ { @@ -438,7 +590,7 @@ "$ref": "#/definitions/IscsiTarget" } }, - "201": { + "202": { "description": "Accepted -- Create or update request accepted; operation will complete asynchronously.", "schema": { "$ref": "#/definitions/IscsiTarget" @@ -452,11 +604,8 @@ } }, "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { - "Create or Update iSCSI target": { + "Create or Update iSCSI Target": { "$ref": "./examples/IscsiTargets_Put.json" } } @@ -465,7 +614,7 @@ "tags": [ "IscsiTargets" ], - "description": "Update an iSCSI target.", + "description": "Update an iSCSI Target.", "operationId": "IscsiTargets_Update", "parameters": [ { @@ -508,11 +657,8 @@ } }, "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { - "Update iSCSI target": { + "Update iSCSI Target": { "$ref": "./examples/IscsiTargets_Patch.json" } } @@ -521,7 +667,7 @@ "tags": [ "IscsiTargets" ], - "description": "Delete an iSCSI target.", + "description": "Delete an iSCSI Target.", "operationId": "IscsiTargets_Delete", "parameters": [ { @@ -558,11 +704,8 @@ } }, "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { - "Delete iSCSI target": { + "Delete iSCSI Target": { "$ref": "./examples/IscsiTargets_Delete.json" } } @@ -571,7 +714,7 @@ "tags": [ "IscsiTargets" ], - "description": "Get an iSCSI target.", + "description": "Get an iSCSI Target.", "operationId": "IscsiTargets_Get", "parameters": [ { @@ -592,7 +735,7 @@ ], "responses": { "200": { - "description": "Operation completed successfully; retrieved iSCSI target.", + "description": "Operation completed successfully; retrieved iSCSI Target.", "schema": { "$ref": "#/definitions/IscsiTarget" } @@ -605,7 +748,7 @@ } }, "x-ms-examples": { - "Get iSCSI target": { + "Get iSCSI Target": { "$ref": "./examples/IscsiTargets_Get.json" } } @@ -645,10 +788,7 @@ "in": "path", "required": true, "type": "string", - "pattern": "^[-\\w\\._]+$", - "minLength": 1, - "maxLength": 90, - "description": "The name of the Disk pool.", + "description": "The name of the Disk Pool.", "x-ms-parameter-location": "method" }, "IscsiTargetName": { @@ -656,14 +796,14 @@ "type": "string", "required": true, "in": "path", - "description": "The name of the iSCSI target.", + "description": "The name of the iSCSI Target.", "x-ms-parameter-location": "method" }, "DiskPoolCreate": { "name": "diskPoolCreatePayload", "required": true, "in": "body", - "description": "Request payload for Disk pool create operation", + "description": "Request payload for Disk Pool create operation", "schema": { "$ref": "#/definitions/DiskPoolCreate" }, @@ -673,7 +813,7 @@ "name": "diskPoolUpdatePayload", "required": true, "in": "body", - "description": "Request payload for Disk pool update operation.", + "description": "Request payload for Disk Pool update operation.", "schema": { "$ref": "#/definitions/DiskPoolUpdate" }, @@ -683,7 +823,7 @@ "name": "iscsiTargetCreatePayload", "required": true, "in": "body", - "description": "Request payload for iSCSI target create operation.", + "description": "Request payload for iSCSI Target create operation.", "schema": { "$ref": "#/definitions/IscsiTargetCreate" }, @@ -693,7 +833,7 @@ "name": "iscsiTargetUpdatePayload", "required": true, "in": "body", - "description": "Request payload for iSCSI target operations.", + "description": "Request payload for iSCSI Target update operation.", "schema": { "$ref": "#/definitions/IscsiTargetUpdate" }, @@ -799,6 +939,85 @@ } } }, + "OutboundEnvironmentEndpointList": { + "description": "Collection of Outbound Environment Endpoints", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/OutboundEnvironmentEndpoint" + } + }, + "nextLink": { + "description": "Link to next page of resources.", + "type": "string", + "readOnly": true + } + } + }, + "OutboundEnvironmentEndpoint": { + "description": "Endpoints accessed for a common purpose that the App Service Environment requires outbound network access to.", + "type": "object", + "properties": { + "category": { + "description": "The type of service accessed by the App Service Environment, e.g., Azure Storage, Azure SQL Database, and Azure Active Directory.", + "type": "string" + }, + "endpoints": { + "description": "The endpoints that the App Service Environment reaches the service at.", + "type": "array", + "items": { + "$ref": "#/definitions/EndpointDependency" + } + } + } + }, + "EndpointDependency": { + "description": "A domain name that a service is reached at, including details of the current connection status.", + "type": "object", + "properties": { + "domainName": { + "description": "The domain name of the dependency.", + "type": "string" + }, + "endpointDetails": { + "description": "The IP Addresses and Ports used when connecting to DomainName.", + "type": "array", + "items": { + "$ref": "#/definitions/EndpointDetail" + } + } + } + }, + "EndpointDetail": { + "description": "Current TCP connectivity information from the App Service Environment to a single endpoint.", + "type": "object", + "properties": { + "ipAddress": { + "description": "An IP Address that Domain Name currently resolves to.", + "type": "string" + }, + "port": { + "format": "int32", + "description": "The port an endpoint is connected to.", + "type": "integer" + }, + "latency": { + "format": "double", + "description": "The time in milliseconds it takes for a TCP connection to be created from the App Service Environment to this IpAddress at this Port.", + "type": "number" + }, + "isAccessible": { + "description": "Whether it is possible to create a TCP connection from the App Service Environment to this IpAddress at this Port.", + "type": "boolean" + } + } + }, "DiskPoolListResult": { "type": "object", "required": [ @@ -821,16 +1040,62 @@ } } }, + "DiskPoolSkuListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/DiskPoolSkuInfo" + }, + "description": "The list of Disk Pool Skus." + }, + "nextLink": { + "description": "URI to fetch the next section of the paginated response.", + "type": "string" + } + }, + "description": "List Disk Pool skus operation response." + }, + "DiskPoolSkuInfo": { + "type": "object", + "description": "Disk Pool Sku Details", + "properties": { + "availabilityZones": { + "type": "array", + "description": "Logical zone for Disk Pool resource; example: [\"1\"].", + "items": { + "$ref": "#/definitions/AvailabilityZone" + } + }, + "additionalCapabilities": { + "type": "array", + "description": "List of additional capabilities for Disk Pool.", + "items": { + "$ref": "#/definitions/AdditionalCapability" + } + }, + "tier": { + "description": "Determines the SKU of VM deployed for Disk Pool", + "type": "string", + "$ref": "#/definitions/DiskPoolTier" + } + } + }, "DiskPool": { "type": "object", - "description": "Response for Disk pool request.", + "description": "Response for Disk Pool request.", "required": [ "properties" ], "properties": { + "sku": { + "description": "Determines the SKU of the Disk pool", + "type": "object", + "$ref": "#/definitions/DiskPoolSku" + }, "properties": { "x-ms-client-flatten": true, - "description": "Properties of Disk pool.", + "description": "Properties of Disk Pool.", "$ref": "#/definitions/DiskPoolProperties" }, "systemData": { @@ -847,15 +1112,21 @@ }, "DiskPoolCreate": { "type": "object", - "description": "Request payload for create or update Disk pool request.", + "description": "Request payload for create or update Disk Pool request.", "required": [ "properties", - "location" + "location", + "sku" ], "properties": { + "sku": { + "description": "Determines the SKU of the Disk Pool", + "type": "object", + "$ref": "#/definitions/DiskPoolSku" + }, "properties": { "x-ms-client-flatten": true, - "description": "Properties for Disk pool create request.", + "description": "Properties for Disk Pool create request.", "$ref": "#/definitions/DiskPoolCreateProperties" }, "tags": { @@ -898,14 +1169,14 @@ }, "DiskPoolUpdate": { "type": "object", - "description": "Request payload for Update Disk pool request.", + "description": "Request payload for Update Disk Pool request.", "required": [ "properties" ], "properties": { "properties": { "x-ms-client-flatten": true, - "description": "Properties for Disk pool update request.", + "description": "Properties for Disk Pool update request.", "$ref": "#/definitions/DiskPoolUpdateProperties" }, "tags": { @@ -926,15 +1197,29 @@ "type": "string", "description": "Availability zone." }, + "DiskPoolSku": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + }, + "tier": { + "$ref": "#/definitions/DiskPoolTier", + "description": "Tier to use for the Disk Pool." + } + } + }, "DiskPoolProperties": { "type": "object", - "description": "Disk pool response properties.", + "description": "Disk Pool response properties.", "required": [ "availabilityZones", "subnetId", "provisioningState", - "status", - "tier" + "status" ], "properties": { "provisioningState": { @@ -944,7 +1229,7 @@ }, "availabilityZones": { "type": "array", - "description": "Logical zone for Disk pool resource; example: [\"1\"].", + "description": "Logical zone for Disk Pool resource; example: [\"1\"].", "items": { "$ref": "#/definitions/AvailabilityZone" } @@ -952,20 +1237,18 @@ "status": { "type": "string", "$ref": "#/definitions/OperationalStatus", - "description": "Operational status of the Disk pool." + "description": "Operational status of the Disk Pool." }, "disks": { "type": "array", - "description": "List of Azure Managed Disks to attach to a Disk pool. Can attach 8 disks at most.", + "description": "List of Azure Managed Disks to attach to a Disk Pool.", "items": { "$ref": "#/definitions/Disk" - }, - "minLength": 0, - "maxLength": 8 + } }, "subnetId": { "type": "string", - "description": "Azure Resource ID of a Subnet for the Disk pool.", + "description": "Azure Resource ID of a Subnet for the Disk Pool.", "x-ms-mutability": [ "create", "read" @@ -973,46 +1256,43 @@ }, "additionalCapabilities": { "type": "array", - "description": "List of additional capabilities for Disk pool.", + "description": "List of additional capabilities for Disk Pool.", "items": { "$ref": "#/definitions/AdditionalCapability" } }, - "tier": { - "description": "Determines the SKU of VM deployed for Disk pool", - "type": "string", - "$ref": "#/definitions/DiskPoolTier" + "sku": { + "description": "Determines the SKU of the Disk Pool", + "type": "object", + "$ref": "#/definitions/DiskPoolSku" } } }, "DiskPoolCreateProperties": { "type": "object", - "description": "Properties for Disk pool create or update request.", + "description": "Properties for Disk Pool create or update request.", "required": [ "availabilityZones", - "subnetId", - "tier" + "subnetId" ], "properties": { "availabilityZones": { "type": "array", - "description": "Logical zone for Disk pool resource; example: [\"1\"].", + "description": "Logical zone for Disk Pool resource; example: [\"1\"].", "items": { "$ref": "#/definitions/AvailabilityZone" } }, "disks": { "type": "array", - "description": "List of Azure Managed Disks to attach to a Disk pool. Can attach 8 disks at most.", + "description": "List of Azure Managed Disks to attach to a Disk Pool.", "items": { "$ref": "#/definitions/Disk" - }, - "minLength": 0, - "maxLength": 8 + } }, "subnetId": { "type": "string", - "description": "Azure Resource ID of a Subnet for the Disk pool.", + "description": "Azure Resource ID of a Subnet for the Disk Pool.", "x-ms-mutability": [ "create", "read" @@ -1020,36 +1300,29 @@ }, "additionalCapabilities": { "type": "array", - "description": "List of additional capabilities for a Disk pool.", + "description": "List of additional capabilities for a Disk Pool.", "items": { "$ref": "#/definitions/AdditionalCapability" } - }, - "tier": { - "description": "Determines the SKU of VM deployed for Disk pool", - "type": "string", - "$ref": "#/definitions/DiskPoolTier" } } }, "DiskPoolUpdateProperties": { "type": "object", - "description": "Properties for Disk pool update request.", + "description": "Properties for Disk Pool update request.", "properties": { "disks": { "type": "array", - "description": "List of Azure Managed Disks to attach to a Disk pool. Can attach 8 disks at most.", + "description": "List of Azure Managed Disks to attach to a Disk Pool.", "items": { "$ref": "#/definitions/Disk" - }, - "minLength": 0, - "maxLength": 8 + } } } }, "Disk": { "type": "object", - "description": "Azure Managed Disk to attach to the Disk pool.", + "description": "Azure Managed Disk to attach to the Disk Pool.", "required": [ "id" ], @@ -1063,7 +1336,7 @@ }, "AdditionalCapability": { "type": "string", - "description": "Special capability that can be set on the Disk pool." + "description": "Special capability that can be set on the Disk Pool." }, "IscsiTargetList": { "type": "object", @@ -1075,7 +1348,7 @@ "properties": { "value": { "type": "array", - "description": "An array of iSCSI targets in a Disk pool.", + "description": "An array of iSCSI Targets in a Disk Pool.", "items": { "$ref": "#/definitions/IscsiTarget" } @@ -1089,14 +1362,14 @@ }, "IscsiTarget": { "type": "object", - "description": "Response for iSCSI target requests.", + "description": "Response for iSCSI Target requests.", "required": [ "properties" ], "properties": { "properties": { "x-ms-client-flatten": true, - "description": "Properties for iSCSI target operations.", + "description": "Properties for iSCSI Target operations.", "$ref": "#/definitions/IscsiTargetProperties" } }, @@ -1108,14 +1381,14 @@ }, "IscsiTargetCreate": { "type": "object", - "description": "Payload for iSCSI target create or update requests.", + "description": "Payload for iSCSI Target create or update requests.", "required": [ "properties" ], "properties": { "properties": { "x-ms-client-flatten": true, - "description": "Properties for iSCSI target create request.", + "description": "Properties for iSCSI Target create request.", "$ref": "#/definitions/IscsiTargetCreateProperties" } }, @@ -1127,206 +1400,131 @@ }, "IscsiTargetUpdate": { "type": "object", - "description": "Payload for iSCSI target update request.", + "description": "Payload for iSCSI Target update requests.", "required": [ "properties" ], "properties": { "properties": { "x-ms-client-flatten": true, - "description": "Properties for iSCSI target update request.", + "description": "Properties for iSCSI Target update request.", "$ref": "#/definitions/IscsiTargetUpdateProperties" } - } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ] }, "IscsiTargetProperties": { "type": "object", - "description": "Response properties for iSCSI target operations.", + "description": "Response properties for iSCSI Target operations.", "required": [ - "tpgs", "targetIqn", "provisioningState", "status" ], "properties": { - "provisioningState": { - "description": "State of the operation on the resource.", - "type": "string", - "$ref": "#/definitions/ProvisioningState" - }, - "status": { + "aclMode": { + "description": "Mode for Target connectivity.", "type": "string", - "$ref": "#/definitions/OperationalStatus", - "description": "Operational status of the iSCSI target." + "$ref": "#/definitions/AclMode" }, - "tpgs": { + "staticAcls": { "type": "array", - "description": "List of iSCSI target portal groups. Can have 1 portal group at most.", + "description": "Access Control List (ACL) for an iSCSI Target; defines LUN masking policy", "items": { - "$ref": "#/definitions/TargetPortalGroup" - }, - "maxLength": 1, - "minLength": 1 + "$ref": "#/definitions/Acl" + } }, - "targetIqn": { - "type": "string", - "description": "iSCSI target IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:server\"." - } - } - }, - "IscsiTargetCreateProperties": { - "type": "object", - "description": "Properties for iSCSI target create or update request.", - "required": [ - "tpgs" - ], - "properties": { - "tpgs": { + "luns": { "type": "array", - "description": "List of iSCSI target portal groups. Can have 1 portal group at most.", + "description": "List of LUNs to be exposed through iSCSI Target.", "items": { - "$ref": "#/definitions/TargetPortalGroupCreate" - }, - "maxLength": 1, - "minLength": 1 + "$ref": "#/definitions/IscsiLun" + } }, "targetIqn": { "type": "string", - "description": "iSCSI target IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:server\"." - } - } - }, - "IscsiTargetUpdateProperties": { - "type": "object", - "description": "Properties for iSCSI target update request.", - "required": [ - "tpgs" - ], - "properties": { - "tpgs": { - "type": "array", - "description": "List of iSCSI target portal groups. Can have 1 portal group at most.", - "items": { - "$ref": "#/definitions/TargetPortalGroupUpdate" - }, - "maxLength": 1, - "minLength": 1 - } - } - }, - "TargetPortalGroup": { - "type": "object", - "description": "Response properties for iSCSI target portal group.", - "required": [ - "luns", - "acls", - "attributes", - "endpoints", - "tag", - "port" - ], - "properties": { - "luns": { - "type": "array", - "description": "List of LUNs to be exposed through iSCSI target portal group.", - "items": { - "$ref": "#/definitions/IscsiLun" - }, - "minLength": 1, - "maxLength": 8 + "description": "iSCSI Target IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:server\"." }, - "acls": { - "type": "array", - "description": "Access Control List (ACL) for an iSCSI target portal group.", - "items": { - "$ref": "#/definitions/Acl" - }, - "minLength": 1, - "maxLength": 16 + "provisioningState": { + "description": "State of the operation on the resource.", + "type": "string", + "$ref": "#/definitions/ProvisioningState" }, - "attributes": { - "description": "Attributes of an iSCSI target portal group.", - "$ref": "#/definitions/Attributes" + "status": { + "type": "string", + "$ref": "#/definitions/OperationalStatus", + "description": "Operational status of the iSCSI Target." }, "endpoints": { - "description": "List of private IPv4 addresses to connect to the iSCSI target.", + "description": "List of private IPv4 addresses to connect to the iSCSI Target.", "type": "array", "items": { "type": "string" } }, - "tag": { - "type": "integer", - "format": "int32", - "description": "The tag associated with the iSCSI target portal group." - }, "port": { "type": "integer", "format": "int32", - "description": "The port used by iSCSI target portal group." + "description": "The port used by iSCSI Target portal group." } } }, - "TargetPortalGroupCreate": { + "IscsiTargetCreateProperties": { "type": "object", - "description": "Target portal group properties for create or update iSCSI target request.", - "required": [ - "luns", - "acls", - "attributes" - ], + "description": "Properties for iSCSI Target create or update request.", "properties": { - "luns": { - "type": "array", - "description": "List of LUNs to be exposed through the iSCSI target portal group.", - "items": { - "$ref": "#/definitions/IscsiLun" - }, - "minLength": 1, - "maxLength": 8 + "aclMode": { + "description": "Mode for Target connectivity.", + "type": "string", + "$ref": "#/definitions/AclMode" + }, + "targetIqn": { + "type": "string", + "description": "iSCSI Target IQN (iSCSI Qualified Name); example: \"iqn.2005-03.org.iscsi:server\"." }, - "acls": { + "staticAcls": { "type": "array", - "description": "Access Control List (ACL) for an iSCSI target portal group.", + "description": "Access Control List (ACL) for an iSCSI Target; defines LUN masking policy", "items": { "$ref": "#/definitions/Acl" - }, - "minLength": 1, - "maxLength": 16 + } }, - "attributes": { - "description": "Attributes of an iSCSI target portal group.", - "$ref": "#/definitions/Attributes" + "luns": { + "type": "array", + "description": "List of LUNs to be exposed through iSCSI Target.", + "items": { + "$ref": "#/definitions/IscsiLun" + } } } }, - "TargetPortalGroupUpdate": { + "IscsiTargetUpdateProperties": { "type": "object", - "description": "Target portal group properties for update iSCSI target request.", + "description": "Properties for iSCSI Target update request.", "properties": { - "luns": { + "staticAcls": { "type": "array", - "description": "List of LUNs to be exposed through the iSCSI target portal group.", + "description": "Access Control List (ACL) for an iSCSI Target; defines LUN masking policy", "items": { - "$ref": "#/definitions/IscsiLun" - }, - "minLength": 1, - "maxLength": 8 + "$ref": "#/definitions/Acl" + } }, - "acls": { + "luns": { "type": "array", - "description": "Access Control List (ACL) for an iSCSI target portal group.", + "description": "List of LUNs to be exposed through iSCSI Target.", "items": { - "$ref": "#/definitions/Acl" - }, - "minLength": 1, - "maxLength": 16 + "$ref": "#/definitions/IscsiLun" + } } } }, "Acl": { "type": "object", - "description": "Access Control List (ACL) for an iSCSI target portal group", + "description": "Access Control List (ACL) for an iSCSI Target; defines LUN masking policy", "required": [ "initiatorIqn", "mappedLuns" @@ -1342,60 +1540,6 @@ "items": { "type": "string" } - }, - "credentials": { - "description": "Challenge Handshake Authentication Protocol (CHAP) credentials to set for the ACL. Credentials can not be updated for an ACL.", - "x-ms-client-flatten": true, - "x-ms-secret": true, - "x-ms-mutability": [ - "create" - ], - "$ref": "#/definitions/IscsiTargetCredentials" - } - } - }, - "Attributes": { - "type": "object", - "description": "Attributes of a iSCSI target portal group.", - "required": [ - "authentication", - "prodModeWriteProtect" - ], - "properties": { - "authentication": { - "type": "boolean", - "description": "Indicates whether or not authentication is enabled on the ACL." - }, - "prodModeWriteProtect": { - "type": "boolean", - "description": "Indicates whether or not write protect is enabled on the LUNs." - } - }, - "x-ms-mutability": [ - "read", - "create" - ] - }, - "IscsiTargetCredentials": { - "type": "object", - "required": [ - "username", - "password" - ], - "description": "Challenge Handshake Authentication Protocol (CHAP) credentials for an iSCSI target ACL.", - "properties": { - "username": { - "type": "string", - "description": "Username for Challenge Handshake Authentication Protocol (CHAP) authentication.", - "minLength": 7, - "maxLength": 511 - }, - "password": { - "type": "string", - "description": "Password for Challenge Handshake Authentication Protocol (CHAP) authentication.", - "minLength": 12, - "maxLength": 255, - "pattern": "^[-\\w_0-9A-Za-z]*$" } } }, @@ -1447,7 +1591,7 @@ "name": "ProvisioningStates", "modelAsString": true }, - "description": "Provisioning state of the iSCSI target.", + "description": "Provisioning state of the iSCSI Target.", "readOnly": true }, "OperationalStatus": { @@ -1479,7 +1623,19 @@ "name": "DiskPoolTier", "modelAsString": true }, - "description": "SKU of the VM host part of the Disk pool deployment" + "description": "SKU of the VM host part of the Disk Pool deployment" + }, + "AclMode": { + "type": "string", + "enum": [ + "Dynamic", + "Static" + ], + "x-ms-enum": { + "name": "IscsiTargetAclMode", + "modelAsString": true + }, + "description": "ACL mode for iSCSI Target." }, "SystemMetadata": { "type": "object", diff --git a/specification/storagepool/resource-manager/readme.azureresourceschema.md b/specification/storagepool/resource-manager/readme.azureresourceschema.md index 07743e1d27f2..7279d29e7c07 100644 --- a/specification/storagepool/resource-manager/readme.azureresourceschema.md +++ b/specification/storagepool/resource-manager/readme.azureresourceschema.md @@ -6,19 +6,19 @@ These settings apply only when `--azureresourceschema` is specified on the comma ``` yaml $(azureresourceschema) && $(multiapi) batch: - - tag: schema-storagepool-2020-03-15-preview + - tag: schema-storagepool-2021-04-01-preview ``` Please also specify `--azureresourceschema-folder=`. -### Tag: schema-storagepool-2020-03-15-preview and azureresourceschema +### Tag: schema-storagepool-2021-04-01-preview and azureresourceschema -``` yaml $(tag) == 'schema-storagepool-2020-03-15-preview' && $(azureresourceschema) +``` yaml $(tag) == 'schema-storagepool-2021-04-01-preview' && $(azureresourceschema) output-folder: $(azureresourceschema-folder)/schemas # all the input files in this apiVersion input-file: - - Microsoft.StoragePool/preview/2020-03-15-preview/storagepool.json + - Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json ``` diff --git a/specification/storagepool/resource-manager/readme.go.md b/specification/storagepool/resource-manager/readme.go.md index 4f2244713599..3a8c5c1660a1 100644 --- a/specification/storagepool/resource-manager/readme.go.md +++ b/specification/storagepool/resource-manager/readme.go.md @@ -12,15 +12,15 @@ go: ``` yaml $(go) && $(multiapi) batch: - - tag: package-2020-03-15-preview + - tag: package-2021-04-01-preview ``` -### Tag: package-2020-03-15-preview and go +### Tag: package-2021-04-01-preview and go -These settings apply only when `--tag=package-2020-03-15-preview --go` is specified on the command line. +These settings apply only when `--tag=package-2021-04-01-preview --go` is specified on the command line. Please also specify `--go-sdks-folder=`. -```yaml $(tag) == 'package-2020-03-15-preview' && $(go) +```yaml $(tag) == 'package-2021-04-01-preview' && $(go) namespace: storagepool -output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-03-15-preview/$(namespace) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2021-04-01-preview/$(namespace) ``` diff --git a/specification/storagepool/resource-manager/readme.md b/specification/storagepool/resource-manager/readme.md index 4ff0e7d73767..c092dc47db58 100644 --- a/specification/storagepool/resource-manager/readme.md +++ b/specification/storagepool/resource-manager/readme.md @@ -26,16 +26,16 @@ These are the global settings for the storagepool. ```yaml openapi-type: arm -tag: package-2020-03-15-preview +tag: package-2021-04-01-preview ``` -### Tag: package-2020-03-15-preview +### Tag: package-2021-04-01-preview -These settings apply only when `--tag=package-2020-03-15-preview` is specified on the command line. +These settings apply only when `--tag=package-2021-04-01-preview` is specified on the command line. -```yaml $(tag) == 'package-2020-03-15-preview' +```yaml $(tag) == 'package-2021-04-01-preview' input-file: - - Microsoft.StoragePool/preview/2020-03-15-preview/storagepool.json + - Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json ``` --- diff --git a/specification/storagepool/resource-manager/readme.python.md b/specification/storagepool/resource-manager/readme.python.md index d51e4c72c621..e9167f811aca 100644 --- a/specification/storagepool/resource-manager/readme.python.md +++ b/specification/storagepool/resource-manager/readme.python.md @@ -10,12 +10,12 @@ python: payload-flattening-threshold: 2 namespace: Microsoft.StoragePool package-name: storagepool - package-version: 2020-03-15-preview + package-version: 2021-04-01-preview clear-output-folder: true ``` ```yaml $(python) python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_03_15_preview + output-folder: $(python-sdks-folder)/storagepool/azure-mgmt-storagepool/azure/mgmt/storagepool/v2020_03_15_preview ``` diff --git a/specification/storagepool/resource-manager/readme.ruby.md b/specification/storagepool/resource-manager/readme.ruby.md index 67579a795894..21fb14d23705 100644 --- a/specification/storagepool/resource-manager/readme.ruby.md +++ b/specification/storagepool/resource-manager/readme.ruby.md @@ -4,16 +4,16 @@ These settings apply only when `--ruby` is specified on the command line. ```yaml package-name: azure_mgmt_storagepool -package-version: 2020-03-15-preview +package-version: 2021-04-01-preview azure-arm: true ``` -### Tag: package-2020-03-15-preview and ruby +### Tag: package-2021-04-01-preview and ruby -These settings apply only when `--tag=package-2020-03-15-preview --ruby` is specified on the command line. +These settings apply only when `--tag=package-2021-04-01-preview --ruby` is specified on the command line. Please also specify `--ruby-sdks-folder=`. -```yaml $(tag) == 'package-2020-03-15-preview' && $(ruby) +```yaml $(tag) == 'package-2021-04-01-preview' && $(ruby) namespace: Microsoft.StoragePool output-folder: $(ruby-sdks-folder)/storagepool ``` From 1a4e3992200d24bd83800fd48d209bf6750a7620 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Sun, 18 Apr 2021 16:14:09 -0700 Subject: [PATCH 03/17] Validation errors --- .../2021-04-01-preview/storagepool.json | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 269add0313a1..0a242df7efc3 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -397,7 +397,7 @@ "tags": [ "DiskPools" ], - "operationId": "DiskPools_GetOutboundNetworkDependenciesEndpoints", + "operationId": "DiskPools_ListOutboundNetworkDependenciesEndpoints", "description": "Gets the network endpoints of all outbound dependencies of a Disk Pool", "parameters": [ { @@ -464,6 +464,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } } }, "x-ms-long-running-operation": true, @@ -501,6 +507,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } } }, "x-ms-long-running-operation": true, @@ -1202,9 +1214,11 @@ "required": [ "name" ], + "description": "Sku for Disk Pools", "properties": { "name": { - "type": "string" + "type": "string", + "name": "Name of the Sku" }, "tier": { "$ref": "#/definitions/DiskPoolTier", @@ -1371,6 +1385,11 @@ "x-ms-client-flatten": true, "description": "Properties for iSCSI Target operations.", "$ref": "#/definitions/IscsiTargetProperties" + }, + "systemData": { + "description": "Resource metadata required by ARM RPC", + "readOnly": true, + "$ref": "#/definitions/SystemMetadata" } }, "allOf": [ From c3c3712dc0e95b5bf7cbdf91d19ee60e02b9bc16 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Mon, 19 Apr 2021 15:37:36 -0700 Subject: [PATCH 04/17] revisions --- .../examples/DiskPools_ListSkus.json | 24 +++ .../examples/DiskPools_Patch.json | 40 +---- .../examples/DiskPools_Put.json | 2 +- .../examples/IscsiTargets_Patch.json | 32 +--- .../examples/IscsiTargets_Put.json | 2 +- .../2021-04-01-preview/storagepool.json | 144 +++++++++++++++--- 6 files changed, 155 insertions(+), 89 deletions(-) create mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json new file mode 100644 index 000000000000..db126f5039c6 --- /dev/null +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "api-version": "2021-04-01-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "diskPoolName": "myDiskPool" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "Microsoft.StoragePool/diskPools", + "sku": { + "name": "Basic", + "tier": "Basic" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json index 97950ea96323..db853c25ff14 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Patch.json @@ -21,45 +21,7 @@ } }, "responses": { - "202": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", - "name": "myDiskPool", - "type": "Microsoft.StoragePool/diskPools", - "location": "westus2", - "tags": { - "env": "int" - }, - "systemData": { - "createdAt": "2020-06-24T06:53:57+00:00", - "createdBy": "alias", - "createdByType": "User", - "lastModifiedAt": "2020-06-24T06:53:57+00:00", - "lastModifiedBy": "alias", - "lastModifiedByType": "User" - }, - "sku": { - "name": "Basic_0", - "tier": "Basic" - }, - "properties": { - "provisioningState": "Pending", - "subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet", - "status": "Unknown", - "disks": [ - { - "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" - }, - { - "id": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" - } - ], - "availabilityZones": [ - "1" - ] - } - } - }, + "202": {}, "200": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json index 4350d626ed6d..2f7dd5eb6a82 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_Put.json @@ -30,7 +30,7 @@ } }, "responses": { - "202": { + "201": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool", "name": "myDiskPool", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json index 89a3a0a5972d..a035225cf8dc 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json @@ -25,37 +25,7 @@ } }, "responses": { - "202": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", - "name": "myIscsiTarget", - "type": "Microsoft.StoragePool/diskPools/iscsiTargets", - "properties": { - "targetIqn": "iqn.2005-03.org.iscsi:server1", - "aclMode": "Static", - "luns": [ - { - "managedDiskAzureResourceId": "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1", - "name": "lun0" - } - ], - "staticAcls": [ - { - "initiatorIqn": "iqn.2005-03.org.iscsi:client", - "mappedLuns": [ - "lun0" - ] - } - ], - "endpoints": [ - "10.0.0.1:3260" - ], - "port": 3260, - "provisioningState": "Pending", - "status": "Unknown" - } - } - }, + "202": {}, "200": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json index e0564ed9b0f8..fce2320e1a10 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json @@ -19,7 +19,7 @@ } }, "responses": { - "202": { + "201": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 0a242df7efc3..30b26f5d9168 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -195,7 +195,7 @@ "$ref": "#/definitions/DiskPool" } }, - "202": { + "201": { "description": "Accepted -- Create or update request accepted; operation will complete asynchronously.", "schema": { "$ref": "#/definitions/DiskPool" @@ -209,6 +209,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Create or Update Disk pool": { "$ref": "./examples/DiskPools_Put.json" @@ -246,10 +249,7 @@ } }, "202": { - "description": "Accepted -- Update request accepted; operation will complete asynchronously.", - "schema": { - "$ref": "#/definitions/DiskPool" - } + "description": "Accepted -- Update request accepted; operation will complete asynchronously." }, "default": { "description": "Error from the RP.", @@ -263,7 +263,10 @@ "$ref": "./examples/DiskPools_Patch.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } }, "delete": { "tags": [ @@ -303,6 +306,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Delete Disk pool": { "$ref": "./examples/DiskPools_Delete.json" @@ -356,7 +362,7 @@ "DiskPoolSkus" ], "operationId": "DiskPoolSkus_List", - "description": "Lists available Disk Pool Skus.", + "description": "Lists available Disk Pool Skus in an Azure location.", "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -473,6 +479,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Start Disk Pool": { "$ref": "./examples/DiskPools_Start.json" @@ -516,6 +525,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Deallocate Disk Pool": { "$ref": "./examples/DiskPools_Deallocate.json" @@ -523,6 +535,48 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/{diskPoolName}/skus": { + "get": { + "tags": [ + "DiskPools" + ], + "operationId": "DiskPools_ListSkus", + "description": "List of available skus to resize an existing Disk Pool.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiskPoolName" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ResourceSkuList" + } + }, + "default": { + "description": "Error from the RP", + "schema": { + "$ref": "#/definitions/Error" + } + } + }, + "x-ms-examples": { + "Deallocate Disk Pool": { + "$ref": "./examples/DiskPools_ListSkus.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/iscsiTargets": { "get": { "tags": [ @@ -602,7 +656,7 @@ "$ref": "#/definitions/IscsiTarget" } }, - "202": { + "201": { "description": "Accepted -- Create or update request accepted; operation will complete asynchronously.", "schema": { "$ref": "#/definitions/IscsiTarget" @@ -616,6 +670,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Create or Update iSCSI Target": { "$ref": "./examples/IscsiTargets_Put.json" @@ -656,10 +713,7 @@ } }, "202": { - "description": "Accepted -- Update request accepted; operation will complete asynchronously.", - "schema": { - "$ref": "#/definitions/IscsiTarget" - } + "description": "Accepted -- Update request accepted; operation will complete asynchronously." }, "default": { "description": "Error from the RP.", @@ -669,6 +723,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Update iSCSI Target": { "$ref": "./examples/IscsiTargets_Patch.json" @@ -716,6 +773,9 @@ } }, "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Delete iSCSI Target": { "$ref": "./examples/IscsiTargets_Delete.json" @@ -1186,6 +1246,11 @@ "properties" ], "properties": { + "sku": { + "description": "Determines the SKU of the Disk Pool", + "type": "object", + "$ref": "#/definitions/DiskPoolSku" + }, "properties": { "x-ms-client-flatten": true, "description": "Properties for Disk Pool update request.", @@ -1274,11 +1339,6 @@ "items": { "$ref": "#/definitions/AdditionalCapability" } - }, - "sku": { - "description": "Determines the SKU of the Disk Pool", - "type": "object", - "$ref": "#/definitions/DiskPoolSku" } } }, @@ -1656,6 +1716,56 @@ }, "description": "ACL mode for iSCSI Target." }, + "ResourceSkuList": { + "type": "object", + "required": [ + "value" + ], + "description": "List of Skus for a Disk Pool", + "additionalProperties": false, + "properties": { + "value": { + "description": "List of Skus", + "type": "array", + "items": { + "$ref": "#/definitions/ResourceSku" + } + }, + "nextLink": { + "description": "URI to fetch the next section of the paginated response.", + "type": "string", + "readOnly": true + } + } + }, + "ResourceSku": { + "type": "object", + "description": "Sku for an ARM resource", + "properties": { + "resourceType": { + "type": "string", + "description": "Type of Arm Resource" + }, + "sku": { + "description": "Sku for ARM resource", + "$ref": "#/definitions/Sku" + } + } + }, + "Sku": { + "type": "object", + "description": "Sku for ARM resource", + "properties": { + "name": { + "type": "string", + "description": "Sku name" + }, + "tier": { + "type": "string", + "description": "Sku tier" + } + } + }, "SystemMetadata": { "type": "object", "description": "Resource metadata required by ARM RPC.", From db0fb4a30cc797bcf935d3603701e304b4275c86 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Tue, 20 Apr 2021 11:34:03 -0700 Subject: [PATCH 05/17] Fixes --- .../2021-04-01-preview/storagepool.json | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 30b26f5d9168..58c923c6a10a 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1162,8 +1162,8 @@ "properties": { "sku": { "description": "Determines the SKU of the Disk pool", - "type": "object", - "$ref": "#/definitions/DiskPoolSku" + "$ref": "#/definitions/Sku", + "x-ms-client-flatten": true }, "properties": { "x-ms-client-flatten": true, @@ -1194,7 +1194,7 @@ "sku": { "description": "Determines the SKU of the Disk Pool", "type": "object", - "$ref": "#/definitions/DiskPoolSku" + "$ref": "#/definitions/Sku" }, "properties": { "x-ms-client-flatten": true, @@ -1249,7 +1249,7 @@ "sku": { "description": "Determines the SKU of the Disk Pool", "type": "object", - "$ref": "#/definitions/DiskPoolSku" + "$ref": "#/definitions/Sku" }, "properties": { "x-ms-client-flatten": true, @@ -1274,23 +1274,6 @@ "type": "string", "description": "Availability zone." }, - "DiskPoolSku": { - "type": "object", - "required": [ - "name" - ], - "description": "Sku for Disk Pools", - "properties": { - "name": { - "type": "string", - "name": "Name of the Sku" - }, - "tier": { - "$ref": "#/definitions/DiskPoolTier", - "description": "Tier to use for the Disk Pool." - } - } - }, "DiskPoolProperties": { "type": "object", "description": "Disk Pool response properties.", From 99e06336d4ccc90a0c656bcdd8f30c6c3d64bb52 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Tue, 20 Apr 2021 13:56:13 -0700 Subject: [PATCH 06/17] Revisions --- ...Skus_List.json => DiskPoolZones_List.json} | 12 +++++++++-- .../2021-04-01-preview/storagepool.json | 20 +++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) rename specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/{DiskPoolSkus_List.json => DiskPoolZones_List.json} (65%) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolZones_List.json similarity index 65% rename from specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json rename to specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolZones_List.json index f47f526bb902..444da48899e0 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolSkus_List.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPoolZones_List.json @@ -14,14 +14,22 @@ "2", "3" ], - "tier": "Basic" + "sku": { + "tier": "Basic", + "name": "Basic" + }, + "additionalCapabilities": [] }, { "availabilityZones": [ "1", "2" ], - "tier": "Standard" + "sku": { + "tier": "Basic", + "name": "Basic" + }, + "additionalCapabilities": [] } ] }, diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 58c923c6a10a..aa2137b5d409 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -356,12 +356,12 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.StoragePool/locations/{location}/diskPoolSkus": { + "/subscriptions/{subscriptionId}/providers/Microsoft.StoragePool/locations/{location}/diskPoolZones": { "get": { "tags": [ - "DiskPoolSkus" + "DiskPoolZones" ], - "operationId": "DiskPoolSkus_List", + "operationId": "DiskPoolZones_List", "description": "Lists available Disk Pool Skus in an Azure location.", "parameters": [ { @@ -378,7 +378,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/DiskPoolSkuListResult" + "$ref": "#/definitions/DiskPoolZoneListResult" } }, "default": { @@ -393,7 +393,7 @@ }, "x-ms-examples": { "List Disk Pool Skus": { - "$ref": "./examples/DiskPoolSkus_List.json" + "$ref": "./examples/DiskPoolZones_List.json" } } } @@ -1112,12 +1112,12 @@ } } }, - "DiskPoolSkuListResult": { + "DiskPoolZoneListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/DiskPoolSkuInfo" + "$ref": "#/definitions/DiskPoolZoneInfo" }, "description": "The list of Disk Pool Skus." }, @@ -1128,7 +1128,7 @@ }, "description": "List Disk Pool skus operation response." }, - "DiskPoolSkuInfo": { + "DiskPoolZoneInfo": { "type": "object", "description": "Disk Pool Sku Details", "properties": { @@ -1146,10 +1146,10 @@ "$ref": "#/definitions/AdditionalCapability" } }, - "tier": { + "sku": { "description": "Determines the SKU of VM deployed for Disk Pool", "type": "string", - "$ref": "#/definitions/DiskPoolTier" + "$ref": "#/definitions/Sku" } } }, From 0266bd5fd157d3a63dd4ce45c20df9fd43dfc4e8 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 21 Apr 2021 11:17:37 -0700 Subject: [PATCH 07/17] Revisions --- .../examples/DiskPools_ListSkus.json | 24 ------ .../2021-04-01-preview/storagepool.json | 78 ------------------- 2 files changed, 102 deletions(-) delete mode 100644 specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json deleted file mode 100644 index db126f5039c6..000000000000 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/DiskPools_ListSkus.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "api-version": "2021-04-01-preview", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "myResourceGroup", - "diskPoolName": "myDiskPool" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "resourceType": "Microsoft.StoragePool/diskPools", - "sku": { - "name": "Basic", - "tier": "Basic" - } - } - ], - "nextLink": null - } - } - } -} diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index aa2137b5d409..4ef4fa9d1b08 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -535,48 +535,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/{diskPoolName}/skus": { - "get": { - "tags": [ - "DiskPools" - ], - "operationId": "DiskPools_ListSkus", - "description": "List of available skus to resize an existing Disk Pool.", - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiskPoolName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ResourceSkuList" - } - }, - "default": { - "description": "Error from the RP", - "schema": { - "$ref": "#/definitions/Error" - } - } - }, - "x-ms-examples": { - "Deallocate Disk Pool": { - "$ref": "./examples/DiskPools_ListSkus.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/iscsiTargets": { "get": { "tags": [ @@ -1699,42 +1657,6 @@ }, "description": "ACL mode for iSCSI Target." }, - "ResourceSkuList": { - "type": "object", - "required": [ - "value" - ], - "description": "List of Skus for a Disk Pool", - "additionalProperties": false, - "properties": { - "value": { - "description": "List of Skus", - "type": "array", - "items": { - "$ref": "#/definitions/ResourceSku" - } - }, - "nextLink": { - "description": "URI to fetch the next section of the paginated response.", - "type": "string", - "readOnly": true - } - } - }, - "ResourceSku": { - "type": "object", - "description": "Sku for an ARM resource", - "properties": { - "resourceType": { - "type": "string", - "description": "Type of Arm Resource" - }, - "sku": { - "description": "Sku for ARM resource", - "$ref": "#/definitions/Sku" - } - } - }, "Sku": { "type": "object", "description": "Sku for ARM resource", From 6729b6fae2b81f2d6151dc5e91f394eb863b360a Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 21 Apr 2021 11:47:06 -0700 Subject: [PATCH 08/17] Revisions --- .../preview/2021-04-01-preview/storagepool.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 4ef4fa9d1b08..c3691339e185 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1676,26 +1676,32 @@ "description": "Resource metadata required by ARM RPC.", "properties": { "createdBy": { + "readOnly": true, "type": "string", "description": "A string identifier for the identity that created the resource." }, "createdByType": { + "readOnly": true, "type": "string", "description": "The type of identity that created the resource: user, application, managedIdentity." }, "createdAt": { + "readOnly": true, "type": "string", "description": "The timestamp of resource creation (UTC)." }, "lastModifiedBy": { + "readOnly": true, "type": "string", "description": "A string identifier for the identity that last modified the resource." }, "lastModifiedByType": { + "readOnly": true, "type": "string", "description": "The type of identity that last modified the resource: user, application, managedIdentity." }, "lastModifiedAt": { + "readOnly": true, "type": "string", "description": "The timestamp of resource last modification (UTC)." } From 22c4f34162a294f4908bd8a394f71e1628aeeec7 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 21 Apr 2021 12:22:03 -0700 Subject: [PATCH 09/17] Updates --- .../preview/2021-04-01-preview/storagepool.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index c3691339e185..3757b10642d8 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1204,11 +1204,6 @@ "properties" ], "properties": { - "sku": { - "description": "Determines the SKU of the Disk Pool", - "type": "object", - "$ref": "#/definitions/Sku" - }, "properties": { "x-ms-client-flatten": true, "description": "Properties for Disk Pool update request.", @@ -1660,6 +1655,9 @@ "Sku": { "type": "object", "description": "Sku for ARM resource", + "required": [ + "name" + ], "properties": { "name": { "type": "string", From 738569c632ec989756b245e6e68e40c3138e6c48 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 21 Apr 2021 13:51:55 -0700 Subject: [PATCH 10/17] Annotating required property --- .../preview/2021-04-01-preview/storagepool.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 3757b10642d8..d6b99e13782e 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1438,7 +1438,8 @@ "required": [ "targetIqn", "provisioningState", - "status" + "status", + "aclMode" ], "properties": { "aclMode": { @@ -1491,6 +1492,9 @@ "IscsiTargetCreateProperties": { "type": "object", "description": "Properties for iSCSI Target create or update request.", + "required": [ + "aclMode" + ], "properties": { "aclMode": { "description": "Mode for Target connectivity.", From fbb6d07ff38602e2b25f78c7282f5893c556f89d Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 21 Apr 2021 16:15:52 -0700 Subject: [PATCH 11/17] Availability zone is not required during Disk Pool Creation --- .../preview/2021-04-01-preview/storagepool.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index d6b99e13782e..ec20ca0012f1 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1282,7 +1282,6 @@ "type": "object", "description": "Properties for Disk Pool create or update request.", "required": [ - "availabilityZones", "subnetId" ], "properties": { From 29a662dbf18fd8366328ed47904da04957ceed32 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Fri, 23 Apr 2021 16:21:32 -0700 Subject: [PATCH 12/17] Fixing swagger route typo --- .../preview/2021-04-01-preview/storagepool.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index ec20ca0012f1..3cae75cf40b5 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -443,7 +443,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/{diskPoolName}/start": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/start": { "post": { "tags": [ "DiskPools" @@ -489,7 +489,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/{diskPoolName}/deallocate": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StoragePool/diskPools/{diskPoolName}/deallocate": { "post": { "tags": [ "DiskPools" From 88908dbdae4a5aa63caa2930e7d7e75b53ef6431 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 28 Apr 2021 09:55:22 -0700 Subject: [PATCH 13/17] Fixes Avocado errors due to swagger file not being referenced --- specification/storagepool/resource-manager/readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/storagepool/resource-manager/readme.md b/specification/storagepool/resource-manager/readme.md index c092dc47db58..faae6e17619f 100644 --- a/specification/storagepool/resource-manager/readme.md +++ b/specification/storagepool/resource-manager/readme.md @@ -38,6 +38,16 @@ input-file: - Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json ``` + +### Tag: package-2020-03-15-preview + +These settings apply only when +```yaml $(tag) == 'package-2020-03-15-preview' +input-file: + - Microsoft.StoragePool/preview/2020-03-15-preview/storagepool.json +``` + + --- # Code Generation From 11a3193fbdf33c31003799c837c049151f718a24 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 28 Apr 2021 23:03:39 -0700 Subject: [PATCH 14/17] Updated python readme --- specification/storagepool/resource-manager/readme.python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/storagepool/resource-manager/readme.python.md b/specification/storagepool/resource-manager/readme.python.md index e9167f811aca..45a15f1b3aa3 100644 --- a/specification/storagepool/resource-manager/readme.python.md +++ b/specification/storagepool/resource-manager/readme.python.md @@ -17,5 +17,5 @@ python: ```yaml $(python) python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/storagepool/azure-mgmt-storagepool/azure/mgmt/storagepool/v2020_03_15_preview + output-folder: $(python-sdks-folder)/storagepool/azure-mgmt-storagepool/azure/mgmt/storagepool/v2021_04_01_preview ``` From ca3b740396ce7b767ab8401e507df81096158595 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 29 Apr 2021 14:18:15 +0800 Subject: [PATCH 15/17] [python] Update readme.md (#14184) * Update readme.md * Update readme.python.md --- .../storagepool/resource-manager/readme.md | 2 +- .../resource-manager/readme.python.md | 28 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/specification/storagepool/resource-manager/readme.md b/specification/storagepool/resource-manager/readme.md index faae6e17619f..daff48adc37f 100644 --- a/specification/storagepool/resource-manager/readme.md +++ b/specification/storagepool/resource-manager/readme.md @@ -59,7 +59,7 @@ This is not used by Autorest itself. ```yaml $(swagger-to-sdk) swagger-to-sdk: - - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js diff --git a/specification/storagepool/resource-manager/readme.python.md b/specification/storagepool/resource-manager/readme.python.md index 45a15f1b3aa3..7d7f211f121d 100644 --- a/specification/storagepool/resource-manager/readme.python.md +++ b/specification/storagepool/resource-manager/readme.python.md @@ -3,19 +3,21 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. -```yaml $(python) -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: Microsoft.StoragePool - package-name: storagepool - package-version: 2021-04-01-preview - clear-output-folder: true +``` yaml $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-storagepool +no-namespace-folders: true +package-version: 1.0.0b1 +clear-output-folder: true ``` -```yaml $(python) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/storagepool/azure-mgmt-storagepool/azure/mgmt/storagepool/v2021_04_01_preview +``` yaml $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/storagepool/azure-mgmt-storagepool/azure/mgmt/storagepool +``` + +``` yaml $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/storagepool/azure-mgmt-storagepool ``` From cb589bc4ee273c2d6dc83ed77e72d31097064909 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Wed, 28 Apr 2021 23:33:37 -0700 Subject: [PATCH 16/17] Fix merge conflicts --- .../readme.azureresourceschema.md | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 specification/storagepool/resource-manager/readme.azureresourceschema.md diff --git a/specification/storagepool/resource-manager/readme.azureresourceschema.md b/specification/storagepool/resource-manager/readme.azureresourceschema.md deleted file mode 100644 index 7279d29e7c07..000000000000 --- a/specification/storagepool/resource-manager/readme.azureresourceschema.md +++ /dev/null @@ -1,24 +0,0 @@ -## AzureResourceSchema - -These settings apply only when `--azureresourceschema` is specified on the command line. - -### AzureResourceSchema multi-api - -``` yaml $(azureresourceschema) && $(multiapi) -batch: - - tag: schema-storagepool-2021-04-01-preview - -``` - -Please also specify `--azureresourceschema-folder=`. - -### Tag: schema-storagepool-2021-04-01-preview and azureresourceschema - -``` yaml $(tag) == 'schema-storagepool-2021-04-01-preview' && $(azureresourceschema) -output-folder: $(azureresourceschema-folder)/schemas - -# all the input files in this apiVersion -input-file: - - Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json - -``` From 8bdb0bf2e255b23a061090897df14027b380a4e2 Mon Sep 17 00:00:00 2001 From: Harshitha Akkaraju Date: Mon, 3 May 2021 09:26:14 -0700 Subject: [PATCH 17/17] Swagger linting errors --- .../examples/IscsiTargets_Get.json | 8 ++++ .../examples/IscsiTargets_ListByDiskPool.json | 16 +++++++ .../examples/IscsiTargets_Patch.json | 8 ++++ .../examples/IscsiTargets_Put.json | 16 +++++++ .../2021-04-01-preview/storagepool.json | 42 +++++++++++++------ 5 files changed, 77 insertions(+), 13 deletions(-) diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json index 12c107b7e746..5499259ea530 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Get.json @@ -12,6 +12,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", "aclMode": "Static", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json index 9e08bb65c781..9eea214290e7 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_ListByDiskPool.json @@ -13,6 +13,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", "aclMode": "Static", @@ -42,6 +50,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget2", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server2", "aclMode": "Dynamic", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json index a035225cf8dc..891be1042758 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Patch.json @@ -31,6 +31,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", "aclMode": "Static", diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json index fce2320e1a10..2bd12a6a84b2 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/examples/IscsiTargets_Put.json @@ -24,6 +24,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", "luns": [ @@ -47,6 +55,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.StoragePool/diskPools/myDiskPool/iscsiTargets/myIscsiTarget", "name": "myIscsiTarget", "type": "Microsoft.StoragePool/diskPools/iscsiTargets", + "systemData": { + "createdAt": "2020-06-24T06:53:57+00:00", + "createdBy": "alias", + "createdByType": "User", + "lastModifiedAt": "2020-06-24T06:53:57+00:00", + "lastModifiedBy": "alias", + "lastModifiedByType": "User" + }, "properties": { "targetIqn": "iqn.2005-03.org.iscsi:server1", "luns": [ diff --git a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json index 3cae75cf40b5..da6f66718aed 100644 --- a/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json +++ b/specification/storagepool/resource-manager/Microsoft.StoragePool/preview/2021-04-01-preview/storagepool.json @@ -1383,7 +1383,6 @@ }, "systemData": { "description": "Resource metadata required by ARM RPC", - "readOnly": true, "$ref": "#/definitions/SystemMetadata" } }, @@ -1673,38 +1672,55 @@ } }, "SystemMetadata": { + "description": "Metadata pertaining to creation and last modification of the resource.", "type": "object", - "description": "Resource metadata required by ARM RPC.", + "readOnly": true, "properties": { "createdBy": { - "readOnly": true, "type": "string", - "description": "A string identifier for the identity that created the resource." + "description": "The identity that created the resource." }, "createdByType": { - "readOnly": true, "type": "string", - "description": "The type of identity that created the resource: user, application, managedIdentity." + "description": "The type of identity that created the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } }, "createdAt": { - "readOnly": true, "type": "string", + "format": "date-time", "description": "The timestamp of resource creation (UTC)." }, "lastModifiedBy": { - "readOnly": true, "type": "string", - "description": "A string identifier for the identity that last modified the resource." + "description": "The identity that last modified the resource." }, "lastModifiedByType": { - "readOnly": true, "type": "string", - "description": "The type of identity that last modified the resource: user, application, managedIdentity." + "description": "The type of identity that last modified the resource.", + "enum": [ + "User", + "Application", + "ManagedIdentity", + "Key" + ], + "x-ms-enum": { + "name": "createdByType", + "modelAsString": true + } }, "lastModifiedAt": { - "readOnly": true, "type": "string", - "description": "The timestamp of resource last modification (UTC)." + "format": "date-time", + "description": "The type of identity that last modified the resource." } } },