From a9e38caf4958638048f98104b1099c98960322c0 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 5 Feb 2019 17:29:13 -0500 Subject: [PATCH 01/35] initial swagger for StorageCache RP --- .../examples/Clusters_Create.json | 59 + .../examples/Clusters_Delete.json | 12 + .../examples/Clusters_Flush.json | 12 + .../examples/Clusters_Get.json | 42 + .../examples/Clusters_List.json | 72 + .../Clusters_ListByResourceGroup.json | 73 + .../examples/Clusters_Start.json | 12 + .../examples/Clusters_Stop.json | 12 + .../examples/Clusters_Update.json | 59 + .../examples/Clusters_UpgradeFirmware.json | 12 + .../examples/Operations_List.json | 41 + .../examples/Skus_List.json | 68 + .../examples/StorageTargets_Create.json | 34 + .../examples/StorageTargets_Delete.json | 15 + .../examples/StorageTargets_Get.json | 25 + .../examples/StorageTargets_List.json | 39 + .../examples/StorageTargets_Update.json | 34 + .../examples/UsageModels_List.json | 29 + .../2019-06-01-preview/storagecache.json | 1569 +++++++++++++++++ .../storagecache/resource-manager/readme.md | 42 + 20 files changed, 2261 insertions(+) create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json create mode 100644 specification/storagecache/resource-manager/readme.md diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json new file mode 100644 index 000000000000..c1ca2691b909 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "clusterName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cluster": { + "tags": { + "Dept": "Initech" + }, + "location": "westus", + "properties": { + "cacheSize": "3072", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" + }, + "sku": { + "name": "Storage Cache A123" + } + } + }, + "responses": { + "201": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "1024", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json new file mode 100644 index 000000000000..5623b3395156 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json new file mode 100644 index 000000000000..5623b3395156 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json new file mode 100644 index 000000000000..01f2878e2f69 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "clusterName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "3072", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json new file mode 100644 index 000000000000..60dc83011b2b --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "items": [ + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "3072", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + }, + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc2", + "location": "westus", + "name": "sc2", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "3072", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + } + ] + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json new file mode 100644 index 000000000000..30cad7a230f9 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json @@ -0,0 +1,73 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "items": [ + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "3072", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + }, + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc2", + "location": "westus", + "name": "sc2", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "3072", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + } + ] + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json new file mode 100644 index 000000000000..5623b3395156 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json new file mode 100644 index 000000000000..5623b3395156 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json new file mode 100644 index 000000000000..be5e8a58369e --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "clusterName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cluster": { + "tags": { + "Dept": "Initech" + }, + "location": "westus", + "properties": { + "cacheSize": "3072", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" + }, + "sku": { + "name": "Storage Cache A123" + } + } + }, + "responses": { + "200": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSize": "1024", + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmWareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + }, + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json new file mode 100644 index 000000000000..6af5d9a963f5 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "202": { + "body": "" + } + } +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json new file mode 100644 index 000000000000..a15dd3149343 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json @@ -0,0 +1,41 @@ +{ + "parameters": { + "api-version": "2019-06-01-preview", + "x-ms-client-request-id": [ + "7e655b68-e491-4cb6-90c3-6a5b10b7bd17" + ], + "accept-language": [ + "en-US" + ] + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.StorageCache/clusters/write", + "display": { + "operation": "Create or Update Cluster", + "provider": "Azure Storage Cache", + "resource": "Clusters", + "description": "Create or update Cluster." + }, + "properties": {}, + "origin": "user" + }, + { + "name": "Microsoft.StorageCache/clusters/delete", + "display": { + "operation": "Delete Cluster", + "provider": "Azure Storage Cache", + "resource": "Clusters", + "description": "Delete Cluster." + }, + "properties": {}, + "origin": "user" + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json new file mode 100644 index 000000000000..19cda8d6771f --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "cacheSizes": [ + "3072", + "6144", + "12288" + ], + "capabilities": [ + { + "name": "ops/sec", + "value": "153600" + } + ], + "locations": [ + "location": "westus", + "location": "eastus" + ], + "name": "Storage Cache A1" + }, + { + "cacheSizes": [ + "6144", + "12288", + "24576" + ], + "capabilities": [ + { + "name": "ops/sec", + "value": "307200" + } + ], + "locations": [ + "location": "westus", + "location": "eastus" + ], + "name": "Storage Cache A2" + }, + { + "cacheSizes": [ + "12288", + "24576", + "49152" + ], + "capabilities": [ + { + "name": "ops/sec", + "value": "614400" + } + ], + "locations": [ + "location": "westus", + "location": "eastus" + ], + "name": "Storage Cache A3" + } + ] + } + } + } + } \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json new file mode 100644 index 000000000000..f1a006d4cf29 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "clusterName": "sc1", + "storageTargetName": "st1", + "storagetarget": { + "properties": { + "targetType": "nfs3" + }, + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } + }, + "responses": { + "200": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "properties": { + "targetType": "nfs3" + }, + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json new file mode 100644 index 000000000000..bc5aaea98376 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "clusterName": "sc1", + "storageTargetName": "st1" + }, + "responses": { + "200": { + "body": { + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json new file mode 100644 index 000000000000..54a115a67f4c --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "clusterName": "sc1", + "storageTargetName": "st1" + }, + "responses": { + "200": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "properties": { + "targetType": "nfs3" + }, + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json new file mode 100644 index 000000000000..d0431d38165d --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "clusterName": "sc1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "properties": { + "targetType": "nfs3" + }, + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + }, + { + "name": "st2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st2", + "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "properties": { + "targetType": "clfs" + }, + "clfs": { + "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" + } + } + ] + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json new file mode 100644 index 000000000000..6870d33fd2b4 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "clusterName": "sc1", + "storageTargetName": "st1", + "storagetarget": { + "properties": { + "targetType": "nfs3" + }, + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } + }, + "responses": { + "200": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "properties": { + "targetType": "nfs3" + }, + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } + } + } +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json new file mode 100644 index 000000000000..00aaef19b00a --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "display": { + "description": "read heavy, infrequent changes" + } + }, + { + "display": { + "description": "read heavy, frequent changes" + } + }, + { + "display": { + "description": "write workload > 15%" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json new file mode 100644 index 000000000000..dd6961259441 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -0,0 +1,1569 @@ +{ + "swagger": "2.0", + "info": { + "description": "An Avere vFXT cluster provides scalable caching services for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage clusters.", + "title": "Microsoft.StorageCache resource provider.", + "version": "2019-06-01-preview" + }, + "host": "management.azure.com", + "basePath": "/", + "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" + } + } + }, + "paths": { + "/providers/Microsoft.StorageCache/operations": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ApiOperationListResult" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "tags": [ + "Operations" + ], + "description": "Lists all of the available RP operations.", + "operationId": "Operations_List", + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Operations_List": { + "$ref": "./examples/Operations_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/skus": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "A list of SKU descriptors.", + "schema": { + "$ref": "#/definitions/ResourceSkusResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Skus_List": { + "$ref": "./examples/Skus_List.json" + } + }, + "tags": [ + "SKUs" + ], + "description": "Get the list of StorageCache.Cluster SKUs available to this subscription.", + "operationId": "Skus_List" + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/usageModels": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "A list of UsageModel descriptors.", + "schema": { + "$ref": "#/definitions/UsageModelsResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "UsageModels_List": { + "$ref": "./examples/UsageModels_List.json" + } + }, + "tags": [ + "UsageModels" + ], + "description": "Get the list of Avere.Cluster Usage Models available to this subscription.", + "operationId": "UsageModels_List" + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/clusters": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "A list of Cluster objects. Note that entity references might replace complete Cluster objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", + "schema": { + "items": { + "$ref": "#/definitions/Cluster" + }, + "type": "array" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_List": { + "$ref": "./examples/Clusters_List.json" + } + }, + "tags": [ + "Clusters" + ], + "description": "Returns all Clusters the user has access to under a subscription.", + "operationId": "Clusters_List" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "A list of Cluster objects. Note that entity references might replace complete Cluster objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", + "schema": { + "items": { + "$ref": "#/definitions/Cluster" + }, + "type": "array" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_ListByResourceGroup": { + "$ref": "./examples/Clusters_ListByResourceGroup.json" + } + }, + "tags": [ + "Clusters" + ], + "description": "Returns all Clusters the user has access to under a resource group and subscription.", + "operationId": "Clusters_ListByResourceGroup" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}": { + "delete": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "202": { + "description": "Started the Cluster's transition to Deleted state." + }, + "204": { + "description": "Cluster deleted." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Delete": { + "$ref": "./examples/Clusters_Delete.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Clusters" + ], + "description": "Schedules a Cluster for deletion.", + "operationId": "Clusters_Delete" + }, + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Returns the Cluster object corresponding to clusterId.", + "schema": { + "$ref": "#/definitions/Cluster" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Get": { + "$ref": "./examples/Clusters_Get.json" + } + }, + "tags": [ + "Clusters" + ], + "description": "Returns a Cluster.", + "operationId": "Clusters_Get" + }, + "put": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the user selectable properties of the new cluster. If read-only properties are included, they must match the existing values of those properties.", + "in": "body", + "name": "cluster", + "schema": { + "$ref": "#/definitions/Cluster" + } + } + ], + "responses": { + "201": { + "description": "Cluster creation has been initiated. Poll the new Cluster's provisioningState property to monitor creation progress.", + "schema": { + "$ref": "#/definitions/Cluster" + } + }, + "400": { + "description": "Specified a changed value for a read-only property.", + "schema": { + "$ref": "#/definitions/CloudError" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Create": { + "$ref": "./examples/Clusters_Create.json" + } + }, + "tags": [ + "Clusters" + ], + "description": "Create/update a Cluster instance.", + "operationId": "Clusters_Create" + }, + "patch": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the user selectable properties of the new cluster. If read-only properties are included, they must match the existing values of those properties.", + "in": "body", + "name": "cluster", + "schema": { + "$ref": "#/definitions/Cluster" + } + } + ], + "responses": { + "200": { + "description": "Patched the Cluster.", + "schema": { + "$ref": "#/definitions/Cluster" + } + }, + "400": { + "description": "Specified a changed value for a read-only property.", + "schema": { + "$ref": "#/definitions/CloudError" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Update": { + "$ref": "./examples/Clusters_Update.json" + } + }, + "tags": [ + "Clusters" + ], + "description": "Update a Cluster instance.", + "operationId": "Clusters_Update" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/flush": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "All cluster data is clean." + }, + "202": { + "description": "Cluster has started flushing." + }, + "400": { + "description": "Cluster is not in a state where a flush is allowed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Flush": { + "$ref": "./examples/Clusters_Flush.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Clusters" + ], + "description": "Tells a cluster to write all dirty data to the StorageTarget(s). During the flush, clients will see errors returned until the flush is complete.", + "operationId": "Clusters_Flush" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/start": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Cluster is Active." + }, + "202": { + "description": "Cluster has started the transition to Active." + }, + "400": { + "description": "Cluster is not in a state where a transition to Active is allowed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Start": { + "$ref": "./examples/Clusters_Start.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Clusters" + ], + "description": "Tells a Stopped state cluster to transition to Active state.", + "operationId": "Clusters_Start" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/stop": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Cluster is stopped." + }, + "202": { + "description": "Cluster has started the transition to Stopped." + }, + "400": { + "description": "Cluster is not in a state where a transition to Stopped is allowed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_Stop": { + "$ref": "./examples/Clusters_Stop.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Clusters" + ], + "description": "Tells an Active cluster to transition to Stopped state.", + "operationId": "Clusters_Stop" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storagetargets": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Returns the list of storage targets defined by clusterId.", + "schema": { + "$ref": "#/definitions/StorageTargetsResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_List": { + "$ref": "./examples/StorageTargets_List.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "tags": [ + "StorageTargets" + ], + "description": "Returns the StorageTargets for this cluster in the subscription and resource group.", + "operationId": "StorageTargets_List" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storagetargets/{storageTargetName}": { + "delete": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Storage target deleted." + }, + "202": { + "description": "Started the storage target's deletion." + }, + "204": { + "description": "Storage target deleted." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Delete": { + "$ref": "./examples/StorageTargets_Delete.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "StorageTargets" + ], + "description": "Removes a storage target from a cluster. This operation is allowed at any time, but if the cluster is down or unhealthy, the actual removal of the storage target may be delayed until the cluster is healthy again.", + "operationId": "StorageTargets_Delete" + }, + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Returns the Storage Target object corresponding to storageTargetName.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Get": { + "$ref": "./examples/StorageTargets_Get.json" + } + }, + "tags": [ + "StorageTargets" + ], + "description": "Returns a storage target from a cluster.", + "operationId": "StorageTargets_Get" + }, + "put": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the definition of a storage target.", + "in": "body", + "name": "body", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + } + ], + "responses": { + "200": { + "description": "Storage Target has been created.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Create": { + "$ref": "./examples/StorageTargets_Create.json" + } + }, + "tags": [ + "StorageTargets" + ], + "description": "Create/update a storage target. This operation is allowed at any time, but if the cluster is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cluster is healthy again.", + "operationId": "StorageTargets_Create" + }, + "patch": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the definition of a storage target.", + "in": "body", + "name": "storagetarget", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + } + ], + "responses": { + "200": { + "description": "Storage Target has been patched.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Update": { + "$ref": "./examples/StorageTargets_Update.json" + } + }, + "tags": [ + "StorageTargets" + ], + "description": "Update a storage target. This operation is allowed at any time, but if the cluster is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cluster is healthy again.", + "operationId": "StorageTargets_Update" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/upgrade": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "201": { + "description": "Cluster firmware is up to date." + }, + "202": { + "description": "Cluster has started the upgrade." + }, + "400": { + "description": "No new firmware image is available.", + "schema": { + "$ref": "#/definitions/CloudError" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Clusters_UpgradeFirmware": { + "$ref": "./examples/Clusters_UpgradeFirmware.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Clusters" + ], + "description": "Tells a cluster to upgrade its firmware.", + "operationId": "Clusters_UpgradeFirmware" + } + } + }, + "definitions": { + "ApiOperation": { + "description": "REST API operation description: see https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/openapi-authoring-automated-guidelines.md#r3023-operationsapiimplementation", + "properties": { + "display": { + "description": "The object that represents the operation.", + "properties": { + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string" + }, + "provider": { + "description": "Service provider: Microsoft.StorageCache", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed: cluster, etc.", + "type": "string" + } + } + }, + "name": { + "description": "Operation name: {provider}/{resource}/{operation}", + "type": "string" + } + }, + "type": "object" + }, + "ApiOperationListResult": { + "description": "Result of the request to list Resource Provider operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "nextLink": { + "description": "URL to get the next set of operation list results if there are any.", + "type": "string" + }, + "value": { + "description": "List of Resource Provider operations supported by the Microsoft.StorageCache resource provider.", + "items": { + "$ref": "#/definitions/ApiOperation" + }, + "type": "array" + } + }, + "type": "object" + }, + "ClfsTarget": { + "description": "Storage container for use as a CLFS StorageTarget.", + "properties": { + "target": { + "description": "URL of storage container.", + "$ref": "#/definitions/URLString" + } + }, + "type": "object" + }, + "CloudError": { + "description": "An error response.", + "properties": { + "error": { + "description": "The body of the error.", + "$ref": "#/definitions/CloudErrorBody" + } + }, + "type": "object" + }, + "CloudErrorBody": { + "description": "An error response.", + "properties": { + "code": { + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically.", + "type": "string" + }, + "details": { + "description": "A list of additional details about the error.", + "items": { + "$ref": "#/definitions/CloudErrorBody" + }, + "type": "array" + }, + "message": { + "description": "A message describing the error, intended to be suitable for display in a user interface.", + "type": "string" + }, + "target": { + "description": "The target of the particular error. For example, the name of the property in error.", + "type": "string" + } + }, + "type": "object" + }, + "Cluster": { + "description": "An Avere cache instance. Follows Azure Resource Manager standards: https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md", + "properties": { + "tags": { + "description": "ARM tags as name/value pairs.", + "type": "object" + }, + "id": { + "description": "Fully qualified URL of the cluster.", + "readOnly": true, + "$ref": "#/definitions/URLString" + }, + "location": { + "description": "Region name string.", + "pattern": "^[-.0-9a-zA-Z_]+$", + "type": "string" + }, + "name": { + "description": "Name of cluster.", + "readOnly": true, + "$ref": "#/definitions/ResourceName" + }, + "type": { + "description": "Type for the cluster; Microsoft.StorageCache/Cluster", + "readOnly": true, + "type": "string" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for the cluster.", + "properties": { + "cacheSize": { + "description": "The size of this cluster's cache, in GB.", + "type": "integer" + }, + "health": { + "description": "Health of the cluster.", + "$ref": "#/definitions/ClusterHealth" + }, + "mountAddresses": { + "description": "Array of IP addresses that can be used by clients mounting this Cluster.", + "items": { + "type": "string" + }, + "type": "array" + }, + "provisioningState": { + "description": "see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", + "type": "string" + }, + "statusMessage": { + "description": "If present, a message describing an exceptional cluster state, such as an explanation of why the health is \"degraded\".", + "type": "string" + }, + "subnet": { + "description": "Subnet used for the cluster.", + "$ref": "#/definitions/URLString" + }, + "upgradeStatus": { + "description": "Upgrade status of the cluster.", + "$ref": "#/definitions/ClusterUpgradeStatus" + } + }, + "type": "object" + }, + "sku": { + "description": "Sku for the cluster.", + "properties": { + "name": { + "description": "Sku name for this cluster.", + "type": "string" + } + }, + "type": "object" + } + }, + "type": "object" + }, + "ClusterHealth": { + "description": "An indication of cluster health.", + "enum": [ + "healthy", + "degraded", + "down", + "transitioning", + "stopping", + "stopped", + "upgrading", + "flushing" + ], + "type": "string" + }, + "ClusterUpgradeStatus": { + "description": "Properties describing the software upgrade state of the cluster", + "properties": { + "currentFirmwareVersion": { + "description": "Version string of the firmware currently installed on this cluster.", + "type": "string" + }, + "firmwareUpdateStatus": { + "description": "True if there is a firmware update ready to install on this cluster. The firmware will automatically be installed after firmwareUpdateDeadline if not triggered earlier via the upgrade operation.", + "enum": [ + "available", + "unavailable" + ], + "x-ms-enum": { + "name": "FirmwareStatusType", + "modelAsString": false + }, + "type": "string" + }, + "firmwareUpdateDeadline": { + "description": "Time at which the pending firmware update will automatically be installed on the cluster.", + "format": "date", + "type": "string" + }, + "lastFirmwareUpdate": { + "description": "Time of the last successful firmware update.", + "format": "date", + "type": "string" + }, + "pendingFirmwareVersion": { + "description": "When firmwareUpdateAvailable is true, this field holds the version string for the update.", + "type": "string" + } + }, + "type": "object" + }, + "Nfs3Target": { + "description": "An NFS mount point for use as a StorageTarget.", + "properties": { + "target": { + "description": "Mount string of an NFS Storage Target, ie: 10.0.44.44:/exp1", + "pattern": "^[.0-9a-zA-Z]+:/.*$", + "type": "string" + }, + "usageModel": { + "description": "Identifies the primary usage model to be used for this storage target. GET choices from .../usageModels", + "type": "string" + } + }, + "type": "object" + }, + "ResourceName": { + "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate, this will contain the complete URL of the object. These names are case-preserving, but not case sensistive.", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "type": "string" + }, + "ResourceSku": { + "description": "A resource SKU", + "properties": { + "cacheSizes": { + "description": "A list of cache sizes that are valid for this Sku (in GB)", + "items": { + "type": "integer" + }, + "type": "array" + }, + "capabilities": { + "description": "A list of capabilities of this SKU, such as throughput or ops/sec", + "items": { + "$ref": "#/definitions/ResourceSkuCapabilities" + }, + "type": "array" + }, + "locations": { + "description": "The set of locations that the SKU is available.", + "items": { + "$ref": "#/definitions/ResourceSkuLocationInfo" + }, + "type": "array" + }, + "name": { + "description": "The name of this sku.", + "type": "string" + } + }, + "type": "object" + }, + "ResourceSkuCapabilities": { + "description": "A resource SKU capability.", + "properties": { + "name": { + "description": "Name of a capability, such as ops/sec", + "type": "string" + }, + "value": { + "description": "Quantity, if the capability is measured by quantity", + "type": "string" + } + }, + "type": "object" + }, + "ResourceSkuLocationInfo": { + "description": "Resource SKU location information.", + "properties": { + "location": { + "description": "Location where this Sku is available", + "type": "string" + } + }, + "type": "object" + }, + "ResourceSkusResult": { + "description": "A list of vFXT cluster Skus.", + "properties": { + "nextLink": { + "description": "The uri to fetch the next page of vFXT Cluster Skus.", + "type": "string" + }, + "value": { + "description": "The list of skus available for the subscription.", + "items": { + "$ref": "#/definitions/ResourceSku" + }, + "type": "array" + } + }, + "type": "object" + }, + "StorageTarget": { + "description": "A storage system being cached by a Cluster.", + "type": "object", + "discriminator": "targetType", + "properties": { + "name": { + "description":"A fully qualified URL.", + "readOnly": true, + "$ref": "#/definitions/ResourceName" + }, + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id" + }, + "type": { + "description": "Type for the storage target; Microsoft.StorageCache/Cluster/StorageTarget", + "readOnly": true, + "type": "string" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "Properties of the storage target.", + "type": "object", + "properties": { + "targetType": { + "description": "Type for storage target.", + "readOnly": true, + "enum": [ + "nfs3", + "clfs" + ], + "x-ms-enum": { + "name": "StorageTargetType", + "modelAsString": false + }, + "type": "string" + }, + "nfs3": { + "description": "Properties when nfs3 target.", + "$ref": "#/definitions/Nfs3Target" + }, + "clfs": { + "description": "Properties when clfs target.", + "$ref": "#/definitions/ClfsTarget" + } + } + } + }, + "x-ms-azure-resource": true + }, + "StorageTargetsResult": { + "description": "A list of storage targets.", + "properties": { + "nextLink": { + "description": "The uri to fetch the next page of storage targets.", + "type": "string" + }, + "value": { + "description": "The list of storage targets defined for the cluster.", + "items": { + "$ref": "#/definitions/StorageTarget" + }, + "type": "array" + } + }, + "type": "object" + }, + "URLString": { + "description": "A fully qualified URL.", + "type": "string" + }, + "UsageModel": { + "description": "A usage model.", + "properties": { + "display": { + "description": "Localized information describing this usage model.", + "properties": { + "description": { + "description": "Localized string describing this usage model", + "type": "string" + } + }, + "type": "object" + }, + "name": { + "description": "Non localized keyword naming this usage model.", + "type": "string" + }, + "type": { + "description": "The type of Storage Target to which this model is applicable (only nfs for now)", + "type": "string" + } + }, + "type": "object" + }, + "UsageModelsResult": { + "description": "A list of vFXT usage models.", + "properties": { + "nextLink": { + "description": "The uri to fetch the next page of vFXT usage models.", + "type": "string" + }, + "value": { + "description": "The list of usage models available for the subscription.", + "items": { + "$ref": "#/definitions/UsageModel" + }, + "type": "array" + } + }, + "type": "object" + } + }, + "x-components": { + "parameters": { + "ApiVersionParameter": { + "description": "The API version to use for this operation.", + "in": "query", + "name": "api-version", + "required": true, + "type": "string" + }, + "ClusterNameParameter": { + "description": "Name of cluster.", + "in": "path", + "name": "clusterName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + "ResourceGroupNameParameter": { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + "StorageTargetNameParameter": { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + "SubscriptionIdParameter": { + "description": "Target subscription ID.", + "in": "path", + "name": "subscriptionId", + "required": true, + "type": "string" + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + } + } +} diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md new file mode 100644 index 000000000000..c919ab776a19 --- /dev/null +++ b/specification/storagecache/resource-manager/readme.md @@ -0,0 +1,42 @@ +# StorageCache + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for storagecache RP. + + + +--- +## Getting Started +To build the SDK for storagecache, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: + +> `autorest` + +To see additional help and options, run: + +> `autorest --help` +--- + +## Configuration + + + +### Basic Information +These are the global settings for the StorageCache API. + +``` yaml +openapi-type: arm +tag: package-2019-06 +``` + + +### Tag: package-2018-02 + +These settings apply only when `--tag=package-2019-06` is specified on the command line. + +``` yaml $(tag) == 'package-2019-06' +input-file: +- Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +``` + + From dfdccdb982329c5ab81ffe6a6f1d3a3a42fec1b5 Mon Sep 17 00:00:00 2001 From: Matt White Date: Wed, 6 Feb 2019 10:26:07 -0500 Subject: [PATCH 02/35] fix global parameters and indenting --- .../examples/StorageTargets_List.json | 14 +- .../2019-06-01-preview/storagecache.json | 217 ++++++++---------- 2 files changed, 106 insertions(+), 125 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json index d0431d38165d..7aada7a8f842 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json @@ -8,8 +8,8 @@ "responses": { "200": { "body": { - "value": [ - { + "value": [ + { "name": "st1", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", @@ -20,8 +20,8 @@ "target": "10.0.44.44:/exp1", "usageModel": "read heavy, frequent changes" } - }, - { + }, + { "name": "st2", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st2", "type": "Microsoft.StorageCache/Cluster/StorageTarget", @@ -31,9 +31,9 @@ "clfs": { "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" } - } - ] + } + ] } } } -} +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index dd6961259441..c601d4e32eb9 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -41,12 +41,8 @@ "application/json" ], "parameters": [ - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" } ], "responses": { @@ -75,7 +71,7 @@ "Operations_List": { "$ref": "./examples/Operations_List.json" } - } + } } }, "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/skus": { @@ -84,13 +80,12 @@ "application/json" ], "parameters": [ - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - } + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } ], "responses": { "200": { @@ -127,13 +122,12 @@ "application/json" ], "parameters": [ - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - } + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } ], "responses": { "200": { @@ -170,13 +164,12 @@ "application/json" ], "parameters": [ - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - } + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } ], "responses": { "200": { @@ -220,13 +213,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - } + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } ], "responses": { "200": { @@ -269,14 +261,7 @@ "name": "resourceGroupName", "required": true, "type": "string" - }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -284,7 +269,14 @@ "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" - } + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], "responses": { "202": { @@ -324,13 +316,6 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - }, { "description": "Name of cluster.", "in": "path", @@ -338,7 +323,14 @@ "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" - } + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], "responses": { "200": { @@ -380,13 +372,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -450,13 +441,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -519,13 +509,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -581,13 +570,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -643,13 +631,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -705,13 +692,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -763,13 +749,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -828,13 +813,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -892,13 +876,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -964,13 +947,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", @@ -1035,13 +1017,12 @@ "required": true, "type": "string" }, - { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" + { + "$ref": "#/parameters/ApiVersionParameter" }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, { "description": "Name of cluster.", "in": "path", From eb67735b27247e5943bbd2d692155104e8a3ff88 Mon Sep 17 00:00:00 2001 From: Matt White Date: Wed, 6 Feb 2019 16:40:54 -0500 Subject: [PATCH 03/35] pass oav validator; fix ARM SDK warning --- .../examples/Clusters_Create.json | 49 +++++- .../examples/Clusters_Delete.json | 4 + .../examples/Clusters_Flush.json | 16 +- .../examples/Clusters_Get.json | 4 +- .../examples/Clusters_List.json | 10 +- .../Clusters_ListByResourceGroup.json | 10 +- .../examples/Clusters_Start.json | 16 +- .../examples/Clusters_Stop.json | 16 +- .../examples/Clusters_Update.json | 19 ++- .../examples/Clusters_UpgradeFirmware.json | 19 ++- .../examples/Operations_List.json | 24 ++- .../examples/Skus_List.json | 142 ++++++++++-------- .../examples/StorageTargets_Create.json | 22 +-- .../examples/StorageTargets_Delete.json | 9 +- .../examples/StorageTargets_Get.json | 12 +- ...json => StorageTargets_ListByCluster.json} | 22 +-- .../examples/StorageTargets_Update.json | 14 +- .../2019-06-01-preview/storagecache.json | 39 +++-- 18 files changed, 290 insertions(+), 157 deletions(-) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{StorageTargets_List.json => StorageTargets_ListByCluster.json} (72%) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json index c1ca2691b909..c7501dcf4e60 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json @@ -10,7 +10,7 @@ }, "location": "westus", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "mountAddresses": [ "192.168.1.1", "192.168.1.2" @@ -33,7 +33,7 @@ "name": "sc1", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "1024", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -43,7 +43,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", @@ -54,6 +54,49 @@ "name": "Storage Cache A123" } } + }, + "200": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cluster", + "properties": { + "cacheSizeGB": 3072, + "health": "transitioning", + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Allocating", + "statusMessage": "Cluster is being created.", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Storage Cache A123" + } + } + }, + "400": { + "body": { + "error": { + "code": "Error 542", + "details": [ + ], + "message": "Specified a changed value for a read-only property.", + "target": "provisioningState" + } + } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json index 5623b3395156..6cfaa91df250 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json @@ -1,12 +1,16 @@ { "parameters": { "resourceGroupName": "scgroup", + "clusterName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, "responses": { "202": { "body": "" + }, + "204": { + "body": "" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json index 5623b3395156..e9b0be294448 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json @@ -1,12 +1,26 @@ { "parameters": { "resourceGroupName": "scgroup", + "clusterName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, "responses": { + "200": { + "body": "" + }, "202": { "body": "" - } + }, + "400": { + "body": { + "error": { + "code": "Error 823", + "details": [ + ], + "message": "Cluster is not in a state where a flush is allowed." + } + } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json index 01f2878e2f69..a34e3a590ec5 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json @@ -16,7 +16,7 @@ "name": "sc1", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -26,7 +26,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json index 60dc83011b2b..146e26e3b972 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json @@ -5,7 +5,7 @@ }, "responses": { "200": { - "items": [ + "body": [ { "tags": { "Dept": "Initech" @@ -15,7 +15,7 @@ "name": "sc1", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -25,7 +25,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", @@ -45,7 +45,7 @@ "name": "sc2", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -55,7 +55,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json index 30cad7a230f9..74a60162c203 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json @@ -6,7 +6,7 @@ }, "responses": { "200": { - "items": [ + "body": [ { "tags": { "Dept": "Initech" @@ -16,7 +16,7 @@ "name": "sc1", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -26,7 +26,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", @@ -46,7 +46,7 @@ "name": "sc2", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -56,7 +56,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json index 5623b3395156..8be384f724ac 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json @@ -1,12 +1,26 @@ { "parameters": { "resourceGroupName": "scgroup", + "clusterName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, "responses": { + "200": { + "body": "" + }, "202": { "body": "" - } + }, + "400": { + "body": { + "error": { + "code": "Error 823", + "details": [ + ], + "message": "Cluster is not in a state where a transition to Active is allowed." + } + } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json index 5623b3395156..73780afd8c97 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json @@ -1,12 +1,26 @@ { "parameters": { "resourceGroupName": "scgroup", + "clusterName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, "responses": { + "200": { + "body": "" + }, "202": { "body": "" - } + }, + "400": { + "body": { + "error": { + "code": "Error 823", + "details": [ + ], + "message": "Cluster is not in a state where a transition to Stopped is allowed." + } + } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json index be5e8a58369e..9ef53a5ad387 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json @@ -10,7 +10,7 @@ }, "location": "westus", "properties": { - "cacheSize": "3072", + "cacheSizeGB": 3072, "mountAddresses": [ "192.168.1.1", "192.168.1.2" @@ -33,7 +33,7 @@ "name": "sc1", "type": "Microsoft.StorageCache/Cluster", "properties": { - "cacheSize": "1024", + "cacheSizeGB": 3072, "health": "transitioning", "mountAddresses": [ "192.168.1.1", @@ -43,7 +43,7 @@ "statusMessage": "Cluster is being created.", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { - "currentFirmWareVersion": "AvereOS V5.1.1.2", + "currentFirmwareVersion": "AvereOS V5.1.1.2", "firmwareUpdateStatus": "available", "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", @@ -52,7 +52,18 @@ }, "sku": { "name": "Storage Cache A123" - }, + } + } + }, + "400": { + "body": { + "error": { + "code": "Error 523", + "details": [ + ], + "message": "Specified a changed value for a read-only property.", + "target": "health" + } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json index 6af5d9a963f5..74159fe87648 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json @@ -1,12 +1,27 @@ { "parameters": { "resourceGroupName": "scgroup", + "clusterName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, "responses": { + "201": { + "body": "" + }, "202": { "body": "" - } + }, + "400": { + "body": { + "error": { + "code": "Error 2323", + "details": [ + ], + "message": "No new firmware image is available.", + "target": "" + } + } + } } -} \ No newline at end of file +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json index a15dd3149343..a2d333fac7af 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json @@ -15,27 +15,21 @@ { "name": "Microsoft.StorageCache/clusters/write", "display": { - "operation": "Create or Update Cluster", - "provider": "Azure Storage Cache", - "resource": "Clusters", - "description": "Create or update Cluster." - }, - "properties": {}, - "origin": "user" + "operation": "Create or Update Cluster", + "provider": "Azure Storage Cache", + "resource": "Clusters" + } }, { "name": "Microsoft.StorageCache/clusters/delete", "display": { - "operation": "Delete Cluster", - "provider": "Azure Storage Cache", - "resource": "Clusters", - "description": "Delete Cluster." - }, - "properties": {}, - "origin": "user" + "operation": "Delete Cluster", + "provider": "Azure Storage Cache", + "resource": "Clusters" + } } ] } } } -} \ No newline at end of file +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json index 19cda8d6771f..3d113eeb043a 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -1,68 +1,80 @@ { - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "cacheSizes": [ - "3072", - "6144", - "12288" - ], - "capabilities": [ - { - "name": "ops/sec", - "value": "153600" - } - ], - "locations": [ - "location": "westus", - "location": "eastus" - ], - "name": "Storage Cache A1" - }, - { - "cacheSizes": [ - "6144", - "12288", - "24576" - ], - "capabilities": [ - { - "name": "ops/sec", - "value": "307200" - } - ], - "locations": [ - "location": "westus", - "location": "eastus" - ], - "name": "Storage Cache A2" - }, - { - "cacheSizes": [ - "12288", - "24576", - "49152" - ], - "capabilities": [ - { - "name": "ops/sec", - "value": "614400" - } - ], - "locations": [ - "location": "westus", - "location": "eastus" - ], - "name": "Storage Cache A3" - } - ] - } + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "cacheSizesGB": [ + 3072, + 6144, + 12288 + ], + "capabilities": [ + { + "name": "throughput GB/s", + "value": "2" + } + ], + "locations": [ + { + "location": "westus" + }, + { + "location": "eastus" + } + ], + "name": "Storage Cache A1" + }, + { + "cacheSizesGB": [ + 6144, + 12288, + 24576 + ], + "capabilities": [ + { + "name": "throughput GB/s", + "value": "4" + } + ], + "locations": [ + { + "location": "westus" + }, + { + "location": "eastus" + } + ], + "name": "Storage Cache A2" + }, + { + "cacheSizesGB": [ + 12288, + 24576, + 49152 + ], + "capabilities": [ + { + "name": "thoughput GB/s", + "value": "8" + } + ], + "locations": [ + { + "location": "westus" + }, + { + "location": "eastus" + } + ], + "name": "Storage Cache A3" + } + ] } } - } \ No newline at end of file + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json index f1a006d4cf29..07b3ef03274b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json @@ -7,11 +7,11 @@ "storageTargetName": "st1", "storagetarget": { "properties": { - "targetType": "nfs3" - }, - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } } } }, @@ -22,12 +22,12 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { - "targetType": "nfs3" - }, - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" - } + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json index bc5aaea98376..c980aa6bc729 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json @@ -8,8 +8,13 @@ }, "responses": { "200": { - "body": { - } + "body": "" + }, + "202": { + "body": "" + }, + "204": { + "body": "" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json index 54a115a67f4c..3000fa4aa595 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json @@ -13,12 +13,12 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { - "targetType": "nfs3" - }, - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" - } + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json similarity index 72% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json index 7aada7a8f842..f5f44a135f07 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json @@ -8,17 +8,17 @@ "responses": { "200": { "body": { - "value": [ + "value": [ { "name": "st1", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { - "targetType": "nfs3" - }, - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } } }, { @@ -26,14 +26,14 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st2", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { - "targetType": "clfs" - }, - "clfs": { - "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" + "targetType": "clfs", + "clfs": { + "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" + } } } ] } } } -} \ No newline at end of file +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json index 6870d33fd2b4..c6c0b0db805f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json @@ -22,13 +22,13 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { - "targetType": "nfs3" - }, - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" - } + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } + } } } } -} \ No newline at end of file +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index c601d4e32eb9..4029ec6267bd 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -63,15 +63,15 @@ "Operations" ], "description": "Lists all of the available RP operations.", - "operationId": "Operations_List", - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { - "Operations_List": { + "StorageTargets_List": { "$ref": "./examples/Operations_List.json" } - } + }, + "operationId": "Operations_List", + "x-ms-pageable": { + "nextLinkName": "nextLink" + } } }, "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/skus": { @@ -297,7 +297,7 @@ "$ref": "./examples/Clusters_Delete.json" } }, - "x-ms-long-running-operation": true, + "x-ms-long-running-operation": true, "tags": [ "Clusters" ], @@ -396,6 +396,12 @@ } ], "responses": { + "200": { + "description": "Cluster created or already exists.", + "schema": { + "$ref": "#/definitions/Cluster" + } + }, "201": { "description": "Cluster creation has been initiated. Poll the new Cluster's provisioningState property to monitor creation progress.", "schema": { @@ -420,6 +426,7 @@ "$ref": "./examples/Clusters_Create.json" } }, + "x-ms-long-running-operation": true, "tags": [ "Clusters" ], @@ -549,7 +556,7 @@ "$ref": "./examples/Clusters_Flush.json" } }, - "x-ms-long-running-operation": true, + "x-ms-long-running-operation": true, "tags": [ "Clusters" ], @@ -723,7 +730,7 @@ }, "x-ms-examples": { "StorageTargets_List": { - "$ref": "./examples/StorageTargets_List.json" + "$ref": "./examples/StorageTargets_ListByCluster.json" } }, "x-ms-pageable": { @@ -733,7 +740,7 @@ "StorageTargets" ], "description": "Returns the StorageTargets for this cluster in the subscription and resource group.", - "operationId": "StorageTargets_List" + "operationId": "StorageTargets_ListByCluster" } }, "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storagetargets/{storageTargetName}": { @@ -901,7 +908,7 @@ { "description": "Object containing the definition of a storage target.", "in": "body", - "name": "body", + "name": "storagetarget", "schema": { "$ref": "#/definitions/StorageTarget" } @@ -1170,7 +1177,6 @@ }, "location": { "description": "Region name string.", - "pattern": "^[-.0-9a-zA-Z_]+$", "type": "string" }, "name": { @@ -1187,7 +1193,7 @@ "x-ms-client-flatten": true, "description": "Properties for the cluster.", "properties": { - "cacheSize": { + "cacheSizeGB": { "description": "The size of this cluster's cache, in GB.", "type": "integer" }, @@ -1232,6 +1238,7 @@ "type": "object" } }, + "x-ms-azure-resource": true, "type": "object" }, "ClusterHealth": { @@ -1269,12 +1276,12 @@ }, "firmwareUpdateDeadline": { "description": "Time at which the pending firmware update will automatically be installed on the cluster.", - "format": "date", + "format": "date-time", "type": "string" }, "lastFirmwareUpdate": { "description": "Time of the last successful firmware update.", - "format": "date", + "format": "date-time", "type": "string" }, "pendingFirmwareVersion": { @@ -1307,7 +1314,7 @@ "ResourceSku": { "description": "A resource SKU", "properties": { - "cacheSizes": { + "cacheSizesGB": { "description": "A list of cache sizes that are valid for this Sku (in GB)", "items": { "type": "integer" From 09d97fcc1a263222ceabc5728092b9fb3a4b0b1e Mon Sep 17 00:00:00 2001 From: Matt White Date: Wed, 20 Feb 2019 17:48:36 -0500 Subject: [PATCH 04/35] review edits --- .../examples/Clusters_Create.json | 31 +-- .../examples/Clusters_Delete.json | 3 + .../examples/Clusters_Flush.json | 12 +- .../examples/Clusters_Get.json | 8 +- .../examples/Clusters_List.json | 16 +- .../Clusters_ListByResourceGroup.json | 16 +- .../examples/Clusters_Start.json | 12 +- .../examples/Clusters_Stop.json | 12 +- .../examples/Clusters_Update.json | 19 +- .../examples/Clusters_UpgradeFirmware.json | 13 +- .../2019-06-01-preview/storagecache.json | 208 ++++++++---------- 11 files changed, 144 insertions(+), 206 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json index c7501dcf4e60..9566551407dd 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json @@ -11,10 +11,6 @@ "location": "westus", "properties": { "cacheSizeGB": 3072, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" }, "sku": { @@ -34,13 +30,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", @@ -66,13 +64,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", @@ -86,17 +86,6 @@ "name": "Storage Cache A123" } } - }, - "400": { - "body": { - "error": { - "code": "Error 542", - "details": [ - ], - "message": "Specified a changed value for a read-only property.", - "target": "provisioningState" - } - } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json index 6cfaa91df250..781097177d3b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json @@ -6,6 +6,9 @@ "api-version": "2019-06-01-preview" }, "responses": { + "200": { + "body": "" + }, "202": { "body": "" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json index e9b0be294448..39265abdf233 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json @@ -11,16 +11,6 @@ }, "202": { "body": "" - }, - "400": { - "body": { - "error": { - "code": "Error 823", - "details": [ - ], - "message": "Cluster is not in a state where a flush is allowed." - } - } - } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json index a34e3a590ec5..47a2b1350a71 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json @@ -17,13 +17,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json index 146e26e3b972..06f4cecbc496 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json @@ -16,13 +16,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", @@ -46,13 +48,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Configuring", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json index 74a60162c203..e0f1858215a3 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json @@ -17,13 +17,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", @@ -47,13 +49,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json index 8be384f724ac..39265abdf233 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json @@ -11,16 +11,6 @@ }, "202": { "body": "" - }, - "400": { - "body": { - "error": { - "code": "Error 823", - "details": [ - ], - "message": "Cluster is not in a state where a transition to Active is allowed." - } - } - } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json index 73780afd8c97..39265abdf233 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json @@ -11,16 +11,6 @@ }, "202": { "body": "" - }, - "400": { - "body": { - "error": { - "code": "Error 823", - "details": [ - ], - "message": "Cluster is not in a state where a transition to Stopped is allowed." - } - } - } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json index 9ef53a5ad387..8dc073f1b737 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json @@ -34,13 +34,15 @@ "type": "Microsoft.StorageCache/Cluster", "properties": { "cacheSizeGB": 3072, - "health": "transitioning", + "health": { + "state": "transitioning", + "statusDescription": "Cluster is being created." + }, "mountAddresses": [ "192.168.1.1", "192.168.1.2" ], - "provisioningState": "Allocating", - "statusMessage": "Cluster is being created.", + "provisioningState": "Booting", "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", "upgradeStatus": { "currentFirmwareVersion": "AvereOS V5.1.1.2", @@ -54,17 +56,6 @@ "name": "Storage Cache A123" } } - }, - "400": { - "body": { - "error": { - "code": "Error 523", - "details": [ - ], - "message": "Specified a changed value for a read-only property.", - "target": "health" - } - } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json index 74159fe87648..b62d4eab73aa 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json @@ -11,17 +11,6 @@ }, "202": { "body": "" - }, - "400": { - "body": { - "error": { - "code": "Error 2323", - "details": [ - ], - "message": "No new firmware image is available.", - "target": "" - } - } - } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index 4029ec6267bd..d3661348081d 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -41,7 +41,7 @@ "application/json" ], "parameters": [ - { + { "$ref": "#/parameters/ApiVersionParameter" } ], @@ -80,12 +80,12 @@ "application/json" ], "parameters": [ - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } + } ], "responses": { "200": { @@ -122,12 +122,12 @@ "application/json" ], "parameters": [ - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } + } ], "responses": { "200": { @@ -164,12 +164,12 @@ "application/json" ], "parameters": [ - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } + } ], "responses": { "200": { @@ -213,12 +213,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } + } ], "responses": { "200": { @@ -270,15 +270,17 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } - + } ], "responses": { + "200": { + "description": "Cluster deleted." + }, "202": { "description": "Started the Cluster's transition to Deleted state." }, @@ -324,13 +326,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } - + } ], "responses": { "200": { @@ -372,12 +373,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -408,12 +409,6 @@ "$ref": "#/definitions/Cluster" } }, - "400": { - "description": "Specified a changed value for a read-only property.", - "schema": { - "$ref": "#/definitions/CloudError" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -448,12 +443,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -478,12 +473,6 @@ "$ref": "#/definitions/Cluster" } }, - "400": { - "description": "Specified a changed value for a read-only property.", - "schema": { - "$ref": "#/definitions/CloudError" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -516,12 +505,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -538,12 +527,6 @@ "202": { "description": "Cluster has started flushing." }, - "400": { - "description": "Cluster is not in a state where a flush is allowed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -577,12 +560,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -599,12 +582,6 @@ "202": { "description": "Cluster has started the transition to Active." }, - "400": { - "description": "Cluster is not in a state where a transition to Active is allowed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -638,12 +615,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -660,12 +637,6 @@ "202": { "description": "Cluster has started the transition to Stopped." }, - "400": { - "description": "Cluster is not in a state where a transition to Stopped is allowed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -686,7 +657,7 @@ "operationId": "Clusters_Stop" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storagetargets": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storageTargets": { "get": { "produces": [ "application/json" @@ -699,12 +670,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -743,7 +714,7 @@ "operationId": "StorageTargets_ListByCluster" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storagetargets/{storageTargetName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storageTargets/{storageTargetName}": { "delete": { "produces": [ "application/json" @@ -756,12 +727,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -820,12 +791,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -883,12 +854,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -954,12 +925,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -1024,12 +995,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - }, + }, { "description": "Name of cluster.", "in": "path", @@ -1046,12 +1017,6 @@ "202": { "description": "Cluster has started the upgrade." }, - "400": { - "description": "No new firmware image is available.", - "schema": { - "$ref": "#/definitions/CloudError" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1210,10 +1175,14 @@ }, "provisioningState": { "description": "see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", - "type": "string" - }, - "statusMessage": { - "description": "If present, a message describing an exceptional cluster state, such as an explanation of why the health is \"degraded\".", + "enum":[ + "Succeeded", + "Failed", + "Cancelled", + "Creating", + "Configuring", + "Booting" + ], "type": "string" }, "subnet": { @@ -1243,17 +1212,30 @@ }, "ClusterHealth": { "description": "An indication of cluster health.", - "enum": [ - "healthy", - "degraded", - "down", - "transitioning", - "stopping", - "stopped", - "upgrading", - "flushing" - ], - "type": "string" + "properties": { + "state": { + "description": "List of cluster health states.", + "enum": [ + "healthy", + "degraded", + "down", + "transitioning", + "stopping", + "stopped", + "upgrading", + "flushing" + ], + "x-ms-enum": { + "name": "HealthStateType", + "modelAsString": false + }, + "type": "string" + }, + "statusDescription": { + "description": "Describes explanation of state.", + "type": "string" + } + } }, "ClusterUpgradeStatus": { "description": "Properties describing the software upgrade state of the cluster", @@ -1271,22 +1253,26 @@ "x-ms-enum": { "name": "FirmwareStatusType", "modelAsString": false - }, + }, + "readOnly": true, "type": "string" }, "firmwareUpdateDeadline": { "description": "Time at which the pending firmware update will automatically be installed on the cluster.", "format": "date-time", - "type": "string" + "type": "string", + "readOnly": true }, "lastFirmwareUpdate": { "description": "Time of the last successful firmware update.", "format": "date-time", - "type": "string" + "type": "string", + "readOnly": true }, "pendingFirmwareVersion": { "description": "When firmwareUpdateAvailable is true, this field holds the version string for the update.", - "type": "string" + "type": "string", + "readOnly": true } }, "type": "object" From 05deb64967f7d2456cc68d8db8ed3dcc860111bc Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 26 Feb 2019 17:49:06 -0500 Subject: [PATCH 05/35] fix cosmetic stuff with tabs, added path for storagetarget that was forgotten --- .../examples/Clusters_List.json | 8 ++--- .../Clusters_ListByResourceGroup.json | 8 ++--- .../examples/Skus_List.json | 36 +++++++++---------- .../examples/StorageTargets_Create.json | 8 +++-- .../examples/StorageTargets_Get.json | 5 +-- .../StorageTargets_ListByCluster.json | 10 +++--- .../examples/StorageTargets_Update.json | 16 +++++---- .../2019-06-01-preview/storagecache.json | 5 +++ 8 files changed, 54 insertions(+), 42 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json index 06f4cecbc496..b8016aa518c6 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json @@ -6,7 +6,7 @@ "responses": { "200": { "body": [ - { + { "tags": { "Dept": "Initech" }, @@ -37,8 +37,8 @@ "sku": { "name": "Storage Cache A123" } - }, - { + }, + { "tags": { "Dept": "Initech" }, @@ -69,7 +69,7 @@ "sku": { "name": "Storage Cache A123" } - } + } ] } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json index e0f1858215a3..f20e5b7dc101 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json @@ -7,7 +7,7 @@ "responses": { "200": { "body": [ - { + { "tags": { "Dept": "Initech" }, @@ -38,8 +38,8 @@ "sku": { "name": "Storage Cache A123" } - }, - { + }, + { "tags": { "Dept": "Initech" }, @@ -70,7 +70,7 @@ "sku": { "name": "Storage Cache A123" } - } + } ] } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json index 3d113eeb043a..114315490edf 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -20,12 +20,12 @@ } ], "locations": [ - { - "location": "westus" - }, - { - "location": "eastus" - } + { + "location": "westus" + }, + { + "location": "eastus" + } ], "name": "Storage Cache A1" }, @@ -42,12 +42,12 @@ } ], "locations": [ - { - "location": "westus" - }, - { - "location": "eastus" - } + { + "location": "westus" + }, + { + "location": "eastus" + } ], "name": "Storage Cache A2" }, @@ -64,12 +64,12 @@ } ], "locations": [ - { - "location": "westus" - }, - { - "location": "eastus" - } + { + "location": "westus" + }, + { + "location": "eastus" + } ], "name": "Storage Cache A3" } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json index 07b3ef03274b..0ddf999bed75 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json @@ -7,11 +7,12 @@ "storageTargetName": "st1", "storagetarget": { "properties": { + "path": "/path/to/target", "targetType": "nfs3", - "nfs3": { + "nfs3": { "target": "10.0.44.44:/exp1", "usageModel": "read heavy, frequent changes" - } + } } } }, @@ -22,7 +23,8 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { - "targetType": "nfs3", + "path": "/path/to/target", + "targetType": "nfs3", "nfs3": { "target": "10.0.44.44:/exp1", "usageModel": "read heavy, frequent changes" diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json index 3000fa4aa595..98c5795a652a 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json @@ -13,10 +13,11 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { + "path": "/path/to/target", "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json index f5f44a135f07..4788d53c0913 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json @@ -8,16 +8,17 @@ "responses": { "200": { "body": { - "value": [ + "value": [ { "name": "st1", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { + "path": "/path/to/target1", "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" } } }, @@ -26,9 +27,10 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st2", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { + "path": "/path/to/target2", "targetType": "clfs", "clfs": { - "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" + "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json index c6c0b0db805f..cdafce6fc61b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json @@ -7,11 +7,12 @@ "storageTargetName": "st1", "storagetarget": { "properties": { - "targetType": "nfs3" - }, - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "path": "/path/to/target", + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" + } } } }, @@ -22,10 +23,11 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", "type": "Microsoft.StorageCache/Cluster/StorageTarget", "properties": { + "path": "/path/to/target", "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "target": "10.0.44.44:/exp1", + "usageModel": "read heavy, frequent changes" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index d3661348081d..8cfac458ab30 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -1394,6 +1394,11 @@ "description": "Properties of the storage target.", "type": "object", "properties": { + "path": { + "readOnly": true, + "type": "string", + "description": "Path to target in cluster namespace." + }, "targetType": { "description": "Type for storage target.", "readOnly": true, From c6f3418b14e66a5cff7d99349b06d02a6a5673ca Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 28 Feb 2019 15:42:22 -0500 Subject: [PATCH 06/35] 1. fixed readOnly; it was erroneously on some Cache properties 2. "Cluster" -> "Cache" globally 3. targettype enum fixed to have unknown type for future insurance 4. usage models examples fixed; they have short nonlocalized names now 5. x-ms-discriminator tag added to StorageTargets 6. modelasstring has been changed to true for enums 7. Avere expunged 8. vFXT expunged --- .../stable/2018-01-01/databox.json | 2 +- ...lusters_Create.json => Caches_Create.json} | 22 +- ...lusters_Delete.json => Caches_Delete.json} | 2 +- ...{Clusters_Start.json => Caches_Flush.json} | 2 +- .../{Clusters_Get.json => Caches_Get.json} | 10 +- .../{Clusters_List.json => Caches_List.json} | 18 +- ...p.json => Caches_ListByResourceGroup.json} | 18 +- ...{Clusters_Flush.json => Caches_Start.json} | 2 +- .../{Clusters_Stop.json => Caches_Stop.json} | 2 +- ...lusters_Update.json => Caches_Update.json} | 20 +- ...mware.json => Caches_UpgradeFirmware.json} | 2 +- .../examples/Operations_List.json | 12 +- .../examples/Skus_List.json | 6 +- .../examples/StorageTargets_Create.json | 32 +- .../examples/StorageTargets_Delete.json | 2 +- .../examples/StorageTargets_Get.json | 21 +- .../examples/StorageTargets_ListByCache.json | 75 +++ .../StorageTargets_ListByCluster.json | 41 -- .../examples/StorageTargets_Update.json | 32 +- .../examples/UsageModels_List.json | 18 +- .../2019-06-01-preview/storagecache.json | 458 +++++++++--------- 21 files changed, 436 insertions(+), 361 deletions(-) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Create.json => Caches_Create.json} (82%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Delete.json => Caches_Delete.json} (92%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Start.json => Caches_Flush.json} (91%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Get.json => Caches_Get.json} (82%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_List.json => Caches_List.json} (82%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_ListByResourceGroup.json => Caches_ListByResourceGroup.json} (82%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Flush.json => Caches_Start.json} (91%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Stop.json => Caches_Stop.json} (91%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_Update.json => Caches_Update.json} (79%) rename specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/{Clusters_UpgradeFirmware.json => Caches_UpgradeFirmware.json} (90%) create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json diff --git a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json index 9545d1d9b568..855d840b839b 100644 --- a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json +++ b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json @@ -97,7 +97,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DataBox/locations/{location}/availableSkus": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DataBox/locationPs/{location}/availableSkus": { "post": { "tags": [ "Service" diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json similarity index 82% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json index 9566551407dd..a8b4d81d66d2 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json @@ -1,10 +1,10 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc1", + "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview", - "cluster": { + "cache": { "tags": { "Dept": "Initech" }, @@ -14,7 +14,7 @@ "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } }, @@ -24,15 +24,15 @@ "tags": { "Dept": "Initech" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", "location": "westus", "name": "sc1", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -49,7 +49,7 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } }, @@ -58,15 +58,15 @@ "tags": { "Dept": "Initech" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", "location": "westus", "name": "sc1", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -83,7 +83,7 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json similarity index 92% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json index 781097177d3b..61b62221c5f6 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json @@ -1,7 +1,7 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc", + "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json similarity index 91% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json index 39265abdf233..894e9fb597ee 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Start.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json @@ -1,7 +1,7 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc", + "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json similarity index 82% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json index 47a2b1350a71..e236973ad02c 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json @@ -1,7 +1,7 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc1", + "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, @@ -11,15 +11,15 @@ "tags": { "Dept": "Initech" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", "location": "westus", "name": "sc1", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -36,7 +36,7 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json similarity index 82% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json index b8016aa518c6..0ae70da6156c 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json @@ -10,15 +10,15 @@ "tags": { "Dept": "Initech" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", "location": "westus", "name": "sc1", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -35,22 +35,22 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } }, { "tags": { - "Dept": "Initech" + "Dept": "Intertrode" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", "location": "westus", "name": "sc2", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -67,7 +67,7 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } ] diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json similarity index 82% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json index f20e5b7dc101..bc78d0c2bff2 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json @@ -11,15 +11,15 @@ "tags": { "Dept": "Initech" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", "location": "westus", "name": "sc1", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -36,22 +36,22 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } }, { "tags": { - "Dept": "Initech" + "Dept": "Intertrode" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", "location": "westus", "name": "sc2", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -68,7 +68,7 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } ] diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json similarity index 91% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json index 39265abdf233..894e9fb597ee 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Flush.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json @@ -1,7 +1,7 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc", + "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json similarity index 91% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json index 39265abdf233..894e9fb597ee 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Stop.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json @@ -1,7 +1,7 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc", + "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json similarity index 79% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json index 8dc073f1b737..0c62f53e5fa7 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json @@ -1,24 +1,20 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc1", + "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview", - "cluster": { + "cache": { "tags": { "Dept": "Initech" }, "location": "westus", "properties": { "cacheSizeGB": 3072, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" - }, + }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } }, @@ -28,15 +24,15 @@ "tags": { "Dept": "Initech" }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", "location": "westus", "name": "sc1", - "type": "Microsoft.StorageCache/Cluster", + "type": "Microsoft.StorageCache/Cache", "properties": { "cacheSizeGB": 3072, "health": { "state": "transitioning", - "statusDescription": "Cluster is being created." + "statusDescription": "Cache is being created." }, "mountAddresses": [ "192.168.1.1", @@ -53,7 +49,7 @@ } }, "sku": { - "name": "Storage Cache A123" + "name": "A123" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json similarity index 90% rename from specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json rename to specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json index b62d4eab73aa..1d47e8d2d59f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Clusters_UpgradeFirmware.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json @@ -1,7 +1,7 @@ { "parameters": { "resourceGroupName": "scgroup", - "clusterName": "sc1", + "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json index a2d333fac7af..74230507d1eb 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json @@ -13,19 +13,19 @@ "body": { "value": [ { - "name": "Microsoft.StorageCache/clusters/write", + "name": "Microsoft.StorageCache/caches/write", "display": { - "operation": "Create or Update Cluster", + "operation": "Create or Update Cache", "provider": "Azure Storage Cache", - "resource": "Clusters" + "resource": "Caches" } }, { - "name": "Microsoft.StorageCache/clusters/delete", + "name": "Microsoft.StorageCache/caches/delete", "display": { - "operation": "Delete Cluster", + "operation": "Delete Cache", "provider": "Azure Storage Cache", - "resource": "Clusters" + "resource": "Caches" } } ] diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json index 114315490edf..4111ae48a420 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -27,7 +27,7 @@ "location": "eastus" } ], - "name": "Storage Cache A1" + "name": "A123" }, { "cacheSizesGB": [ @@ -49,7 +49,7 @@ "location": "eastus" } ], - "name": "Storage Cache A2" + "name": "A124" }, { "cacheSizesGB": [ @@ -71,7 +71,7 @@ "location": "eastus" } ], - "name": "Storage Cache A3" + "name": "A125" } ] } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json index 0ddf999bed75..11ad8a6616d3 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json @@ -3,15 +3,24 @@ "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview", - "clusterName": "sc1", + "cacheName": "sc1", "storageTargetName": "st1", "storagetarget": { "properties": { - "path": "/path/to/target", + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], "targetType": "nfs3", "nfs3": { "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "usageModel": "READ_HEAVY_INFREQ" } } } @@ -20,14 +29,23 @@ "200": { "body": { "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", "properties": { - "path": "/path/to/target", + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], "targetType": "nfs3", "nfs3": { "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "usageModel": "READ_HEAVY_INFREQ" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json index c980aa6bc729..5924a627852e 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview", - "clusterName": "sc1", + "cacheName": "sc1", "storageTargetName": "st1" }, "responses": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json index 98c5795a652a..bafb12a96510 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json @@ -3,21 +3,30 @@ "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview", - "clusterName": "sc1", + "cacheName": "sc1", "storageTargetName": "st1" }, "responses": { "200": { "body": { "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", "properties": { - "path": "/path/to/target", + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_FREQ" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json new file mode 100644 index 000000000000..43e40aa735f7 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json @@ -0,0 +1,75 @@ + { + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cacheName": "sc1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_FREQ" + } + } + }, + { + "name": "st2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st2", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/some/crazy/place/on/cache", + "targetPath": "/" + } + ], + "targetType": "clfs", + "clfs": { + "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" + } + } + }, + { + "name": "st3", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st3", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/some/crazier/place/on/cache", + "targetPath": "/" + } + ], + "targetType": "unknown", + "unknown": { + "unknownMap": { + "foo": "bar", + "foo2": "test" + } + } + } + } + ] + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json deleted file mode 100644 index 4788d53c0913..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCluster.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "clusterName": "sc1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cluster/StorageTarget", - "properties": { - "path": "/path/to/target1", - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" - } - } - }, - { - "name": "st2", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st2", - "type": "Microsoft.StorageCache/Cluster/StorageTarget", - "properties": { - "path": "/path/to/target2", - "targetType": "clfs", - "clfs": { - "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" - } - } - } - ] - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json index cdafce6fc61b..6639d3163925 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json @@ -3,15 +3,24 @@ "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "api-version": "2019-06-01-preview", - "clusterName": "sc1", + "cacheName": "sc1", "storageTargetName": "st1", "storagetarget": { "properties": { - "path": "/path/to/target", + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], "targetType": "nfs3", "nfs3": { "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "usageModel": "READ_HEAVY_FREQ" } } } @@ -20,14 +29,23 @@ "200": { "body": { "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/clusters/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cluster/StorageTarget", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", "properties": { - "path": "/path/to/target", + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], "targetType": "nfs3", "nfs3": { "target": "10.0.44.44:/exp1", - "usageModel": "read heavy, frequent changes" + "usageModel": "READ_HEAVY_FREQ" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json index 00aaef19b00a..c8e8bc89adc5 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json @@ -8,19 +8,19 @@ "body": { "value": [ { - "display": { - "description": "read heavy, infrequent changes" - } + "name": "READ_HEAVY_INFREQ", + "type": "nfs3", + "display": "read heavy, infrequent changes" }, { - "display": { - "description": "read heavy, frequent changes" - } + "name": "READ_HEAVY_FREQ", + "type": "nfs3", + "display": "read heavy, frequent changes" }, { - "display": { - "description": "write workload > 15%" - } + "name": "WRITE_WORKLOAD_15", + "type": "nfs3", + "display": "write workload > 15%" } ] } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index 8cfac458ab30..ffae145f2e5d 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "description": "An Avere vFXT cluster provides scalable caching services for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage clusters.", + "description": "A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage caches.", "title": "Microsoft.StorageCache resource provider.", "version": "2019-06-01-preview" }, @@ -112,7 +112,7 @@ "tags": [ "SKUs" ], - "description": "Get the list of StorageCache.Cluster SKUs available to this subscription.", + "description": "Get the list of StorageCache.Cache SKUs available to this subscription.", "operationId": "Skus_List" } }, @@ -154,11 +154,11 @@ "tags": [ "UsageModels" ], - "description": "Get the list of Avere.Cluster Usage Models available to this subscription.", + "description": "Get the list of cache Usage Models available to this subscription.", "operationId": "UsageModels_List" } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/clusters": { + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/caches": { "get": { "produces": [ "application/json" @@ -173,10 +173,10 @@ ], "responses": { "200": { - "description": "A list of Cluster objects. Note that entity references might replace complete Cluster objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", + "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", "schema": { "items": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" }, "type": "array" } @@ -189,18 +189,18 @@ } }, "x-ms-examples": { - "Clusters_List": { - "$ref": "./examples/Clusters_List.json" + "Caches_List": { + "$ref": "./examples/Caches_List.json" } }, "tags": [ - "Clusters" + "Caches" ], - "description": "Returns all Clusters the user has access to under a subscription.", - "operationId": "Clusters_List" + "description": "Returns all Caches the user has access to under a subscription.", + "operationId": "Caches_List" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches": { "get": { "produces": [ "application/json" @@ -222,10 +222,10 @@ ], "responses": { "200": { - "description": "A list of Cluster objects. Note that entity references might replace complete Cluster objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", + "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", "schema": { "items": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" }, "type": "array" } @@ -238,18 +238,18 @@ } }, "x-ms-examples": { - "Clusters_ListByResourceGroup": { - "$ref": "./examples/Clusters_ListByResourceGroup.json" + "Caches_ListByResourceGroup": { + "$ref": "./examples/Caches_ListByResourceGroup.json" } }, "tags": [ - "Clusters" + "Caches" ], - "description": "Returns all Clusters the user has access to under a resource group and subscription.", - "operationId": "Clusters_ListByResourceGroup" + "description": "Returns all Caches the user has access to under a resource group and subscription.", + "operationId": "Caches_ListByResourceGroup" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}": { "delete": { "produces": [ "application/json" @@ -263,9 +263,9 @@ "type": "string" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -279,13 +279,13 @@ ], "responses": { "200": { - "description": "Cluster deleted." + "description": "Cache deleted." }, "202": { - "description": "Started the Cluster's transition to Deleted state." + "description": "Started the Cache's transition to Deleted state." }, "204": { - "description": "Cluster deleted." + "description": "Cache deleted." }, "default": { "description": "Error response describing why the operation failed.", @@ -295,16 +295,16 @@ } }, "x-ms-examples": { - "Clusters_Delete": { - "$ref": "./examples/Clusters_Delete.json" + "Caches_Delete": { + "$ref": "./examples/Caches_Delete.json" } }, "x-ms-long-running-operation": true, "tags": [ - "Clusters" + "Caches" ], - "description": "Schedules a Cluster for deletion.", - "operationId": "Clusters_Delete" + "description": "Schedules a Cache for deletion.", + "operationId": "Caches_Delete" }, "get": { "produces": [ @@ -319,9 +319,9 @@ "type": "string" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -335,9 +335,9 @@ ], "responses": { "200": { - "description": "Returns the Cluster object corresponding to clusterId.", + "description": "Returns the Cache object corresponding to cacheId.", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" } }, "default": { @@ -348,15 +348,15 @@ } }, "x-ms-examples": { - "Clusters_Get": { - "$ref": "./examples/Clusters_Get.json" + "Caches_Get": { + "$ref": "./examples/Caches_Get.json" } }, "tags": [ - "Clusters" + "Caches" ], - "description": "Returns a Cluster.", - "operationId": "Clusters_Get" + "description": "Returns a Cache.", + "operationId": "Caches_Get" }, "put": { "consumes": [ @@ -380,33 +380,33 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" }, { - "description": "Object containing the user selectable properties of the new cluster. If read-only properties are included, they must match the existing values of those properties.", + "description": "Object containing the user selectable properties of the new cache. If read-only properties are included, they must match the existing values of those properties.", "in": "body", - "name": "cluster", + "name": "cache", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" } } ], "responses": { "200": { - "description": "Cluster created or already exists.", + "description": "Cache created or already exists.", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" } }, "201": { - "description": "Cluster creation has been initiated. Poll the new Cluster's provisioningState property to monitor creation progress.", + "description": "Cache creation has been initiated. Poll the new Cache's provisioningState property to monitor creation progress.", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" } }, "default": { @@ -417,16 +417,16 @@ } }, "x-ms-examples": { - "Clusters_Create": { - "$ref": "./examples/Clusters_Create.json" + "Caches_Create": { + "$ref": "./examples/Caches_Create.json" } }, "x-ms-long-running-operation": true, "tags": [ - "Clusters" + "Caches" ], - "description": "Create/update a Cluster instance.", - "operationId": "Clusters_Create" + "description": "Create/update a Cache instance.", + "operationId": "Caches_Create" }, "patch": { "consumes": [ @@ -450,27 +450,27 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" }, { - "description": "Object containing the user selectable properties of the new cluster. If read-only properties are included, they must match the existing values of those properties.", + "description": "Object containing the user selectable properties of the new cache. If read-only properties are included, they must match the existing values of those properties.", "in": "body", - "name": "cluster", + "name": "cache", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" } } ], "responses": { "200": { - "description": "Patched the Cluster.", + "description": "Patched the Cache.", "schema": { - "$ref": "#/definitions/Cluster" + "$ref": "#/definitions/Cache" } }, "default": { @@ -481,18 +481,18 @@ } }, "x-ms-examples": { - "Clusters_Update": { - "$ref": "./examples/Clusters_Update.json" + "Caches_Update": { + "$ref": "./examples/Caches_Update.json" } }, "tags": [ - "Clusters" + "Caches" ], - "description": "Update a Cluster instance.", - "operationId": "Clusters_Update" + "description": "Update a Cache instance.", + "operationId": "Caches_Update" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/flush": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/flush": { "post": { "produces": [ "application/json" @@ -512,9 +512,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -522,10 +522,10 @@ ], "responses": { "200": { - "description": "All cluster data is clean." + "description": "All cache data is clean." }, "202": { - "description": "Cluster has started flushing." + "description": "Cache has started flushing." }, "default": { "description": "Error response describing why the operation failed.", @@ -535,19 +535,19 @@ } }, "x-ms-examples": { - "Clusters_Flush": { - "$ref": "./examples/Clusters_Flush.json" + "Caches_Flush": { + "$ref": "./examples/Caches_Flush.json" } }, "x-ms-long-running-operation": true, "tags": [ - "Clusters" + "Caches" ], - "description": "Tells a cluster to write all dirty data to the StorageTarget(s). During the flush, clients will see errors returned until the flush is complete.", - "operationId": "Clusters_Flush" + "description": "Tells a cache to write all dirty data to the StorageTarget(s). During the flush, clients will see errors returned until the flush is complete.", + "operationId": "Caches_Flush" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/start": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/start": { "post": { "produces": [ "application/json" @@ -567,9 +567,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -577,10 +577,10 @@ ], "responses": { "200": { - "description": "Cluster is Active." + "description": "Cache is Active." }, "202": { - "description": "Cluster has started the transition to Active." + "description": "Cache has started the transition to Active." }, "default": { "description": "Error response describing why the operation failed.", @@ -590,19 +590,19 @@ } }, "x-ms-examples": { - "Clusters_Start": { - "$ref": "./examples/Clusters_Start.json" + "Caches_Start": { + "$ref": "./examples/Caches_Start.json" } }, "x-ms-long-running-operation": true, "tags": [ - "Clusters" + "Caches" ], - "description": "Tells a Stopped state cluster to transition to Active state.", - "operationId": "Clusters_Start" + "description": "Tells a Stopped state cache to transition to Active state.", + "operationId": "Caches_Start" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/stop": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/stop": { "post": { "produces": [ "application/json" @@ -622,9 +622,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -632,10 +632,10 @@ ], "responses": { "200": { - "description": "Cluster is stopped." + "description": "Cache is stopped." }, "202": { - "description": "Cluster has started the transition to Stopped." + "description": "Cache has started the transition to Stopped." }, "default": { "description": "Error response describing why the operation failed.", @@ -645,19 +645,19 @@ } }, "x-ms-examples": { - "Clusters_Stop": { - "$ref": "./examples/Clusters_Stop.json" + "Caches_Stop": { + "$ref": "./examples/Caches_Stop.json" } }, "x-ms-long-running-operation": true, "tags": [ - "Clusters" + "Caches" ], - "description": "Tells an Active cluster to transition to Stopped state.", - "operationId": "Clusters_Stop" + "description": "Tells an Active cache to transition to Stopped state.", + "operationId": "Caches_Stop" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storageTargets": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets": { "get": { "produces": [ "application/json" @@ -677,9 +677,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -687,7 +687,7 @@ ], "responses": { "200": { - "description": "Returns the list of storage targets defined by clusterId.", + "description": "Returns the list of storage targets defined by cacheId.", "schema": { "$ref": "#/definitions/StorageTargetsResult" } @@ -701,7 +701,7 @@ }, "x-ms-examples": { "StorageTargets_List": { - "$ref": "./examples/StorageTargets_ListByCluster.json" + "$ref": "./examples/StorageTargets_ListByCache.json" } }, "x-ms-pageable": { @@ -710,11 +710,11 @@ "tags": [ "StorageTargets" ], - "description": "Returns the StorageTargets for this cluster in the subscription and resource group.", - "operationId": "StorageTargets_ListByCluster" + "description": "Returns the StorageTargets for this cache in the subscription and resource group.", + "operationId": "StorageTargets_ListByCache" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/storageTargets/{storageTargetName}": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets/{storageTargetName}": { "delete": { "produces": [ "application/json" @@ -734,9 +734,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -776,7 +776,7 @@ "tags": [ "StorageTargets" ], - "description": "Removes a storage target from a cluster. This operation is allowed at any time, but if the cluster is down or unhealthy, the actual removal of the storage target may be delayed until the cluster is healthy again.", + "description": "Removes a storage target from a cache. This operation is allowed at any time, but if the cache is down or unhealthy, the actual removal of the storage target may be delayed until the cache is healthy again.", "operationId": "StorageTargets_Delete" }, "get": { @@ -798,9 +798,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -836,7 +836,7 @@ "tags": [ "StorageTargets" ], - "description": "Returns a storage target from a cluster.", + "description": "Returns a storage target from a cache.", "operationId": "StorageTargets_Get" }, "put": { @@ -861,9 +861,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -907,7 +907,7 @@ "tags": [ "StorageTargets" ], - "description": "Create/update a storage target. This operation is allowed at any time, but if the cluster is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cluster is healthy again.", + "description": "Create/update a storage target. This operation is allowed at any time, but if the cache is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cache is healthy again.", "operationId": "StorageTargets_Create" }, "patch": { @@ -932,9 +932,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -978,11 +978,11 @@ "tags": [ "StorageTargets" ], - "description": "Update a storage target. This operation is allowed at any time, but if the cluster is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cluster is healthy again.", + "description": "Update a storage target. This operation is allowed at any time, but if the cache is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cache is healthy again.", "operationId": "StorageTargets_Update" } }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/clusters/{clusterName}/upgrade": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/upgrade": { "post": { "produces": [ "application/json" @@ -1002,9 +1002,9 @@ "$ref": "#/parameters/SubscriptionIdParameter" }, { - "description": "Name of cluster.", + "description": "Name of cache.", "in": "path", - "name": "clusterName", + "name": "cacheName", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "required": true, "type": "string" @@ -1012,10 +1012,10 @@ ], "responses": { "201": { - "description": "Cluster firmware is up to date." + "description": "Cache firmware is up to date." }, "202": { - "description": "Cluster has started the upgrade." + "description": "Cache has started the upgrade." }, "default": { "description": "Error response describing why the operation failed.", @@ -1025,16 +1025,16 @@ } }, "x-ms-examples": { - "Clusters_UpgradeFirmware": { - "$ref": "./examples/Clusters_UpgradeFirmware.json" + "Caches_UpgradeFirmware": { + "$ref": "./examples/Caches_UpgradeFirmware.json" } }, "x-ms-long-running-operation": true, "tags": [ - "Clusters" + "Caches" ], - "description": "Tells a cluster to upgrade its firmware.", - "operationId": "Clusters_UpgradeFirmware" + "description": "Tells a cache to upgrade its firmware.", + "operationId": "Caches_UpgradeFirmware" } } }, @@ -1054,7 +1054,7 @@ "type": "string" }, "resource": { - "description": "Resource on which the operation is performed: cluster, etc.", + "description": "Resource on which the operation is performed: cache, etc.", "type": "string" } } @@ -1083,16 +1083,6 @@ }, "type": "object" }, - "ClfsTarget": { - "description": "Storage container for use as a CLFS StorageTarget.", - "properties": { - "target": { - "description": "URL of storage container.", - "$ref": "#/definitions/URLString" - } - }, - "type": "object" - }, "CloudError": { "description": "An error response.", "properties": { @@ -1128,15 +1118,15 @@ }, "type": "object" }, - "Cluster": { - "description": "An Avere cache instance. Follows Azure Resource Manager standards: https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md", + "Cache": { + "description": "A cache instance. Follows Azure Resource Manager standards: https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md", "properties": { "tags": { "description": "ARM tags as name/value pairs.", "type": "object" }, "id": { - "description": "Fully qualified URL of the cluster.", + "description": "Fully qualified URL of the cache.", "readOnly": true, "$ref": "#/definitions/URLString" }, @@ -1145,29 +1135,31 @@ "type": "string" }, "name": { - "description": "Name of cluster.", - "readOnly": true, + "description": "Name of cache.", + "readOnly": true, "$ref": "#/definitions/ResourceName" }, "type": { - "description": "Type for the cluster; Microsoft.StorageCache/Cluster", + "description": "Type for the cache; Microsoft.StorageCache/Cache", "readOnly": true, "type": "string" }, "properties": { "x-ms-client-flatten": true, - "description": "Properties for the cluster.", + "description": "Properties for the cache.", "properties": { "cacheSizeGB": { - "description": "The size of this cluster's cache, in GB.", + "description": "The size of this cache's cache, in GB.", "type": "integer" }, "health": { - "description": "Health of the cluster.", - "$ref": "#/definitions/ClusterHealth" + "description": "Health of the cache.", + "readOnly": true, + "$ref": "#/definitions/CacheHealth" }, "mountAddresses": { - "description": "Array of IP addresses that can be used by clients mounting this Cluster.", + "description": "Array of IP addresses that can be used by clients mounting this Cache.", + "readOnly": true, "items": { "type": "string" }, @@ -1183,24 +1175,28 @@ "Configuring", "Booting" ], + "x-ms-enum": { + "name": "ProvisioningStateType", + "modelAsString": true + }, "type": "string" }, "subnet": { - "description": "Subnet used for the cluster.", + "description": "Subnet used for the cache.", "$ref": "#/definitions/URLString" }, "upgradeStatus": { - "description": "Upgrade status of the cluster.", - "$ref": "#/definitions/ClusterUpgradeStatus" + "description": "Upgrade status of the cache.", + "$ref": "#/definitions/CacheUpgradeStatus" } }, "type": "object" }, "sku": { - "description": "Sku for the cluster.", + "description": "Sku for the cache.", "properties": { "name": { - "description": "Sku name for this cluster.", + "description": "Sku name for this cache.", "type": "string" } }, @@ -1210,11 +1206,11 @@ "x-ms-azure-resource": true, "type": "object" }, - "ClusterHealth": { - "description": "An indication of cluster health.", + "CacheHealth": { + "description": "An indication of cache health.", "properties": { "state": { - "description": "List of cluster health states.", + "description": "List of cache health states.", "enum": [ "healthy", "degraded", @@ -1227,8 +1223,8 @@ ], "x-ms-enum": { "name": "HealthStateType", - "modelAsString": false - }, + "modelAsString": true + }, "type": "string" }, "statusDescription": { @@ -1237,28 +1233,29 @@ } } }, - "ClusterUpgradeStatus": { - "description": "Properties describing the software upgrade state of the cluster", + "CacheUpgradeStatus": { + "description": "Properties describing the software upgrade state of the cache", "properties": { "currentFirmwareVersion": { - "description": "Version string of the firmware currently installed on this cluster.", - "type": "string" + "description": "Version string of the firmware currently installed on this cache.", + "type": "string", + "readOnly": true }, "firmwareUpdateStatus": { - "description": "True if there is a firmware update ready to install on this cluster. The firmware will automatically be installed after firmwareUpdateDeadline if not triggered earlier via the upgrade operation.", + "description": "True if there is a firmware update ready to install on this cache. The firmware will automatically be installed after firmwareUpdateDeadline if not triggered earlier via the upgrade operation.", "enum": [ "available", "unavailable" ], "x-ms-enum": { "name": "FirmwareStatusType", - "modelAsString": false + "modelAsString": true }, "readOnly": true, "type": "string" }, "firmwareUpdateDeadline": { - "description": "Time at which the pending firmware update will automatically be installed on the cluster.", + "description": "Time at which the pending firmware update will automatically be installed on the cache.", "format": "date-time", "type": "string", "readOnly": true @@ -1267,7 +1264,7 @@ "description": "Time of the last successful firmware update.", "format": "date-time", "type": "string", - "readOnly": true + "readOnly": true }, "pendingFirmwareVersion": { "description": "When firmwareUpdateAvailable is true, this field holds the version string for the update.", @@ -1277,6 +1274,13 @@ }, "type": "object" }, + "UnknownProperties": { + "description": "Properties of an unknown type of StorageTarget", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, "Nfs3Target": { "description": "An NFS mount point for use as a StorageTarget.", "properties": { @@ -1290,8 +1294,31 @@ "type": "string" } }, + "x-ms-discriminator-value": "nfs3", + "type": "object" + }, + "ClfsTarget": { + "description": "Storage container for use as a CLFS StorageTarget.", + "properties": { + "target": { + "description": "URL of storage container.", + "$ref": "#/definitions/URLString" + } + }, + "x-ms-discriminator-value": "clfs", "type": "object" }, + "UnknownTarget": { + "description": "Storage container for use as a Unknown StorageTarget.", + "properties": { + "unknownMap": { + "description": "Dictionary of string->string pairs containing information about the StorageTarget.", + "$ref": "#/definitions/UnknownProperties" + } + }, + "x-ms-discriminator-value": "unknown", + "type": "object" + }, "ResourceName": { "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate, this will contain the complete URL of the object. These names are case-preserving, but not case sensistive.", "pattern": "^[-0-9a-zA-Z_]{1,31}$", @@ -1353,10 +1380,10 @@ "type": "object" }, "ResourceSkusResult": { - "description": "A list of vFXT cluster Skus.", + "description": "A list of cache Skus.", "properties": { "nextLink": { - "description": "The uri to fetch the next page of vFXT Cluster Skus.", + "description": "The uri to fetch the next page of cache Skus.", "type": "string" }, "value": { @@ -1370,7 +1397,7 @@ "type": "object" }, "StorageTarget": { - "description": "A storage system being cached by a Cluster.", + "description": "A storage system being cached by a Cache.", "type": "object", "discriminator": "targetType", "properties": { @@ -1385,7 +1412,7 @@ "description": "Resource Id" }, "type": { - "description": "Type for the storage target; Microsoft.StorageCache/Cluster/StorageTarget", + "description": "Type for the storage target; Microsoft.StorageCache/Cache/StorageTarget", "readOnly": true, "type": "string" }, @@ -1394,21 +1421,23 @@ "description": "Properties of the storage target.", "type": "object", "properties": { - "path": { - "readOnly": true, - "type": "string", - "description": "Path to target in cluster namespace." - }, + "junctions": { + "description": "List of cache namespace to target namespace associations.", + "type": "array", + "items": { + "$ref": "#/definitions/NamespaceJunction" + } + }, "targetType": { "description": "Type for storage target.", - "readOnly": true, "enum": [ "nfs3", - "clfs" + "clfs", + "unknown" ], "x-ms-enum": { "name": "StorageTargetType", - "modelAsString": false + "modelAsString": true }, "type": "string" }, @@ -1419,12 +1448,30 @@ "clfs": { "description": "Properties when clfs target.", "$ref": "#/definitions/ClfsTarget" - } + }, + "unknown": { + "description": "Properties when unknown target.", + "$ref": "#/definitions/UnknownTarget" + } } } }, "x-ms-azure-resource": true }, + "NamespaceJunction": { + "description": "A namespace junction.", + "type": "object", + "properties": { + "namespacePath": { + "description": "Namespace path on a cache for a storage target.", + "type": "string" + }, + "targetPath": { + "description": "Path in storage target to which namespacePath points.", + "type": "string" + } + } + }, "StorageTargetsResult": { "description": "A list of storage targets.", "properties": { @@ -1433,7 +1480,7 @@ "type": "string" }, "value": { - "description": "The list of storage targets defined for the cluster.", + "description": "The list of storage targets defined for the cache.", "items": { "$ref": "#/definitions/StorageTarget" }, @@ -1451,13 +1498,7 @@ "properties": { "display": { "description": "Localized information describing this usage model.", - "properties": { - "description": { - "description": "Localized string describing this usage model", - "type": "string" - } - }, - "type": "object" + "type": "string" }, "name": { "description": "Non localized keyword naming this usage model.", @@ -1471,10 +1512,10 @@ "type": "object" }, "UsageModelsResult": { - "description": "A list of vFXT usage models.", + "description": "A list of cache usage models.", "properties": { "nextLink": { - "description": "The uri to fetch the next page of vFXT usage models.", + "description": "The uri to fetch the next page of cache usage models.", "type": "string" }, "value": { @@ -1488,47 +1529,6 @@ "type": "object" } }, - "x-components": { - "parameters": { - "ApiVersionParameter": { - "description": "The API version to use for this operation.", - "in": "query", - "name": "api-version", - "required": true, - "type": "string" - }, - "ClusterNameParameter": { - "description": "Name of cluster.", - "in": "path", - "name": "clusterName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - "ResourceGroupNameParameter": { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - "StorageTargetNameParameter": { - "description": "Name of storage target.", - "in": "path", - "name": "storageTargetName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - "SubscriptionIdParameter": { - "description": "Target subscription ID.", - "in": "path", - "name": "subscriptionId", - "required": true, - "type": "string" - } - } - }, "parameters": { "SubscriptionIdParameter": { "name": "subscriptionId", From 584a2f3ff0d8a9c607345dd6f0179bed073feb3c Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 5 Mar 2019 13:49:24 -0500 Subject: [PATCH 07/35] fix typo in databox json --- .../Microsoft.DataBox/stable/2018-01-01/databox.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json index 855d840b839b..9545d1d9b568 100644 --- a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json +++ b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json @@ -97,7 +97,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.DataBox/locationPs/{location}/availableSkus": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DataBox/locations/{location}/availableSkus": { "post": { "tags": [ "Service" From 53f78e1a9629148774bc74e37244874e1bfdba91 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 12 Mar 2019 10:30:34 -0700 Subject: [PATCH 08/35] added python generation file --- .../resource-manager/readme.python.md | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 specification/storagecache/resource-manager/readme.python.md diff --git a/specification/storagecache/resource-manager/readme.python.md b/specification/storagecache/resource-manager/readme.python.md new file mode 100644 index 000000000000..15f507a40093 --- /dev/null +++ b/specification/storagecache/resource-manager/readme.python.md @@ -0,0 +1,27 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. +Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. + +``` yaml $(python) +python-mode: create +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: azure.mgmt.storagecache + package-name: azure-mgmt-storagecache + package-version: 2.0.0 + clear-output-folder: true +``` +``` yaml $(python) && $(python-mode) == 'update' +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/azure-mgmt-storagecache/azure/mgmt/storagecache +``` +``` yaml $(python) && $(python-mode) == 'create' +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/azure-mgmt-storagecache +``` From 2a82dfb4868d5ee607b81622c8269908b39c6d25 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 12 Mar 2019 13:56:26 -0700 Subject: [PATCH 09/35] add swagger to sdk section --- .../storagecache/resource-manager/readme.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md index c919ab776a19..23638b922f3c 100644 --- a/specification/storagecache/resource-manager/readme.md +++ b/specification/storagecache/resource-manager/readme.md @@ -39,4 +39,19 @@ input-file: - Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json ``` +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +``` yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-python + after_scripts: + - bundle install && rake arm:regen_all_profiles['azure_mgmt_storagecache'] +``` + +## Python + +See configuration in [readme.python.md](./readme.python.md) From 5e486d0989f1631534c7aee395a877c7acf521e2 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 19 Mar 2019 21:51:32 -0400 Subject: [PATCH 10/35] fix readme file for python generation --- specification/storagecache/resource-manager/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md index 23638b922f3c..ce474e6b9671 100644 --- a/specification/storagecache/resource-manager/readme.md +++ b/specification/storagecache/resource-manager/readme.md @@ -47,8 +47,6 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-python - after_scripts: - - bundle install && rake arm:regen_all_profiles['azure_mgmt_storagecache'] ``` ## Python From e52b0c5da6fce38c7d4eb5448f0aad91a8ef7568 Mon Sep 17 00:00:00 2001 From: Matt White Date: Fri, 12 Apr 2019 16:17:51 -0400 Subject: [PATCH 11/35] * add provisioning state to storage targets * add some provisioning states for cache * update a few doc strings * make usagemodel display an object instead of string --- .../examples/UsageModels_List.json | 24 ++++++++----- .../2019-06-01-preview/storagecache.json | 36 +++++++++++++++---- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json index c8e8bc89adc5..b2ca1d148628 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json @@ -8,19 +8,25 @@ "body": { "value": [ { - "name": "READ_HEAVY_INFREQ", - "type": "nfs3", - "display": "read heavy, infrequent changes" + "modelName": "READ_HEAVY_INFREQ", + "targetType": "nfs3", + "display": { + "display": "read heavy, infrequent changes" + } }, { - "name": "READ_HEAVY_FREQ", - "type": "nfs3", - "display": "read heavy, frequent changes" + "modelName": "READ_HEAVY_FREQ", + "targetType": "nfs3", + "display": { + "display": "read heavy, frequent changes" + } }, { - "name": "WRITE_WORKLOAD_15", - "type": "nfs3", - "display": "write workload > 15%" + "modelName": "WRITE_WORKLOAD_15", + "targetType": "nfs3", + "display": { + "display": "write workload > 15%" + } } ] } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index ffae145f2e5d..b4a223bd8cae 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -1166,14 +1166,17 @@ "type": "array" }, "provisioningState": { - "description": "see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", + "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", "enum":[ "Succeeded", "Failed", "Cancelled", "Creating", "Configuring", - "Booting" + "Booting", + "Deleting", + "Stopping", + "Upgrading" ], "x-ms-enum": { "name": "ProvisioningStateType", @@ -1207,7 +1210,7 @@ "type": "object" }, "CacheHealth": { - "description": "An indication of cache health.", + "description": "An indication of cache health. Gives more information about health than just that related to provisioning.", "properties": { "state": { "description": "List of cache health states.", @@ -1441,6 +1444,21 @@ }, "type": "string" }, + "provisioningState": { + "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", + "enum":[ + "Succeeded", + "Failed", + "Cancelled", + "Creating", + "Deleting" + ], + "x-ms-enum": { + "name": "ProvisioningStateType", + "modelAsString": true + }, + "type": "string" + }, "nfs3": { "description": "Properties when nfs3 target.", "$ref": "#/definitions/Nfs3Target" @@ -1498,13 +1516,19 @@ "properties": { "display": { "description": "Localized information describing this usage model.", - "type": "string" + "type": "object", + "properties": { + "display": { + "description": "String to display for this usage model.", + "type": "string" + } + } }, - "name": { + "modelName": { "description": "Non localized keyword naming this usage model.", "type": "string" }, - "type": { + "targetType": { "description": "The type of Storage Target to which this model is applicable (only nfs for now)", "type": "string" } From 103689953d168f0d5b8d9dd400564108ca46560c Mon Sep 17 00:00:00 2001 From: Matt White Date: Fri, 12 Apr 2019 17:33:45 -0400 Subject: [PATCH 12/35] fix capitalization and provisioning states --- .../2019-06-01-preview/examples/UsageModels_List.json | 6 +++--- .../preview/2019-06-01-preview/storagecache.json | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json index b2ca1d148628..52ca57c8094b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json @@ -11,21 +11,21 @@ "modelName": "READ_HEAVY_INFREQ", "targetType": "nfs3", "display": { - "display": "read heavy, infrequent changes" + "description": "Read heavy, infrequent changes" } }, { "modelName": "READ_HEAVY_FREQ", "targetType": "nfs3", "display": { - "display": "read heavy, frequent changes" + "description": "Read heavy, frequent changes" } }, { "modelName": "WRITE_WORKLOAD_15", "targetType": "nfs3", "display": { - "display": "write workload > 15%" + "description": "Write workload > 15%" } } ] diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index b4a223bd8cae..11babdca7541 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -1172,11 +1172,8 @@ "Failed", "Cancelled", "Creating", - "Configuring", - "Booting", "Deleting", - "Stopping", - "Upgrading" + "Updating" ], "x-ms-enum": { "name": "ProvisioningStateType", @@ -1451,7 +1448,8 @@ "Failed", "Cancelled", "Creating", - "Deleting" + "Deleting", + "Updating" ], "x-ms-enum": { "name": "ProvisioningStateType", @@ -1518,7 +1516,7 @@ "description": "Localized information describing this usage model.", "type": "object", "properties": { - "display": { + "description": { "description": "String to display for this usage model.", "type": "string" } From ac398a5e128e38e96fe819ff8329105005cee11f Mon Sep 17 00:00:00 2001 From: Matt White Date: Mon, 15 Apr 2019 12:24:38 -0400 Subject: [PATCH 13/35] capitalize states for consistency, add Unknown --- .../examples/Caches_Create.json | 4 ++-- .../2019-06-01-preview/examples/Caches_Get.json | 2 +- .../examples/Caches_List.json | 4 ++-- .../examples/Caches_ListByResourceGroup.json | 4 ++-- .../examples/Caches_Update.json | 2 +- .../2019-06-01-preview/storagecache.json | 17 +++++++++-------- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json index a8b4d81d66d2..dfd6b9a1b5a3 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json @@ -31,7 +31,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ @@ -65,7 +65,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json index e236973ad02c..250c0810614c 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json @@ -18,7 +18,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json index 0ae70da6156c..dde0eaa7e4bd 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json @@ -17,7 +17,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ @@ -49,7 +49,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json index bc78d0c2bff2..c69928f0455b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json @@ -18,7 +18,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ @@ -50,7 +50,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json index 0c62f53e5fa7..816cc9163162 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json @@ -31,7 +31,7 @@ "properties": { "cacheSizeGB": 3072, "health": { - "state": "transitioning", + "state": "Transitioning", "statusDescription": "Cache is being created." }, "mountAddresses": [ diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index 11babdca7541..5efac05fc6d5 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -1212,14 +1212,15 @@ "state": { "description": "List of cache health states.", "enum": [ - "healthy", - "degraded", - "down", - "transitioning", - "stopping", - "stopped", - "upgrading", - "flushing" + "Unknown", + "Healthy", + "Degraded", + "Down", + "Transitioning", + "Stopping", + "Stopped", + "Upgrading", + "Flushing" ], "x-ms-enum": { "name": "HealthStateType", From dd511a8e2b4d9209ba770b51158bf9ddb65e3b6a Mon Sep 17 00:00:00 2001 From: Matt White Date: Sun, 5 May 2019 17:47:52 -0400 Subject: [PATCH 14/35] update skus and make cache list a real paged list instead of an array --- .../examples/Caches_Create.json | 6 +- .../examples/Caches_Get.json | 2 +- .../examples/Caches_List.json | 124 +++++++++--------- .../examples/Caches_ListByResourceGroup.json | 122 ++++++++--------- .../examples/Caches_Update.json | 4 +- .../examples/Skus_List.json | 8 +- .../2019-06-01-preview/storagecache.json | 35 +++-- 7 files changed, 161 insertions(+), 140 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json index dfd6b9a1b5a3..fd6f75190409 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json @@ -14,7 +14,7 @@ "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" }, "sku": { - "name": "A123" + "name": "Standard_2G" } } }, @@ -49,7 +49,7 @@ } }, "sku": { - "name": "A123" + "name": "Standard_2G" } } }, @@ -83,7 +83,7 @@ } }, "sku": { - "name": "A123" + "name": "Standard_2G" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json index 250c0810614c..d4c4fe5b582c 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json @@ -36,7 +36,7 @@ } }, "sku": { - "name": "A123" + "name": "Standard_2G" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json index dde0eaa7e4bd..afe95c78326c 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json @@ -5,72 +5,74 @@ }, "responses": { "200": { - "body": [ - { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." + "body": { + "value": [ + { + "tags": { + "Dept": "Initech" }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" } - }, - "sku": { - "name": "A123" - } - }, - { - "tags": { - "Dept": "Intertrode" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", - "location": "westus", - "name": "sc2", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." + }, + { + "tags": { + "Dept": "Intertrode" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", + "location": "westus", + "name": "sc2", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Configuring", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Configuring", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" + "sku": { + "name": "Standard_2G" } - }, - "sku": { - "name": "A123" } - } - ] + ] + } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json index c69928f0455b..7fec2c503b4f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json @@ -6,72 +6,74 @@ }, "responses": { "200": { - "body": [ - { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." + "body": { + "value": [ + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" + "sku": { + "name": "Standard_2G" } }, - "sku": { - "name": "A123" - } - }, - { - "tags": { - "Dept": "Intertrode" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", - "location": "westus", - "name": "sc2", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." + { + "tags": { + "Dept": "Intertrode" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", + "location": "westus", + "name": "sc2", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" + "sku": { + "name": "Standard_2G" } - }, - "sku": { - "name": "A123" } - } - ] + ] + } } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json index 816cc9163162..c033a2863864 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json @@ -14,7 +14,7 @@ "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" }, "sku": { - "name": "A123" + "name": "Standard_2G" } } }, @@ -49,7 +49,7 @@ } }, "sku": { - "name": "A123" + "name": "Standard_2G" } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json index 4111ae48a420..d3373f25c98d 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -27,7 +27,7 @@ "location": "eastus" } ], - "name": "A123" + "name": "Standard_2G" }, { "cacheSizesGB": [ @@ -49,7 +49,7 @@ "location": "eastus" } ], - "name": "A124" + "name": "Standard_4G" }, { "cacheSizesGB": [ @@ -60,7 +60,7 @@ "capabilities": [ { "name": "thoughput GB/s", - "value": "8" + "value": "9" } ], "locations": [ @@ -71,7 +71,7 @@ "location": "eastus" } ], - "name": "A125" + "name": "Standard_9G" } ] } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index 5efac05fc6d5..db850d02616f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "description": "A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage caches.", - "title": "Microsoft.StorageCache resource provider.", + "title": "Storage Cache Mgmt Client", "version": "2019-06-01-preview" }, "host": "management.azure.com", @@ -175,10 +175,7 @@ "200": { "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", "schema": { - "items": { - "$ref": "#/definitions/Cache" - }, - "type": "array" + "$ref": "#/definitions/CachesListResult" } }, "default": { @@ -188,6 +185,9 @@ } } }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, "x-ms-examples": { "Caches_List": { "$ref": "./examples/Caches_List.json" @@ -224,10 +224,7 @@ "200": { "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", "schema": { - "items": { - "$ref": "#/definitions/Cache" - }, - "type": "array" + "$ref": "#/definitions/CachesListResult" } }, "default": { @@ -242,6 +239,9 @@ "$ref": "./examples/Caches_ListByResourceGroup.json" } }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, "tags": [ "Caches" ], @@ -1206,6 +1206,23 @@ "x-ms-azure-resource": true, "type": "object" }, + "CachesListResult": { + "description": "Result of the request to list caches. It contains a list of caches and a URL link to get the next set of results.", + "properties": { + "nextLink": { + "description": "URL to get the next set of cache list results if there are any.", + "type": "string" + }, + "value": { + "description": "List of caches.", + "items": { + "$ref": "#/definitions/Cache" + }, + "type": "array" + } + }, + "type": "object" + }, "CacheHealth": { "description": "An indication of cache health. Gives more information about health than just that related to provisioning.", "properties": { From 83d2836319d6053452c42de1d0539c3328636d19 Mon Sep 17 00:00:00 2001 From: Matt White Date: Mon, 6 May 2019 08:10:12 -0400 Subject: [PATCH 15/35] fix large sku to be 8G --- .../preview/2019-06-01-preview/examples/Skus_List.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json index d3373f25c98d..c8aa5c5d9a75 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -60,7 +60,7 @@ "capabilities": [ { "name": "thoughput GB/s", - "value": "9" + "value": "8" } ], "locations": [ @@ -71,7 +71,7 @@ "location": "eastus" } ], - "name": "Standard_9G" + "name": "Standard_8G" } ] } From c2c1eb90a058c3af6566be750fcb480901cf154a Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 16 May 2019 12:30:29 -0400 Subject: [PATCH 16/35] Update sku models to match ARM, minor change to usage model --- .../examples/Skus_List.json | 88 ++++++++++--------- .../examples/UsageModels_List.json | 4 +- .../2019-06-01-preview/storagecache.json | 68 ++++++++++++-- 3 files changed, 108 insertions(+), 52 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json index c8aa5c5d9a75..8f7959d76041 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json @@ -8,73 +8,79 @@ "body": { "value": [ { - "cacheSizesGB": [ - 3072, - 6144, - 12288 + "resourceType": "caches", + "name": "Standard_2G", + "locations": [ + "East US" + ], + "locationInfo": [ + { + "location": "East US", + "zones": [] + } ], "capabilities": [ { "name": "throughput GB/s", "value": "2" + }, + { + "name": "cache sizes(GB)", + "value": "3072,6144,12288" } ], - "locations": [ - { - "location": "westus" - }, - { - "location": "eastus" - } - ], - "name": "Standard_2G" + "restrictions": [] }, { - "cacheSizesGB": [ - 6144, - 12288, - 24576 + "resourceType": "caches", + "name": "Standard_4G", + "locations": [ + "East US" + ], + "locationInfo": [ + { + "location": "East US", + "zones": [] + } ], "capabilities": [ { "name": "throughput GB/s", "value": "4" + }, + { + "name": "cache sizes(GB)", + "value": "6144,12288,24576" } ], - "locations": [ - { - "location": "westus" - }, - { - "location": "eastus" - } - ], - "name": "Standard_4G" + "restrictions": [] }, { - "cacheSizesGB": [ - 12288, - 24576, - 49152 + "resourceType": "caches", + "name": "Standard_8G", + "locations": [ + "East US" + ], + "locationInfo": [ + { + "location": "East US", + "zones": [] + } ], "capabilities": [ { - "name": "thoughput GB/s", + "name": "throughput GB/s", "value": "8" + }, + { + "name": "cache sizes(GB)", + "value": "12288,24576,49152" } ], - "locations": [ - { - "location": "westus" - }, - { - "location": "eastus" - } - ], - "name": "Standard_8G" + "restrictions": [] } ] } } } -} +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json index 52ca57c8094b..db1c820d6904 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json @@ -15,10 +15,10 @@ } }, { - "modelName": "READ_HEAVY_FREQ", + "modelName": "WRITE_AROUND", "targetType": "nfs3", "display": { - "description": "Read heavy, frequent changes" + "description": "Clients write directly to storage" } }, { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index db850d02616f..8b9ea46299ab 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -1345,12 +1345,10 @@ "ResourceSku": { "description": "A resource SKU", "properties": { - "cacheSizesGB": { - "description": "A list of cache sizes that are valid for this Sku (in GB)", - "items": { - "type": "integer" - }, - "type": "array" + "resourceType": { + "readOnly": true, + "type": "string", + "description": "The type of resource the sku applies to." }, "capabilities": { "description": "A list of capabilities of this SKU, such as throughput or ops/sec", @@ -1360,6 +1358,14 @@ "type": "array" }, "locations": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "The set of locations that the SKU is available. This will be supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.)." + }, + "locationInfo": { "description": "The set of locations that the SKU is available.", "items": { "$ref": "#/definitions/ResourceSkuLocationInfo" @@ -1369,10 +1375,47 @@ "name": { "description": "The name of this sku.", "type": "string" + }, + "restrictions": { + "type": "array", + "items": { + "$ref": "#/definitions/Restriction" + }, + "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions." } }, "type": "object" }, + "Restriction": { + "properties": { + "type": { + "readOnly": true, + "type": "string", + "description": "The type of restrictions. As of now only possible value for this is location." + }, + "values": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted." + }, + "reasonCode": { + "type": "string", + "enum": [ + "QuotaId", + "NotAvailableForSubscription" + ], + "x-ms-enum": { + "name": "ReasonCode", + "modelAsString": true + }, + "description": "The reason for the restriction. As of now this can be \"QuotaId\" or \"NotAvailableForSubscription\". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that quota. The \"NotAvailableForSubscription\" is related to capacity at DC." + } + }, + "description": "The restriction because of which SKU cannot be used." + }, "ResourceSkuCapabilities": { "description": "A resource SKU capability.", "properties": { @@ -1393,12 +1436,19 @@ "location": { "description": "Location where this Sku is available", "type": "string" + }, + "zones": { + "description": "Zones if any.", + "type": "array", + "items": { + "type": "string" + } } }, "type": "object" }, "ResourceSkusResult": { - "description": "A list of cache Skus.", + "description": "The response from the List Cache SKUs operation.", "properties": { "nextLink": { "description": "The uri to fetch the next page of cache Skus.", @@ -1406,13 +1456,13 @@ }, "value": { "description": "The list of skus available for the subscription.", + "readOnly": true, "items": { "$ref": "#/definitions/ResourceSku" }, "type": "array" } - }, - "type": "object" + } }, "StorageTarget": { "description": "A storage system being cached by a Cache.", From 8c3b2f324b8c3c4ffb282ac5570f7d80727bbe89 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Thu, 30 May 2019 12:51:17 -0700 Subject: [PATCH 17/35] Update readme.python.md --- .../storagecache/resource-manager/readme.python.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/storagecache/resource-manager/readme.python.md b/specification/storagecache/resource-manager/readme.python.md index 15f507a40093..5e7e96a9a90a 100644 --- a/specification/storagecache/resource-manager/readme.python.md +++ b/specification/storagecache/resource-manager/readme.python.md @@ -12,16 +12,16 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.storagecache package-name: azure-mgmt-storagecache - package-version: 2.0.0 + package-version: 0.1.0 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt-storagecache/azure/mgmt/storagecache + output-folder: $(python-sdks-folder)/storage/azure-mgmt-storagecache/azure/mgmt/storagecache ``` ``` yaml $(python) && $(python-mode) == 'create' python: basic-setup-py: true - output-folder: $(python-sdks-folder)/azure-mgmt-storagecache + output-folder: $(python-sdks-folder)/storage/azure-mgmt-storagecache ``` From e89cc039de4cf2b98cc354d6d938765993f9346a Mon Sep 17 00:00:00 2001 From: Matt White Date: Mon, 10 Jun 2019 21:59:32 -0400 Subject: [PATCH 18/35] add 201 return code for storagetarget put --- .../examples/StorageTargets_Create.json | 26 ++++++++++++++++++- .../2019-06-01-preview/storagecache.json | 6 +++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json index 11ad8a6616d3..991d7e5f9a1b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json @@ -49,6 +49,30 @@ } } } - } + }, + "201": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_INFREQ" + } + } + } + } } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index 8b9ea46299ab..b8be6f3579b5 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -892,6 +892,12 @@ "$ref": "#/definitions/StorageTarget" } }, + "201": { + "description": "Storage Target creation has been initiated. Poll the new Storage Target's provisioningState property to monitor creation progress.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { From d65b7d7a0b0cee9b0b7116fa2172e73c899f9ddf Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 11 Jun 2019 20:19:23 -0400 Subject: [PATCH 19/35] add long running op --- .../preview/2019-06-01-preview/storagecache.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index b8be6f3579b5..89a86def93c0 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -909,7 +909,8 @@ "StorageTargets_Create": { "$ref": "./examples/StorageTargets_Create.json" } - }, + }, + "x-ms-long-running-operation": true, "tags": [ "StorageTargets" ], From 90d5c0d6e118b4f83056626506f80030300a89ae Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 30 Jul 2019 17:47:40 -0400 Subject: [PATCH 20/35] initial commit for new 2019-08-01-preview version --- .../examples/Caches_Create.json | 91 + .../examples/Caches_Delete.json | 19 + .../examples/Caches_Flush.json | 16 + .../examples/Caches_Get.json | 44 + .../examples/Caches_List.json | 78 + .../examples/Caches_ListByResourceGroup.json | 79 + .../examples/Caches_Start.json | 16 + .../examples/Caches_Stop.json | 16 + .../examples/Caches_Update.json | 57 + .../examples/Caches_UpgradeFirmware.json | 16 + .../examples/Operations_List.json | 35 + .../examples/Skus_List.json | 86 + .../examples/StorageTargets_Create.json | 78 + .../examples/StorageTargets_Delete.json | 20 + .../examples/StorageTargets_Get.json | 35 + .../examples/StorageTargets_ListByCache.json | 75 + .../examples/StorageTargets_Update.json | 54 + .../examples/UsageModels_List.json | 35 + .../2019-08-01-preview/storagecache.json | 1645 +++++++++++++++++ 19 files changed, 2495 insertions(+) create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json create mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json new file mode 100644 index 000000000000..fd6f75190409 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json @@ -0,0 +1,91 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cache": { + "tags": { + "Dept": "Initech" + }, + "location": "westus", + "properties": { + "cacheSizeGB": 3072, + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" + }, + "sku": { + "name": "Standard_2G" + } + } + }, + "responses": { + "201": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + } + }, + "200": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json new file mode 100644 index 000000000000..61b62221c5f6 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + }, + "204": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json new file mode 100644 index 000000000000..894e9fb597ee --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json new file mode 100644 index 000000000000..d4c4fe5b582c --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json new file mode 100644 index 000000000000..afe95c78326c --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json @@ -0,0 +1,78 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + }, + { + "tags": { + "Dept": "Intertrode" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", + "location": "westus", + "name": "sc2", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Configuring", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + } + ] + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json new file mode 100644 index 000000000000..7fec2c503b4f --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json @@ -0,0 +1,79 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + }, + { + "tags": { + "Dept": "Intertrode" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", + "location": "westus", + "name": "sc2", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + } + ] + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json new file mode 100644 index 000000000000..894e9fb597ee --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json new file mode 100644 index 000000000000..894e9fb597ee --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json new file mode 100644 index 000000000000..c033a2863864 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json @@ -0,0 +1,57 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cache": { + "tags": { + "Dept": "Initech" + }, + "location": "westus", + "properties": { + "cacheSizeGB": 3072, + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" + }, + "sku": { + "name": "Standard_2G" + } + } + }, + "responses": { + "200": { + "body": { + "tags": { + "Dept": "Initech" + }, + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", + "location": "westus", + "name": "sc1", + "type": "Microsoft.StorageCache/Cache", + "properties": { + "cacheSizeGB": 3072, + "health": { + "state": "Transitioning", + "statusDescription": "Cache is being created." + }, + "mountAddresses": [ + "192.168.1.1", + "192.168.1.2" + ], + "provisioningState": "Booting", + "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", + "upgradeStatus": { + "currentFirmwareVersion": "AvereOS V5.1.1.2", + "firmwareUpdateStatus": "available", + "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", + "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", + "pendingFirmwareVersion": "AvereOS V5.1.1.32" + } + }, + "sku": { + "name": "Standard_2G" + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json new file mode 100644 index 000000000000..1d47e8d2d59f --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "cacheName": "sc1", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "201": { + "body": "" + }, + "202": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json new file mode 100644 index 000000000000..74230507d1eb --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "api-version": "2019-06-01-preview", + "x-ms-client-request-id": [ + "7e655b68-e491-4cb6-90c3-6a5b10b7bd17" + ], + "accept-language": [ + "en-US" + ] + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.StorageCache/caches/write", + "display": { + "operation": "Create or Update Cache", + "provider": "Azure Storage Cache", + "resource": "Caches" + } + }, + { + "name": "Microsoft.StorageCache/caches/delete", + "display": { + "operation": "Delete Cache", + "provider": "Azure Storage Cache", + "resource": "Caches" + } + } + ] + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json new file mode 100644 index 000000000000..8f7959d76041 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json @@ -0,0 +1,86 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "caches", + "name": "Standard_2G", + "locations": [ + "East US" + ], + "locationInfo": [ + { + "location": "East US", + "zones": [] + } + ], + "capabilities": [ + { + "name": "throughput GB/s", + "value": "2" + }, + { + "name": "cache sizes(GB)", + "value": "3072,6144,12288" + } + ], + "restrictions": [] + }, + { + "resourceType": "caches", + "name": "Standard_4G", + "locations": [ + "East US" + ], + "locationInfo": [ + { + "location": "East US", + "zones": [] + } + ], + "capabilities": [ + { + "name": "throughput GB/s", + "value": "4" + }, + { + "name": "cache sizes(GB)", + "value": "6144,12288,24576" + } + ], + "restrictions": [] + }, + { + "resourceType": "caches", + "name": "Standard_8G", + "locations": [ + "East US" + ], + "locationInfo": [ + { + "location": "East US", + "zones": [] + } + ], + "capabilities": [ + { + "name": "throughput GB/s", + "value": "8" + }, + { + "name": "cache sizes(GB)", + "value": "12288,24576,49152" + } + ], + "restrictions": [] + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json new file mode 100644 index 000000000000..991d7e5f9a1b --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json @@ -0,0 +1,78 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cacheName": "sc1", + "storageTargetName": "st1", + "storagetarget": { + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_INFREQ" + } + } + } + }, + "responses": { + "200": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_INFREQ" + } + } + } + }, + "201": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_INFREQ" + } + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json new file mode 100644 index 000000000000..5924a627852e --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cacheName": "sc1", + "storageTargetName": "st1" + }, + "responses": { + "200": { + "body": "" + }, + "202": { + "body": "" + }, + "204": { + "body": "" + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json new file mode 100644 index 000000000000..bafb12a96510 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cacheName": "sc1", + "storageTargetName": "st1" + }, + "responses": { + "200": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_FREQ" + } + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json new file mode 100644 index 000000000000..43e40aa735f7 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json @@ -0,0 +1,75 @@ + { + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cacheName": "sc1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_FREQ" + } + } + }, + { + "name": "st2", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st2", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/some/crazy/place/on/cache", + "targetPath": "/" + } + ], + "targetType": "clfs", + "clfs": { + "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" + } + } + }, + { + "name": "st3", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st3", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/some/crazier/place/on/cache", + "targetPath": "/" + } + ], + "targetType": "unknown", + "unknown": { + "unknownMap": { + "foo": "bar", + "foo2": "test" + } + } + } + } + ] + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json new file mode 100644 index 000000000000..6639d3163925 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "resourceGroupName": "scgroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview", + "cacheName": "sc1", + "storageTargetName": "st1", + "storagetarget": { + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_FREQ" + } + } + } + }, + "responses": { + "200": { + "body": { + "name": "st1", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", + "type": "Microsoft.StorageCache/Cache/StorageTarget", + "properties": { + "junctions": [ + { + "namespacePath": "/path/on/cache", + "targetPath": "/path/on/storagetarget" + }, + { + "namespacePath": "/path2/on/cache", + "targetPath": "/path2/on/storagetarget" + } + ], + "targetType": "nfs3", + "nfs3": { + "target": "10.0.44.44:/exp1", + "usageModel": "READ_HEAVY_FREQ" + } + } + } + } + } +} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json new file mode 100644 index 000000000000..db1c820d6904 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "modelName": "READ_HEAVY_INFREQ", + "targetType": "nfs3", + "display": { + "description": "Read heavy, infrequent changes" + } + }, + { + "modelName": "WRITE_AROUND", + "targetType": "nfs3", + "display": { + "description": "Clients write directly to storage" + } + }, + { + "modelName": "WRITE_WORKLOAD_15", + "targetType": "nfs3", + "display": { + "description": "Write workload > 15%" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json new file mode 100644 index 000000000000..89a86def93c0 --- /dev/null +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json @@ -0,0 +1,1645 @@ +{ + "swagger": "2.0", + "info": { + "description": "A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage caches.", + "title": "Storage Cache Mgmt Client", + "version": "2019-06-01-preview" + }, + "host": "management.azure.com", + "basePath": "/", + "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" + } + } + }, + "paths": { + "/providers/Microsoft.StorageCache/operations": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/ApiOperationListResult" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "tags": [ + "Operations" + ], + "description": "Lists all of the available RP operations.", + "x-ms-examples": { + "StorageTargets_List": { + "$ref": "./examples/Operations_List.json" + } + }, + "operationId": "Operations_List", + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/skus": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "A list of SKU descriptors.", + "schema": { + "$ref": "#/definitions/ResourceSkusResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Skus_List": { + "$ref": "./examples/Skus_List.json" + } + }, + "tags": [ + "SKUs" + ], + "description": "Get the list of StorageCache.Cache SKUs available to this subscription.", + "operationId": "Skus_List" + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/usageModels": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "A list of UsageModel descriptors.", + "schema": { + "$ref": "#/definitions/UsageModelsResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "UsageModels_List": { + "$ref": "./examples/UsageModels_List.json" + } + }, + "tags": [ + "UsageModels" + ], + "description": "Get the list of cache Usage Models available to this subscription.", + "operationId": "UsageModels_List" + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/caches": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", + "schema": { + "$ref": "#/definitions/CachesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Caches_List": { + "$ref": "./examples/Caches_List.json" + } + }, + "tags": [ + "Caches" + ], + "description": "Returns all Caches the user has access to under a subscription.", + "operationId": "Caches_List" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", + "schema": { + "$ref": "#/definitions/CachesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_ListByResourceGroup": { + "$ref": "./examples/Caches_ListByResourceGroup.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "tags": [ + "Caches" + ], + "description": "Returns all Caches the user has access to under a resource group and subscription.", + "operationId": "Caches_ListByResourceGroup" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}": { + "delete": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Cache deleted." + }, + "202": { + "description": "Started the Cache's transition to Deleted state." + }, + "204": { + "description": "Cache deleted." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Delete": { + "$ref": "./examples/Caches_Delete.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Caches" + ], + "description": "Schedules a Cache for deletion.", + "operationId": "Caches_Delete" + }, + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Returns the Cache object corresponding to cacheId.", + "schema": { + "$ref": "#/definitions/Cache" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Get": { + "$ref": "./examples/Caches_Get.json" + } + }, + "tags": [ + "Caches" + ], + "description": "Returns a Cache.", + "operationId": "Caches_Get" + }, + "put": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the user selectable properties of the new cache. If read-only properties are included, they must match the existing values of those properties.", + "in": "body", + "name": "cache", + "schema": { + "$ref": "#/definitions/Cache" + } + } + ], + "responses": { + "200": { + "description": "Cache created or already exists.", + "schema": { + "$ref": "#/definitions/Cache" + } + }, + "201": { + "description": "Cache creation has been initiated. Poll the new Cache's provisioningState property to monitor creation progress.", + "schema": { + "$ref": "#/definitions/Cache" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Create": { + "$ref": "./examples/Caches_Create.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Caches" + ], + "description": "Create/update a Cache instance.", + "operationId": "Caches_Create" + }, + "patch": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the user selectable properties of the new cache. If read-only properties are included, they must match the existing values of those properties.", + "in": "body", + "name": "cache", + "schema": { + "$ref": "#/definitions/Cache" + } + } + ], + "responses": { + "200": { + "description": "Patched the Cache.", + "schema": { + "$ref": "#/definitions/Cache" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Update": { + "$ref": "./examples/Caches_Update.json" + } + }, + "tags": [ + "Caches" + ], + "description": "Update a Cache instance.", + "operationId": "Caches_Update" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/flush": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "All cache data is clean." + }, + "202": { + "description": "Cache has started flushing." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Flush": { + "$ref": "./examples/Caches_Flush.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Caches" + ], + "description": "Tells a cache to write all dirty data to the StorageTarget(s). During the flush, clients will see errors returned until the flush is complete.", + "operationId": "Caches_Flush" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/start": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Cache is Active." + }, + "202": { + "description": "Cache has started the transition to Active." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Start": { + "$ref": "./examples/Caches_Start.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Caches" + ], + "description": "Tells a Stopped state cache to transition to Active state.", + "operationId": "Caches_Start" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/stop": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Cache is stopped." + }, + "202": { + "description": "Cache has started the transition to Stopped." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_Stop": { + "$ref": "./examples/Caches_Stop.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Caches" + ], + "description": "Tells an Active cache to transition to Stopped state.", + "operationId": "Caches_Stop" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Returns the list of storage targets defined by cacheId.", + "schema": { + "$ref": "#/definitions/StorageTargetsResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_List": { + "$ref": "./examples/StorageTargets_ListByCache.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "tags": [ + "StorageTargets" + ], + "description": "Returns the StorageTargets for this cache in the subscription and resource group.", + "operationId": "StorageTargets_ListByCache" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets/{storageTargetName}": { + "delete": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Storage target deleted." + }, + "202": { + "description": "Started the storage target's deletion." + }, + "204": { + "description": "Storage target deleted." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Delete": { + "$ref": "./examples/StorageTargets_Delete.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "StorageTargets" + ], + "description": "Removes a storage target from a cache. This operation is allowed at any time, but if the cache is down or unhealthy, the actual removal of the storage target may be delayed until the cache is healthy again.", + "operationId": "StorageTargets_Delete" + }, + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Returns the Storage Target object corresponding to storageTargetName.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Get": { + "$ref": "./examples/StorageTargets_Get.json" + } + }, + "tags": [ + "StorageTargets" + ], + "description": "Returns a storage target from a cache.", + "operationId": "StorageTargets_Get" + }, + "put": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the definition of a storage target.", + "in": "body", + "name": "storagetarget", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + } + ], + "responses": { + "200": { + "description": "Storage Target has been created.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "201": { + "description": "Storage Target creation has been initiated. Poll the new Storage Target's provisioningState property to monitor creation progress.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Create": { + "$ref": "./examples/StorageTargets_Create.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "StorageTargets" + ], + "description": "Create/update a storage target. This operation is allowed at any time, but if the cache is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cache is healthy again.", + "operationId": "StorageTargets_Create" + }, + "patch": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Name of storage target.", + "in": "path", + "name": "storageTargetName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + }, + { + "description": "Object containing the definition of a storage target.", + "in": "body", + "name": "storagetarget", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + } + ], + "responses": { + "200": { + "description": "Storage Target has been patched.", + "schema": { + "$ref": "#/definitions/StorageTarget" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "StorageTargets_Update": { + "$ref": "./examples/StorageTargets_Update.json" + } + }, + "tags": [ + "StorageTargets" + ], + "description": "Update a storage target. This operation is allowed at any time, but if the cache is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cache is healthy again.", + "operationId": "StorageTargets_Update" + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/upgrade": { + "post": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "description": "Target resource group.", + "in": "path", + "name": "resourceGroupName", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "description": "Name of cache.", + "in": "path", + "name": "cacheName", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "required": true, + "type": "string" + } + ], + "responses": { + "201": { + "description": "Cache firmware is up to date." + }, + "202": { + "description": "Cache has started the upgrade." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "Caches_UpgradeFirmware": { + "$ref": "./examples/Caches_UpgradeFirmware.json" + } + }, + "x-ms-long-running-operation": true, + "tags": [ + "Caches" + ], + "description": "Tells a cache to upgrade its firmware.", + "operationId": "Caches_UpgradeFirmware" + } + } + }, + "definitions": { + "ApiOperation": { + "description": "REST API operation description: see https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/openapi-authoring-automated-guidelines.md#r3023-operationsapiimplementation", + "properties": { + "display": { + "description": "The object that represents the operation.", + "properties": { + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string" + }, + "provider": { + "description": "Service provider: Microsoft.StorageCache", + "type": "string" + }, + "resource": { + "description": "Resource on which the operation is performed: cache, etc.", + "type": "string" + } + } + }, + "name": { + "description": "Operation name: {provider}/{resource}/{operation}", + "type": "string" + } + }, + "type": "object" + }, + "ApiOperationListResult": { + "description": "Result of the request to list Resource Provider operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "nextLink": { + "description": "URL to get the next set of operation list results if there are any.", + "type": "string" + }, + "value": { + "description": "List of Resource Provider operations supported by the Microsoft.StorageCache resource provider.", + "items": { + "$ref": "#/definitions/ApiOperation" + }, + "type": "array" + } + }, + "type": "object" + }, + "CloudError": { + "description": "An error response.", + "properties": { + "error": { + "description": "The body of the error.", + "$ref": "#/definitions/CloudErrorBody" + } + }, + "type": "object" + }, + "CloudErrorBody": { + "description": "An error response.", + "properties": { + "code": { + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically.", + "type": "string" + }, + "details": { + "description": "A list of additional details about the error.", + "items": { + "$ref": "#/definitions/CloudErrorBody" + }, + "type": "array" + }, + "message": { + "description": "A message describing the error, intended to be suitable for display in a user interface.", + "type": "string" + }, + "target": { + "description": "The target of the particular error. For example, the name of the property in error.", + "type": "string" + } + }, + "type": "object" + }, + "Cache": { + "description": "A cache instance. Follows Azure Resource Manager standards: https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md", + "properties": { + "tags": { + "description": "ARM tags as name/value pairs.", + "type": "object" + }, + "id": { + "description": "Fully qualified URL of the cache.", + "readOnly": true, + "$ref": "#/definitions/URLString" + }, + "location": { + "description": "Region name string.", + "type": "string" + }, + "name": { + "description": "Name of cache.", + "readOnly": true, + "$ref": "#/definitions/ResourceName" + }, + "type": { + "description": "Type for the cache; Microsoft.StorageCache/Cache", + "readOnly": true, + "type": "string" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "Properties for the cache.", + "properties": { + "cacheSizeGB": { + "description": "The size of this cache's cache, in GB.", + "type": "integer" + }, + "health": { + "description": "Health of the cache.", + "readOnly": true, + "$ref": "#/definitions/CacheHealth" + }, + "mountAddresses": { + "description": "Array of IP addresses that can be used by clients mounting this Cache.", + "readOnly": true, + "items": { + "type": "string" + }, + "type": "array" + }, + "provisioningState": { + "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", + "enum":[ + "Succeeded", + "Failed", + "Cancelled", + "Creating", + "Deleting", + "Updating" + ], + "x-ms-enum": { + "name": "ProvisioningStateType", + "modelAsString": true + }, + "type": "string" + }, + "subnet": { + "description": "Subnet used for the cache.", + "$ref": "#/definitions/URLString" + }, + "upgradeStatus": { + "description": "Upgrade status of the cache.", + "$ref": "#/definitions/CacheUpgradeStatus" + } + }, + "type": "object" + }, + "sku": { + "description": "Sku for the cache.", + "properties": { + "name": { + "description": "Sku name for this cache.", + "type": "string" + } + }, + "type": "object" + } + }, + "x-ms-azure-resource": true, + "type": "object" + }, + "CachesListResult": { + "description": "Result of the request to list caches. It contains a list of caches and a URL link to get the next set of results.", + "properties": { + "nextLink": { + "description": "URL to get the next set of cache list results if there are any.", + "type": "string" + }, + "value": { + "description": "List of caches.", + "items": { + "$ref": "#/definitions/Cache" + }, + "type": "array" + } + }, + "type": "object" + }, + "CacheHealth": { + "description": "An indication of cache health. Gives more information about health than just that related to provisioning.", + "properties": { + "state": { + "description": "List of cache health states.", + "enum": [ + "Unknown", + "Healthy", + "Degraded", + "Down", + "Transitioning", + "Stopping", + "Stopped", + "Upgrading", + "Flushing" + ], + "x-ms-enum": { + "name": "HealthStateType", + "modelAsString": true + }, + "type": "string" + }, + "statusDescription": { + "description": "Describes explanation of state.", + "type": "string" + } + } + }, + "CacheUpgradeStatus": { + "description": "Properties describing the software upgrade state of the cache", + "properties": { + "currentFirmwareVersion": { + "description": "Version string of the firmware currently installed on this cache.", + "type": "string", + "readOnly": true + }, + "firmwareUpdateStatus": { + "description": "True if there is a firmware update ready to install on this cache. The firmware will automatically be installed after firmwareUpdateDeadline if not triggered earlier via the upgrade operation.", + "enum": [ + "available", + "unavailable" + ], + "x-ms-enum": { + "name": "FirmwareStatusType", + "modelAsString": true + }, + "readOnly": true, + "type": "string" + }, + "firmwareUpdateDeadline": { + "description": "Time at which the pending firmware update will automatically be installed on the cache.", + "format": "date-time", + "type": "string", + "readOnly": true + }, + "lastFirmwareUpdate": { + "description": "Time of the last successful firmware update.", + "format": "date-time", + "type": "string", + "readOnly": true + }, + "pendingFirmwareVersion": { + "description": "When firmwareUpdateAvailable is true, this field holds the version string for the update.", + "type": "string", + "readOnly": true + } + }, + "type": "object" + }, + "UnknownProperties": { + "description": "Properties of an unknown type of StorageTarget", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "Nfs3Target": { + "description": "An NFS mount point for use as a StorageTarget.", + "properties": { + "target": { + "description": "Mount string of an NFS Storage Target, ie: 10.0.44.44:/exp1", + "pattern": "^[.0-9a-zA-Z]+:/.*$", + "type": "string" + }, + "usageModel": { + "description": "Identifies the primary usage model to be used for this storage target. GET choices from .../usageModels", + "type": "string" + } + }, + "x-ms-discriminator-value": "nfs3", + "type": "object" + }, + "ClfsTarget": { + "description": "Storage container for use as a CLFS StorageTarget.", + "properties": { + "target": { + "description": "URL of storage container.", + "$ref": "#/definitions/URLString" + } + }, + "x-ms-discriminator-value": "clfs", + "type": "object" + }, + "UnknownTarget": { + "description": "Storage container for use as a Unknown StorageTarget.", + "properties": { + "unknownMap": { + "description": "Dictionary of string->string pairs containing information about the StorageTarget.", + "$ref": "#/definitions/UnknownProperties" + } + }, + "x-ms-discriminator-value": "unknown", + "type": "object" + }, + "ResourceName": { + "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate, this will contain the complete URL of the object. These names are case-preserving, but not case sensistive.", + "pattern": "^[-0-9a-zA-Z_]{1,31}$", + "type": "string" + }, + "ResourceSku": { + "description": "A resource SKU", + "properties": { + "resourceType": { + "readOnly": true, + "type": "string", + "description": "The type of resource the sku applies to." + }, + "capabilities": { + "description": "A list of capabilities of this SKU, such as throughput or ops/sec", + "items": { + "$ref": "#/definitions/ResourceSkuCapabilities" + }, + "type": "array" + }, + "locations": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "The set of locations that the SKU is available. This will be supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.)." + }, + "locationInfo": { + "description": "The set of locations that the SKU is available.", + "items": { + "$ref": "#/definitions/ResourceSkuLocationInfo" + }, + "type": "array" + }, + "name": { + "description": "The name of this sku.", + "type": "string" + }, + "restrictions": { + "type": "array", + "items": { + "$ref": "#/definitions/Restriction" + }, + "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions." + } + }, + "type": "object" + }, + "Restriction": { + "properties": { + "type": { + "readOnly": true, + "type": "string", + "description": "The type of restrictions. As of now only possible value for this is location." + }, + "values": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted." + }, + "reasonCode": { + "type": "string", + "enum": [ + "QuotaId", + "NotAvailableForSubscription" + ], + "x-ms-enum": { + "name": "ReasonCode", + "modelAsString": true + }, + "description": "The reason for the restriction. As of now this can be \"QuotaId\" or \"NotAvailableForSubscription\". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that quota. The \"NotAvailableForSubscription\" is related to capacity at DC." + } + }, + "description": "The restriction because of which SKU cannot be used." + }, + "ResourceSkuCapabilities": { + "description": "A resource SKU capability.", + "properties": { + "name": { + "description": "Name of a capability, such as ops/sec", + "type": "string" + }, + "value": { + "description": "Quantity, if the capability is measured by quantity", + "type": "string" + } + }, + "type": "object" + }, + "ResourceSkuLocationInfo": { + "description": "Resource SKU location information.", + "properties": { + "location": { + "description": "Location where this Sku is available", + "type": "string" + }, + "zones": { + "description": "Zones if any.", + "type": "array", + "items": { + "type": "string" + } + } + }, + "type": "object" + }, + "ResourceSkusResult": { + "description": "The response from the List Cache SKUs operation.", + "properties": { + "nextLink": { + "description": "The uri to fetch the next page of cache Skus.", + "type": "string" + }, + "value": { + "description": "The list of skus available for the subscription.", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSku" + }, + "type": "array" + } + } + }, + "StorageTarget": { + "description": "A storage system being cached by a Cache.", + "type": "object", + "discriminator": "targetType", + "properties": { + "name": { + "description":"A fully qualified URL.", + "readOnly": true, + "$ref": "#/definitions/ResourceName" + }, + "id": { + "readOnly": true, + "type": "string", + "description": "Resource Id" + }, + "type": { + "description": "Type for the storage target; Microsoft.StorageCache/Cache/StorageTarget", + "readOnly": true, + "type": "string" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "Properties of the storage target.", + "type": "object", + "properties": { + "junctions": { + "description": "List of cache namespace to target namespace associations.", + "type": "array", + "items": { + "$ref": "#/definitions/NamespaceJunction" + } + }, + "targetType": { + "description": "Type for storage target.", + "enum": [ + "nfs3", + "clfs", + "unknown" + ], + "x-ms-enum": { + "name": "StorageTargetType", + "modelAsString": true + }, + "type": "string" + }, + "provisioningState": { + "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", + "enum":[ + "Succeeded", + "Failed", + "Cancelled", + "Creating", + "Deleting", + "Updating" + ], + "x-ms-enum": { + "name": "ProvisioningStateType", + "modelAsString": true + }, + "type": "string" + }, + "nfs3": { + "description": "Properties when nfs3 target.", + "$ref": "#/definitions/Nfs3Target" + }, + "clfs": { + "description": "Properties when clfs target.", + "$ref": "#/definitions/ClfsTarget" + }, + "unknown": { + "description": "Properties when unknown target.", + "$ref": "#/definitions/UnknownTarget" + } + } + } + }, + "x-ms-azure-resource": true + }, + "NamespaceJunction": { + "description": "A namespace junction.", + "type": "object", + "properties": { + "namespacePath": { + "description": "Namespace path on a cache for a storage target.", + "type": "string" + }, + "targetPath": { + "description": "Path in storage target to which namespacePath points.", + "type": "string" + } + } + }, + "StorageTargetsResult": { + "description": "A list of storage targets.", + "properties": { + "nextLink": { + "description": "The uri to fetch the next page of storage targets.", + "type": "string" + }, + "value": { + "description": "The list of storage targets defined for the cache.", + "items": { + "$ref": "#/definitions/StorageTarget" + }, + "type": "array" + } + }, + "type": "object" + }, + "URLString": { + "description": "A fully qualified URL.", + "type": "string" + }, + "UsageModel": { + "description": "A usage model.", + "properties": { + "display": { + "description": "Localized information describing this usage model.", + "type": "object", + "properties": { + "description": { + "description": "String to display for this usage model.", + "type": "string" + } + } + }, + "modelName": { + "description": "Non localized keyword naming this usage model.", + "type": "string" + }, + "targetType": { + "description": "The type of Storage Target to which this model is applicable (only nfs for now)", + "type": "string" + } + }, + "type": "object" + }, + "UsageModelsResult": { + "description": "A list of cache usage models.", + "properties": { + "nextLink": { + "description": "The uri to fetch the next page of cache usage models.", + "type": "string" + }, + "value": { + "description": "The list of usage models available for the subscription.", + "items": { + "$ref": "#/definitions/UsageModel" + }, + "type": "array" + } + }, + "type": "object" + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + } + } +} From e157a787bdfcfb2bb6a8b3a8023fa5e2426e9307 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 30 Jul 2019 21:16:56 -0400 Subject: [PATCH 21/35] changes for initial 2018-08-01-preview version --- .../examples/Caches_Create.json | 2 +- .../examples/Caches_Delete.json | 2 +- .../examples/Caches_Flush.json | 2 +- .../examples/Caches_Get.json | 2 +- .../examples/Caches_List.json | 2 +- .../examples/Caches_ListByResourceGroup.json | 2 +- .../examples/Caches_Start.json | 2 +- .../examples/Caches_Stop.json | 2 +- .../examples/Caches_Update.json | 2 +- .../examples/Caches_UpgradeFirmware.json | 2 +- .../examples/Operations_List.json | 2 +- .../examples/Skus_List.json | 2 +- .../examples/StorageTargets_Create.json | 29 ++++++++++++------- .../examples/StorageTargets_Delete.json | 2 +- .../examples/StorageTargets_Get.json | 11 ++++--- .../examples/StorageTargets_ListByCache.json | 14 +++++---- .../examples/StorageTargets_Update.json | 20 ++++++++----- .../examples/UsageModels_List.json | 2 +- .../2019-08-01-preview/storagecache.json | 10 +++++-- 19 files changed, 69 insertions(+), 43 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json index fd6f75190409..5cbf6ffdd7ed 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Create.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cache": { "tags": { "Dept": "Initech" diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json index 61b62221c5f6..9ca5d1c615df 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Delete.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json index 894e9fb597ee..1a7117fd038e 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Flush.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json index d4c4fe5b582c..a1b6d4057889 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Get.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json index afe95c78326c..5b4a814631d9 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json index 7fec2c503b4f..30e4ddad4c3f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_ListByResourceGroup.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json index 894e9fb597ee..1a7117fd038e 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Start.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json index 894e9fb597ee..1a7117fd038e 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Stop.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json index c033a2863864..26b0e37ea22e 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_Update.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cache": { "tags": { "Dept": "Initech" diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json index 1d47e8d2d59f..78dafeba195b 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Caches_UpgradeFirmware.json @@ -3,7 +3,7 @@ "resourceGroupName": "scgroup", "cacheName": "sc1", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "201": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json index 74230507d1eb..da20fac79e33 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Operations_List.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "x-ms-client-request-id": [ "7e655b68-e491-4cb6-90c3-6a5b10b7bd17" ], diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json index 8f7959d76041..90c76524f305 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/Skus_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json index 991d7e5f9a1b..53cc02c7ad13 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Create.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cacheName": "sc1", "storageTargetName": "st1", "storagetarget": { @@ -10,16 +10,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_INFREQ" } } @@ -35,16 +38,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_INFREQ" } } @@ -59,16 +65,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_INFREQ" } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json index 5924a627852e..0dcd0c2c2f84 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Delete.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cacheName": "sc1", "storageTargetName": "st1" }, diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json index bafb12a96510..11e7f4c3f77a 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Get.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cacheName": "sc1", "storageTargetName": "st1" }, @@ -16,16 +16,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_FREQ" } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json index 43e40aa735f7..67c6004a37ff 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_ListByCache.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cacheName": "sc1" }, "responses": { @@ -17,16 +17,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_FREQ" } } @@ -56,7 +59,8 @@ "junctions": [ { "namespacePath": "/some/crazier/place/on/cache", - "targetPath": "/" + "targetPath": "/", + "nfsExport": "" } ], "targetType": "unknown", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json index 6639d3163925..055de646fa3f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/StorageTargets_Update.json @@ -2,7 +2,7 @@ "parameters": { "resourceGroupName": "scgroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", + "api-version": "2019-08-01-preview", "cacheName": "sc1", "storageTargetName": "st1", "storagetarget": { @@ -10,16 +10,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_FREQ" } } @@ -35,16 +38,19 @@ "junctions": [ { "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" + "targetPath": "/path/on/exp1", + "nfsExport": "exp1" }, { "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" + "targetPath": "/path2/on/exp2", + "nfsExport": "exp2" + } ], "targetType": "nfs3", "nfs3": { - "target": "10.0.44.44:/exp1", + "target": "10.0.44.44", "usageModel": "READ_HEAVY_FREQ" } } diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json index db1c820d6904..87a24bde38cf 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/examples/UsageModels_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" + "api-version": "2019-08-01-preview" }, "responses": { "200": { diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json index 89a86def93c0..a28ff26fff6e 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json @@ -3,7 +3,7 @@ "info": { "description": "A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage caches.", "title": "Storage Cache Mgmt Client", - "version": "2019-06-01-preview" + "version": "2019-08-01-preview" }, "host": "management.azure.com", "basePath": "/", @@ -1310,8 +1310,8 @@ "description": "An NFS mount point for use as a StorageTarget.", "properties": { "target": { - "description": "Mount string of an NFS Storage Target, ie: 10.0.44.44:/exp1", - "pattern": "^[.0-9a-zA-Z]+:/.*$", + "description": "IP or name of an NFS Storage Target host, ie: 10.0.44.44", + "pattern": "^[-.0-9a-zA-Z]+$", "type": "string" }, "usageModel": { @@ -1560,6 +1560,10 @@ "targetPath": { "description": "Path in storage target to which namespacePath points.", "type": "string" + }, + "nfsExport": { + "description": "NFS export where targetPath exists.", + "type": "string" } } }, From 57ccddfaab6823222ce8c8e6d39cb74ba889d676 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 30 Jul 2019 22:28:07 -0400 Subject: [PATCH 22/35] updates for readme.md --- .../storagecache/resource-manager/readme.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md index ce474e6b9671..e0344573ca40 100644 --- a/specification/storagecache/resource-manager/readme.md +++ b/specification/storagecache/resource-manager/readme.md @@ -26,11 +26,11 @@ These are the global settings for the StorageCache API. ``` yaml openapi-type: arm -tag: package-2019-06 +tag: package-2019-08 ``` -### Tag: package-2018-02 +### Tag: package-2019-06 These settings apply only when `--tag=package-2019-06` is specified on the command line. @@ -39,6 +39,15 @@ input-file: - Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json ``` +### Tag: package-2019-08 + +These settings apply only when `--tag=package-2019-08` is specified on the command line. + +``` yaml $(tag) == 'package-2019-08' +input-file: +- Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json +``` + ## Swagger to SDK This section describes what SDK should be generated by the automatic system. From f1b6429a38704a22a152224dc709157dd88fbbe9 Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 8 Aug 2019 14:50:52 -0400 Subject: [PATCH 23/35] try to fix pipeline error about body in example --- .../2019-06-01-preview/examples/Caches_Delete.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json index 61b62221c5f6..8d2fec496215 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json @@ -6,14 +6,8 @@ "api-version": "2019-06-01-preview" }, "responses": { - "200": { - "body": "" - }, - "202": { - "body": "" - }, - "204": { - "body": "" - } + "200": {}, + "202": {}, + "204": {} } } From 1281c787a7cefe7ae5de47f27bac86450730bf98 Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 8 Aug 2019 15:15:07 -0400 Subject: [PATCH 24/35] add empty schema to satisfy pipeline checks --- .../preview/2019-06-01-preview/storagecache.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index 89a86def93c0..fe0f967d197f 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -279,13 +279,16 @@ ], "responses": { "200": { - "description": "Cache deleted." + "description": "Cache deleted.", + "schema": {} }, "202": { - "description": "Started the Cache's transition to Deleted state." + "description": "Started the Cache's transition to Deleted state.", + "schema": {} }, "204": { - "description": "Cache deleted." + "description": "Cache deleted.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", From 228dce0da4f34340fb0c98a2f0133a5a0d17fa75 Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 8 Aug 2019 15:26:59 -0400 Subject: [PATCH 25/35] more changes for validator --- .../2019-06-01-preview/examples/Caches_Delete.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json index 8d2fec496215..61b62221c5f6 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json @@ -6,8 +6,14 @@ "api-version": "2019-06-01-preview" }, "responses": { - "200": {}, - "202": {}, - "204": {} + "200": { + "body": "" + }, + "202": { + "body": "" + }, + "204": { + "body": "" + } } } From 6ebee6968b18c7849f34de4518160b3da2f61fdb Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 8 Aug 2019 15:38:37 -0400 Subject: [PATCH 26/35] update the correct version --- .../preview/2019-08-01-preview/storagecache.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json index a28ff26fff6e..0d3c509ccf78 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json @@ -279,13 +279,16 @@ ], "responses": { "200": { - "description": "Cache deleted." + "description": "Cache deleted.", + "schema": {} }, "202": { - "description": "Started the Cache's transition to Deleted state." + "description": "Started the Cache's transition to Deleted state.", + "schema": {} }, "204": { - "description": "Cache deleted." + "description": "Cache deleted.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", From 106a3118f9f39772934dc891d6a24e6ca6b02ba5 Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 8 Aug 2019 17:09:39 -0400 Subject: [PATCH 27/35] additional fixes for pipeline --- .../2019-06-01-preview/storagecache.json | 33 ++++++++++++------- .../2019-08-01-preview/storagecache.json | 33 ++++++++++++------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json index fe0f967d197f..b1a2eb7a61ce 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json @@ -525,10 +525,12 @@ ], "responses": { "200": { - "description": "All cache data is clean." + "description": "All cache data is clean.", + "schema": {} }, "202": { - "description": "Cache has started flushing." + "description": "Cache has started flushing.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -580,10 +582,12 @@ ], "responses": { "200": { - "description": "Cache is Active." + "description": "Cache is Active.", + "schema": {} }, "202": { - "description": "Cache has started the transition to Active." + "description": "Cache has started the transition to Active.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -635,10 +639,12 @@ ], "responses": { "200": { - "description": "Cache is stopped." + "description": "Cache is stopped.", + "schema": {} }, "202": { - "description": "Cache has started the transition to Stopped." + "description": "Cache has started the transition to Stopped.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -755,13 +761,16 @@ ], "responses": { "200": { - "description": "Storage target deleted." + "description": "Storage target deleted.", + "schema": {} }, "202": { - "description": "Started the storage target's deletion." + "description": "Started the storage target's deletion.", + "schema": {} }, "204": { - "description": "Storage target deleted." + "description": "Storage target deleted.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -1022,10 +1031,12 @@ ], "responses": { "201": { - "description": "Cache firmware is up to date." + "description": "Cache firmware is up to date.", + "schema": {} }, "202": { - "description": "Cache has started the upgrade." + "description": "Cache has started the upgrade.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json index 0d3c509ccf78..6431dd8639a5 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json @@ -525,10 +525,12 @@ ], "responses": { "200": { - "description": "All cache data is clean." + "description": "All cache data is clean.", + "schema": {} }, "202": { - "description": "Cache has started flushing." + "description": "Cache has started flushing.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -580,10 +582,12 @@ ], "responses": { "200": { - "description": "Cache is Active." + "description": "Cache is Active.", + "schema": {} }, "202": { - "description": "Cache has started the transition to Active." + "description": "Cache has started the transition to Active.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -635,10 +639,12 @@ ], "responses": { "200": { - "description": "Cache is stopped." + "description": "Cache is stopped.", + "schema": {} }, "202": { - "description": "Cache has started the transition to Stopped." + "description": "Cache has started the transition to Stopped.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -755,13 +761,16 @@ ], "responses": { "200": { - "description": "Storage target deleted." + "description": "Storage target deleted.", + "schema": {} }, "202": { - "description": "Started the storage target's deletion." + "description": "Started the storage target's deletion.", + "schema": {} }, "204": { - "description": "Storage target deleted." + "description": "Storage target deleted.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", @@ -1022,10 +1031,12 @@ ], "responses": { "201": { - "description": "Cache firmware is up to date." + "description": "Cache firmware is up to date.", + "schema": {} }, "202": { - "description": "Cache has started the upgrade." + "description": "Cache has started the upgrade.", + "schema": {} }, "default": { "description": "Error response describing why the operation failed.", From ab2fa7424f25b8e7a419eae571105f4ab62d8e76 Mon Sep 17 00:00:00 2001 From: Matt White Date: Thu, 8 Aug 2019 22:44:27 -0400 Subject: [PATCH 28/35] fix indent --- .../preview/2019-08-01-preview/storagecache.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json index 6431dd8639a5..98f952101e57 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json @@ -213,12 +213,12 @@ "required": true, "type": "string" }, - { + { "$ref": "#/parameters/ApiVersionParameter" }, - { + { "$ref": "#/parameters/SubscriptionIdParameter" - } + } ], "responses": { "200": { From 74e78822d034d9d7610cf2d88fd854766ebb71ff Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Tue, 27 Aug 2019 14:11:15 -0400 Subject: [PATCH 29/35] Remove private preview version named 2019-06-01-preview --- .../examples/Caches_Create.json | 91 - .../examples/Caches_Delete.json | 19 - .../examples/Caches_Flush.json | 16 - .../examples/Caches_Get.json | 44 - .../examples/Caches_List.json | 78 - .../examples/Caches_ListByResourceGroup.json | 79 - .../examples/Caches_Start.json | 16 - .../examples/Caches_Stop.json | 16 - .../examples/Caches_Update.json | 57 - .../examples/Caches_UpgradeFirmware.json | 16 - .../examples/Operations_List.json | 35 - .../examples/Skus_List.json | 86 - .../examples/StorageTargets_Create.json | 78 - .../examples/StorageTargets_Delete.json | 20 - .../examples/StorageTargets_Get.json | 35 - .../examples/StorageTargets_ListByCache.json | 75 - .../examples/StorageTargets_Update.json | 54 - .../examples/UsageModels_List.json | 35 - .../2019-06-01-preview/storagecache.json | 1659 ----------------- 19 files changed, 2509 deletions(-) delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json delete mode 100644 specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json deleted file mode 100644 index fd6f75190409..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Create.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc1", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cache": { - "tags": { - "Dept": "Initech" - }, - "location": "westus", - "properties": { - "cacheSizeGB": 3072, - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" - }, - "sku": { - "name": "Standard_2G" - } - } - }, - "responses": { - "201": { - "body": { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - } - }, - "200": { - "body": { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json deleted file mode 100644 index 61b62221c5f6..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Delete.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": "" - }, - "202": { - "body": "" - }, - "204": { - "body": "" - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json deleted file mode 100644 index 894e9fb597ee..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Flush.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": "" - }, - "202": { - "body": "" - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json deleted file mode 100644 index d4c4fe5b582c..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Get.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc1", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json deleted file mode 100644 index afe95c78326c..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_List.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - }, - { - "tags": { - "Dept": "Intertrode" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", - "location": "westus", - "name": "sc2", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Configuring", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - } - ] - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json deleted file mode 100644 index 7fec2c503b4f..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_ListByResourceGroup.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - }, - { - "tags": { - "Dept": "Intertrode" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc2", - "location": "westus", - "name": "sc2", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub2", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - } - ] - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json deleted file mode 100644 index 894e9fb597ee..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Start.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": "" - }, - "202": { - "body": "" - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json deleted file mode 100644 index 894e9fb597ee..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Stop.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": "" - }, - "202": { - "body": "" - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json deleted file mode 100644 index c033a2863864..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_Update.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc1", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cache": { - "tags": { - "Dept": "Initech" - }, - "location": "westus", - "properties": { - "cacheSizeGB": 3072, - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1" - }, - "sku": { - "name": "Standard_2G" - } - } - }, - "responses": { - "200": { - "body": { - "tags": { - "Dept": "Initech" - }, - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1", - "location": "westus", - "name": "sc1", - "type": "Microsoft.StorageCache/Cache", - "properties": { - "cacheSizeGB": 3072, - "health": { - "state": "Transitioning", - "statusDescription": "Cache is being created." - }, - "mountAddresses": [ - "192.168.1.1", - "192.168.1.2" - ], - "provisioningState": "Booting", - "subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1", - "upgradeStatus": { - "currentFirmwareVersion": "AvereOS V5.1.1.2", - "firmwareUpdateStatus": "available", - "firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z", - "lastFirmwareUpdate": "2019-01-21T18:25:43.511Z", - "pendingFirmwareVersion": "AvereOS V5.1.1.32" - } - }, - "sku": { - "name": "Standard_2G" - } - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json deleted file mode 100644 index 1d47e8d2d59f..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Caches_UpgradeFirmware.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "cacheName": "sc1", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "201": { - "body": "" - }, - "202": { - "body": "" - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json deleted file mode 100644 index 74230507d1eb..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Operations_List.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parameters": { - "api-version": "2019-06-01-preview", - "x-ms-client-request-id": [ - "7e655b68-e491-4cb6-90c3-6a5b10b7bd17" - ], - "accept-language": [ - "en-US" - ] - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "Microsoft.StorageCache/caches/write", - "display": { - "operation": "Create or Update Cache", - "provider": "Azure Storage Cache", - "resource": "Caches" - } - }, - { - "name": "Microsoft.StorageCache/caches/delete", - "display": { - "operation": "Delete Cache", - "provider": "Azure Storage Cache", - "resource": "Caches" - } - } - ] - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json deleted file mode 100644 index 8f7959d76041..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/Skus_List.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "resourceType": "caches", - "name": "Standard_2G", - "locations": [ - "East US" - ], - "locationInfo": [ - { - "location": "East US", - "zones": [] - } - ], - "capabilities": [ - { - "name": "throughput GB/s", - "value": "2" - }, - { - "name": "cache sizes(GB)", - "value": "3072,6144,12288" - } - ], - "restrictions": [] - }, - { - "resourceType": "caches", - "name": "Standard_4G", - "locations": [ - "East US" - ], - "locationInfo": [ - { - "location": "East US", - "zones": [] - } - ], - "capabilities": [ - { - "name": "throughput GB/s", - "value": "4" - }, - { - "name": "cache sizes(GB)", - "value": "6144,12288,24576" - } - ], - "restrictions": [] - }, - { - "resourceType": "caches", - "name": "Standard_8G", - "locations": [ - "East US" - ], - "locationInfo": [ - { - "location": "East US", - "zones": [] - } - ], - "capabilities": [ - { - "name": "throughput GB/s", - "value": "8" - }, - { - "name": "cache sizes(GB)", - "value": "12288,24576,49152" - } - ], - "restrictions": [] - } - ] - } - } - } -} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json deleted file mode 100644 index 991d7e5f9a1b..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Create.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cacheName": "sc1", - "storageTargetName": "st1", - "storagetarget": { - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_INFREQ" - } - } - } - }, - "responses": { - "200": { - "body": { - "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_INFREQ" - } - } - } - }, - "201": { - "body": { - "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_INFREQ" - } - } - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json deleted file mode 100644 index 5924a627852e..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Delete.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cacheName": "sc1", - "storageTargetName": "st1" - }, - "responses": { - "200": { - "body": "" - }, - "202": { - "body": "" - }, - "204": { - "body": "" - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json deleted file mode 100644 index bafb12a96510..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Get.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cacheName": "sc1", - "storageTargetName": "st1" - }, - "responses": { - "200": { - "body": { - "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_FREQ" - } - } - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json deleted file mode 100644 index 43e40aa735f7..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_ListByCache.json +++ /dev/null @@ -1,75 +0,0 @@ - { - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cacheName": "sc1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_FREQ" - } - } - }, - { - "name": "st2", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st2", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/some/crazy/place/on/cache", - "targetPath": "/" - } - ], - "targetType": "clfs", - "clfs": { - "target": "https://atj5c2fc9b8c00.blob.core.windows.net/atj5c2fc9b8c01" - } - } - }, - { - "name": "st3", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st3", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/some/crazier/place/on/cache", - "targetPath": "/" - } - ], - "targetType": "unknown", - "unknown": { - "unknownMap": { - "foo": "bar", - "foo2": "test" - } - } - } - } - ] - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json deleted file mode 100644 index 6639d3163925..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/StorageTargets_Update.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "resourceGroupName": "scgroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview", - "cacheName": "sc1", - "storageTargetName": "st1", - "storagetarget": { - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_FREQ" - } - } - } - }, - "responses": { - "200": { - "body": { - "name": "st1", - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1/storagetargets/st1", - "type": "Microsoft.StorageCache/Cache/StorageTarget", - "properties": { - "junctions": [ - { - "namespacePath": "/path/on/cache", - "targetPath": "/path/on/storagetarget" - }, - { - "namespacePath": "/path2/on/cache", - "targetPath": "/path2/on/storagetarget" - } - ], - "targetType": "nfs3", - "nfs3": { - "target": "10.0.44.44:/exp1", - "usageModel": "READ_HEAVY_FREQ" - } - } - } - } - } -} diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json deleted file mode 100644 index db1c820d6904..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/examples/UsageModels_List.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "modelName": "READ_HEAVY_INFREQ", - "targetType": "nfs3", - "display": { - "description": "Read heavy, infrequent changes" - } - }, - { - "modelName": "WRITE_AROUND", - "targetType": "nfs3", - "display": { - "description": "Clients write directly to storage" - } - }, - { - "modelName": "WRITE_WORKLOAD_15", - "targetType": "nfs3", - "display": { - "description": "Write workload > 15%" - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json deleted file mode 100644 index b1a2eb7a61ce..000000000000 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json +++ /dev/null @@ -1,1659 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "description": "A Storage Cache provides scalable caching service for NAS clients, serving data from either NFSv3 or Blob at-rest storage (referred to as \"Storage Targets\"). These operations allow you to manage caches.", - "title": "Storage Cache Mgmt Client", - "version": "2019-06-01-preview" - }, - "host": "management.azure.com", - "basePath": "/", - "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" - } - } - }, - "paths": { - "/providers/Microsoft.StorageCache/operations": { - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK. The request has succeeded.", - "schema": { - "$ref": "#/definitions/ApiOperationListResult" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "tags": [ - "Operations" - ], - "description": "Lists all of the available RP operations.", - "x-ms-examples": { - "StorageTargets_List": { - "$ref": "./examples/Operations_List.json" - } - }, - "operationId": "Operations_List", - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/skus": { - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "A list of SKU descriptors.", - "schema": { - "$ref": "#/definitions/ResourceSkusResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "Skus_List": { - "$ref": "./examples/Skus_List.json" - } - }, - "tags": [ - "SKUs" - ], - "description": "Get the list of StorageCache.Cache SKUs available to this subscription.", - "operationId": "Skus_List" - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/usageModels": { - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "A list of UsageModel descriptors.", - "schema": { - "$ref": "#/definitions/UsageModelsResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "UsageModels_List": { - "$ref": "./examples/UsageModels_List.json" - } - }, - "tags": [ - "UsageModels" - ], - "description": "Get the list of cache Usage Models available to this subscription.", - "operationId": "UsageModels_List" - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.StorageCache/caches": { - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", - "schema": { - "$ref": "#/definitions/CachesListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "x-ms-examples": { - "Caches_List": { - "$ref": "./examples/Caches_List.json" - } - }, - "tags": [ - "Caches" - ], - "description": "Returns all Caches the user has access to under a subscription.", - "operationId": "Caches_List" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches": { - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "A list of Cache objects. Note that entity references might replace complete Cache objects, as described in http://docs.oasis-open.org/odata/odata-json-format/v4.01/cs01/odata-json-format-v4.01-cs01.html#sec_EntityReference", - "schema": { - "$ref": "#/definitions/CachesListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_ListByResourceGroup": { - "$ref": "./examples/Caches_ListByResourceGroup.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "tags": [ - "Caches" - ], - "description": "Returns all Caches the user has access to under a resource group and subscription.", - "operationId": "Caches_ListByResourceGroup" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}": { - "delete": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Cache deleted.", - "schema": {} - }, - "202": { - "description": "Started the Cache's transition to Deleted state.", - "schema": {} - }, - "204": { - "description": "Cache deleted.", - "schema": {} - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Delete": { - "$ref": "./examples/Caches_Delete.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "Caches" - ], - "description": "Schedules a Cache for deletion.", - "operationId": "Caches_Delete" - }, - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - } - ], - "responses": { - "200": { - "description": "Returns the Cache object corresponding to cacheId.", - "schema": { - "$ref": "#/definitions/Cache" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Get": { - "$ref": "./examples/Caches_Get.json" - } - }, - "tags": [ - "Caches" - ], - "description": "Returns a Cache.", - "operationId": "Caches_Get" - }, - "put": { - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Object containing the user selectable properties of the new cache. If read-only properties are included, they must match the existing values of those properties.", - "in": "body", - "name": "cache", - "schema": { - "$ref": "#/definitions/Cache" - } - } - ], - "responses": { - "200": { - "description": "Cache created or already exists.", - "schema": { - "$ref": "#/definitions/Cache" - } - }, - "201": { - "description": "Cache creation has been initiated. Poll the new Cache's provisioningState property to monitor creation progress.", - "schema": { - "$ref": "#/definitions/Cache" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Create": { - "$ref": "./examples/Caches_Create.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "Caches" - ], - "description": "Create/update a Cache instance.", - "operationId": "Caches_Create" - }, - "patch": { - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Object containing the user selectable properties of the new cache. If read-only properties are included, they must match the existing values of those properties.", - "in": "body", - "name": "cache", - "schema": { - "$ref": "#/definitions/Cache" - } - } - ], - "responses": { - "200": { - "description": "Patched the Cache.", - "schema": { - "$ref": "#/definitions/Cache" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Update": { - "$ref": "./examples/Caches_Update.json" - } - }, - "tags": [ - "Caches" - ], - "description": "Update a Cache instance.", - "operationId": "Caches_Update" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/flush": { - "post": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "All cache data is clean.", - "schema": {} - }, - "202": { - "description": "Cache has started flushing.", - "schema": {} - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Flush": { - "$ref": "./examples/Caches_Flush.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "Caches" - ], - "description": "Tells a cache to write all dirty data to the StorageTarget(s). During the flush, clients will see errors returned until the flush is complete.", - "operationId": "Caches_Flush" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/start": { - "post": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "Cache is Active.", - "schema": {} - }, - "202": { - "description": "Cache has started the transition to Active.", - "schema": {} - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Start": { - "$ref": "./examples/Caches_Start.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "Caches" - ], - "description": "Tells a Stopped state cache to transition to Active state.", - "operationId": "Caches_Start" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/stop": { - "post": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "Cache is stopped.", - "schema": {} - }, - "202": { - "description": "Cache has started the transition to Stopped.", - "schema": {} - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_Stop": { - "$ref": "./examples/Caches_Stop.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "Caches" - ], - "description": "Tells an Active cache to transition to Stopped state.", - "operationId": "Caches_Stop" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets": { - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "Returns the list of storage targets defined by cacheId.", - "schema": { - "$ref": "#/definitions/StorageTargetsResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "StorageTargets_List": { - "$ref": "./examples/StorageTargets_ListByCache.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, - "tags": [ - "StorageTargets" - ], - "description": "Returns the StorageTargets for this cache in the subscription and resource group.", - "operationId": "StorageTargets_ListByCache" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/storageTargets/{storageTargetName}": { - "delete": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Name of storage target.", - "in": "path", - "name": "storageTargetName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "Storage target deleted.", - "schema": {} - }, - "202": { - "description": "Started the storage target's deletion.", - "schema": {} - }, - "204": { - "description": "Storage target deleted.", - "schema": {} - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "StorageTargets_Delete": { - "$ref": "./examples/StorageTargets_Delete.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "StorageTargets" - ], - "description": "Removes a storage target from a cache. This operation is allowed at any time, but if the cache is down or unhealthy, the actual removal of the storage target may be delayed until the cache is healthy again.", - "operationId": "StorageTargets_Delete" - }, - "get": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Name of storage target.", - "in": "path", - "name": "storageTargetName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "200": { - "description": "Returns the Storage Target object corresponding to storageTargetName.", - "schema": { - "$ref": "#/definitions/StorageTarget" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "StorageTargets_Get": { - "$ref": "./examples/StorageTargets_Get.json" - } - }, - "tags": [ - "StorageTargets" - ], - "description": "Returns a storage target from a cache.", - "operationId": "StorageTargets_Get" - }, - "put": { - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Name of storage target.", - "in": "path", - "name": "storageTargetName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Object containing the definition of a storage target.", - "in": "body", - "name": "storagetarget", - "schema": { - "$ref": "#/definitions/StorageTarget" - } - } - ], - "responses": { - "200": { - "description": "Storage Target has been created.", - "schema": { - "$ref": "#/definitions/StorageTarget" - } - }, - "201": { - "description": "Storage Target creation has been initiated. Poll the new Storage Target's provisioningState property to monitor creation progress.", - "schema": { - "$ref": "#/definitions/StorageTarget" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "StorageTargets_Create": { - "$ref": "./examples/StorageTargets_Create.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "StorageTargets" - ], - "description": "Create/update a storage target. This operation is allowed at any time, but if the cache is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cache is healthy again.", - "operationId": "StorageTargets_Create" - }, - "patch": { - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Name of storage target.", - "in": "path", - "name": "storageTargetName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - }, - { - "description": "Object containing the definition of a storage target.", - "in": "body", - "name": "storagetarget", - "schema": { - "$ref": "#/definitions/StorageTarget" - } - } - ], - "responses": { - "200": { - "description": "Storage Target has been patched.", - "schema": { - "$ref": "#/definitions/StorageTarget" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "StorageTargets_Update": { - "$ref": "./examples/StorageTargets_Update.json" - } - }, - "tags": [ - "StorageTargets" - ], - "description": "Update a storage target. This operation is allowed at any time, but if the cache is down or unhealthy, the actual creation/modification of the storage target may be delayed until the cache is healthy again.", - "operationId": "StorageTargets_Update" - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.StorageCache/caches/{cacheName}/upgrade": { - "post": { - "produces": [ - "application/json" - ], - "parameters": [ - { - "description": "Target resource group.", - "in": "path", - "name": "resourceGroupName", - "required": true, - "type": "string" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "description": "Name of cache.", - "in": "path", - "name": "cacheName", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "required": true, - "type": "string" - } - ], - "responses": { - "201": { - "description": "Cache firmware is up to date.", - "schema": {} - }, - "202": { - "description": "Cache has started the upgrade.", - "schema": {} - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "Caches_UpgradeFirmware": { - "$ref": "./examples/Caches_UpgradeFirmware.json" - } - }, - "x-ms-long-running-operation": true, - "tags": [ - "Caches" - ], - "description": "Tells a cache to upgrade its firmware.", - "operationId": "Caches_UpgradeFirmware" - } - } - }, - "definitions": { - "ApiOperation": { - "description": "REST API operation description: see https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/openapi-authoring-automated-guidelines.md#r3023-operationsapiimplementation", - "properties": { - "display": { - "description": "The object that represents the operation.", - "properties": { - "operation": { - "description": "Operation type: Read, write, delete, etc.", - "type": "string" - }, - "provider": { - "description": "Service provider: Microsoft.StorageCache", - "type": "string" - }, - "resource": { - "description": "Resource on which the operation is performed: cache, etc.", - "type": "string" - } - } - }, - "name": { - "description": "Operation name: {provider}/{resource}/{operation}", - "type": "string" - } - }, - "type": "object" - }, - "ApiOperationListResult": { - "description": "Result of the request to list Resource Provider operations. It contains a list of operations and a URL link to get the next set of results.", - "properties": { - "nextLink": { - "description": "URL to get the next set of operation list results if there are any.", - "type": "string" - }, - "value": { - "description": "List of Resource Provider operations supported by the Microsoft.StorageCache resource provider.", - "items": { - "$ref": "#/definitions/ApiOperation" - }, - "type": "array" - } - }, - "type": "object" - }, - "CloudError": { - "description": "An error response.", - "properties": { - "error": { - "description": "The body of the error.", - "$ref": "#/definitions/CloudErrorBody" - } - }, - "type": "object" - }, - "CloudErrorBody": { - "description": "An error response.", - "properties": { - "code": { - "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically.", - "type": "string" - }, - "details": { - "description": "A list of additional details about the error.", - "items": { - "$ref": "#/definitions/CloudErrorBody" - }, - "type": "array" - }, - "message": { - "description": "A message describing the error, intended to be suitable for display in a user interface.", - "type": "string" - }, - "target": { - "description": "The target of the particular error. For example, the name of the property in error.", - "type": "string" - } - }, - "type": "object" - }, - "Cache": { - "description": "A cache instance. Follows Azure Resource Manager standards: https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md", - "properties": { - "tags": { - "description": "ARM tags as name/value pairs.", - "type": "object" - }, - "id": { - "description": "Fully qualified URL of the cache.", - "readOnly": true, - "$ref": "#/definitions/URLString" - }, - "location": { - "description": "Region name string.", - "type": "string" - }, - "name": { - "description": "Name of cache.", - "readOnly": true, - "$ref": "#/definitions/ResourceName" - }, - "type": { - "description": "Type for the cache; Microsoft.StorageCache/Cache", - "readOnly": true, - "type": "string" - }, - "properties": { - "x-ms-client-flatten": true, - "description": "Properties for the cache.", - "properties": { - "cacheSizeGB": { - "description": "The size of this cache's cache, in GB.", - "type": "integer" - }, - "health": { - "description": "Health of the cache.", - "readOnly": true, - "$ref": "#/definitions/CacheHealth" - }, - "mountAddresses": { - "description": "Array of IP addresses that can be used by clients mounting this Cache.", - "readOnly": true, - "items": { - "type": "string" - }, - "type": "array" - }, - "provisioningState": { - "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", - "enum":[ - "Succeeded", - "Failed", - "Cancelled", - "Creating", - "Deleting", - "Updating" - ], - "x-ms-enum": { - "name": "ProvisioningStateType", - "modelAsString": true - }, - "type": "string" - }, - "subnet": { - "description": "Subnet used for the cache.", - "$ref": "#/definitions/URLString" - }, - "upgradeStatus": { - "description": "Upgrade status of the cache.", - "$ref": "#/definitions/CacheUpgradeStatus" - } - }, - "type": "object" - }, - "sku": { - "description": "Sku for the cache.", - "properties": { - "name": { - "description": "Sku name for this cache.", - "type": "string" - } - }, - "type": "object" - } - }, - "x-ms-azure-resource": true, - "type": "object" - }, - "CachesListResult": { - "description": "Result of the request to list caches. It contains a list of caches and a URL link to get the next set of results.", - "properties": { - "nextLink": { - "description": "URL to get the next set of cache list results if there are any.", - "type": "string" - }, - "value": { - "description": "List of caches.", - "items": { - "$ref": "#/definitions/Cache" - }, - "type": "array" - } - }, - "type": "object" - }, - "CacheHealth": { - "description": "An indication of cache health. Gives more information about health than just that related to provisioning.", - "properties": { - "state": { - "description": "List of cache health states.", - "enum": [ - "Unknown", - "Healthy", - "Degraded", - "Down", - "Transitioning", - "Stopping", - "Stopped", - "Upgrading", - "Flushing" - ], - "x-ms-enum": { - "name": "HealthStateType", - "modelAsString": true - }, - "type": "string" - }, - "statusDescription": { - "description": "Describes explanation of state.", - "type": "string" - } - } - }, - "CacheUpgradeStatus": { - "description": "Properties describing the software upgrade state of the cache", - "properties": { - "currentFirmwareVersion": { - "description": "Version string of the firmware currently installed on this cache.", - "type": "string", - "readOnly": true - }, - "firmwareUpdateStatus": { - "description": "True if there is a firmware update ready to install on this cache. The firmware will automatically be installed after firmwareUpdateDeadline if not triggered earlier via the upgrade operation.", - "enum": [ - "available", - "unavailable" - ], - "x-ms-enum": { - "name": "FirmwareStatusType", - "modelAsString": true - }, - "readOnly": true, - "type": "string" - }, - "firmwareUpdateDeadline": { - "description": "Time at which the pending firmware update will automatically be installed on the cache.", - "format": "date-time", - "type": "string", - "readOnly": true - }, - "lastFirmwareUpdate": { - "description": "Time of the last successful firmware update.", - "format": "date-time", - "type": "string", - "readOnly": true - }, - "pendingFirmwareVersion": { - "description": "When firmwareUpdateAvailable is true, this field holds the version string for the update.", - "type": "string", - "readOnly": true - } - }, - "type": "object" - }, - "UnknownProperties": { - "description": "Properties of an unknown type of StorageTarget", - "type": "object", - "additionalProperties": { - "type": "string" - } - }, - "Nfs3Target": { - "description": "An NFS mount point for use as a StorageTarget.", - "properties": { - "target": { - "description": "Mount string of an NFS Storage Target, ie: 10.0.44.44:/exp1", - "pattern": "^[.0-9a-zA-Z]+:/.*$", - "type": "string" - }, - "usageModel": { - "description": "Identifies the primary usage model to be used for this storage target. GET choices from .../usageModels", - "type": "string" - } - }, - "x-ms-discriminator-value": "nfs3", - "type": "object" - }, - "ClfsTarget": { - "description": "Storage container for use as a CLFS StorageTarget.", - "properties": { - "target": { - "description": "URL of storage container.", - "$ref": "#/definitions/URLString" - } - }, - "x-ms-discriminator-value": "clfs", - "type": "object" - }, - "UnknownTarget": { - "description": "Storage container for use as a Unknown StorageTarget.", - "properties": { - "unknownMap": { - "description": "Dictionary of string->string pairs containing information about the StorageTarget.", - "$ref": "#/definitions/UnknownProperties" - } - }, - "x-ms-discriminator-value": "unknown", - "type": "object" - }, - "ResourceName": { - "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate, this will contain the complete URL of the object. These names are case-preserving, but not case sensistive.", - "pattern": "^[-0-9a-zA-Z_]{1,31}$", - "type": "string" - }, - "ResourceSku": { - "description": "A resource SKU", - "properties": { - "resourceType": { - "readOnly": true, - "type": "string", - "description": "The type of resource the sku applies to." - }, - "capabilities": { - "description": "A list of capabilities of this SKU, such as throughput or ops/sec", - "items": { - "$ref": "#/definitions/ResourceSkuCapabilities" - }, - "type": "array" - }, - "locations": { - "readOnly": true, - "type": "array", - "items": { - "type": "string" - }, - "description": "The set of locations that the SKU is available. This will be supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.)." - }, - "locationInfo": { - "description": "The set of locations that the SKU is available.", - "items": { - "$ref": "#/definitions/ResourceSkuLocationInfo" - }, - "type": "array" - }, - "name": { - "description": "The name of this sku.", - "type": "string" - }, - "restrictions": { - "type": "array", - "items": { - "$ref": "#/definitions/Restriction" - }, - "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions." - } - }, - "type": "object" - }, - "Restriction": { - "properties": { - "type": { - "readOnly": true, - "type": "string", - "description": "The type of restrictions. As of now only possible value for this is location." - }, - "values": { - "readOnly": true, - "type": "array", - "items": { - "type": "string" - }, - "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted." - }, - "reasonCode": { - "type": "string", - "enum": [ - "QuotaId", - "NotAvailableForSubscription" - ], - "x-ms-enum": { - "name": "ReasonCode", - "modelAsString": true - }, - "description": "The reason for the restriction. As of now this can be \"QuotaId\" or \"NotAvailableForSubscription\". Quota Id is set when the SKU has requiredQuotas parameter as the subscription does not belong to that quota. The \"NotAvailableForSubscription\" is related to capacity at DC." - } - }, - "description": "The restriction because of which SKU cannot be used." - }, - "ResourceSkuCapabilities": { - "description": "A resource SKU capability.", - "properties": { - "name": { - "description": "Name of a capability, such as ops/sec", - "type": "string" - }, - "value": { - "description": "Quantity, if the capability is measured by quantity", - "type": "string" - } - }, - "type": "object" - }, - "ResourceSkuLocationInfo": { - "description": "Resource SKU location information.", - "properties": { - "location": { - "description": "Location where this Sku is available", - "type": "string" - }, - "zones": { - "description": "Zones if any.", - "type": "array", - "items": { - "type": "string" - } - } - }, - "type": "object" - }, - "ResourceSkusResult": { - "description": "The response from the List Cache SKUs operation.", - "properties": { - "nextLink": { - "description": "The uri to fetch the next page of cache Skus.", - "type": "string" - }, - "value": { - "description": "The list of skus available for the subscription.", - "readOnly": true, - "items": { - "$ref": "#/definitions/ResourceSku" - }, - "type": "array" - } - } - }, - "StorageTarget": { - "description": "A storage system being cached by a Cache.", - "type": "object", - "discriminator": "targetType", - "properties": { - "name": { - "description":"A fully qualified URL.", - "readOnly": true, - "$ref": "#/definitions/ResourceName" - }, - "id": { - "readOnly": true, - "type": "string", - "description": "Resource Id" - }, - "type": { - "description": "Type for the storage target; Microsoft.StorageCache/Cache/StorageTarget", - "readOnly": true, - "type": "string" - }, - "properties": { - "x-ms-client-flatten": true, - "description": "Properties of the storage target.", - "type": "object", - "properties": { - "junctions": { - "description": "List of cache namespace to target namespace associations.", - "type": "array", - "items": { - "$ref": "#/definitions/NamespaceJunction" - } - }, - "targetType": { - "description": "Type for storage target.", - "enum": [ - "nfs3", - "clfs", - "unknown" - ], - "x-ms-enum": { - "name": "StorageTargetType", - "modelAsString": true - }, - "type": "string" - }, - "provisioningState": { - "description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property", - "enum":[ - "Succeeded", - "Failed", - "Cancelled", - "Creating", - "Deleting", - "Updating" - ], - "x-ms-enum": { - "name": "ProvisioningStateType", - "modelAsString": true - }, - "type": "string" - }, - "nfs3": { - "description": "Properties when nfs3 target.", - "$ref": "#/definitions/Nfs3Target" - }, - "clfs": { - "description": "Properties when clfs target.", - "$ref": "#/definitions/ClfsTarget" - }, - "unknown": { - "description": "Properties when unknown target.", - "$ref": "#/definitions/UnknownTarget" - } - } - } - }, - "x-ms-azure-resource": true - }, - "NamespaceJunction": { - "description": "A namespace junction.", - "type": "object", - "properties": { - "namespacePath": { - "description": "Namespace path on a cache for a storage target.", - "type": "string" - }, - "targetPath": { - "description": "Path in storage target to which namespacePath points.", - "type": "string" - } - } - }, - "StorageTargetsResult": { - "description": "A list of storage targets.", - "properties": { - "nextLink": { - "description": "The uri to fetch the next page of storage targets.", - "type": "string" - }, - "value": { - "description": "The list of storage targets defined for the cache.", - "items": { - "$ref": "#/definitions/StorageTarget" - }, - "type": "array" - } - }, - "type": "object" - }, - "URLString": { - "description": "A fully qualified URL.", - "type": "string" - }, - "UsageModel": { - "description": "A usage model.", - "properties": { - "display": { - "description": "Localized information describing this usage model.", - "type": "object", - "properties": { - "description": { - "description": "String to display for this usage model.", - "type": "string" - } - } - }, - "modelName": { - "description": "Non localized keyword naming this usage model.", - "type": "string" - }, - "targetType": { - "description": "The type of Storage Target to which this model is applicable (only nfs for now)", - "type": "string" - } - }, - "type": "object" - }, - "UsageModelsResult": { - "description": "A list of cache usage models.", - "properties": { - "nextLink": { - "description": "The uri to fetch the next page of cache usage models.", - "type": "string" - }, - "value": { - "description": "The list of usage models available for the subscription.", - "items": { - "$ref": "#/definitions/UsageModel" - }, - "type": "array" - } - }, - "type": "object" - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - } - } -} From 344318a8f85da8d5c231a0035dd03ddc4e00953b Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Tue, 27 Aug 2019 15:29:38 -0400 Subject: [PATCH 30/35] Add support for other languages and remove Tag 2019-06-01-preview from readme.md --- .../resource-manager/readme.csharp.md | 13 ++++++ .../resource-manager/readme.go.md | 19 +++++++++ .../resource-manager/readme.java.md | 26 ++++++++++++ .../storagecache/resource-manager/readme.md | 41 ++++++++++++++----- .../resource-manager/readme.nodejs.md | 14 +++++++ .../resource-manager/readme.ruby.md | 19 +++++++++ .../resource-manager/readme.typescript.md | 13 ++++++ 7 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 specification/storagecache/resource-manager/readme.csharp.md create mode 100644 specification/storagecache/resource-manager/readme.go.md create mode 100644 specification/storagecache/resource-manager/readme.java.md create mode 100644 specification/storagecache/resource-manager/readme.nodejs.md create mode 100644 specification/storagecache/resource-manager/readme.ruby.md create mode 100644 specification/storagecache/resource-manager/readme.typescript.md diff --git a/specification/storagecache/resource-manager/readme.csharp.md b/specification/storagecache/resource-manager/readme.csharp.md new file mode 100644 index 000000000000..8dc92be5e60c --- /dev/null +++ b/specification/storagecache/resource-manager/readme.csharp.md @@ -0,0 +1,13 @@ +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 1 + clear-output-folder: true + client-side-validation: false + namespace: Microsoft.Azure.Management.Storagecache + output-folder: $(csharp-sdks-folder)/storagecache/Microsoft.Azure.Management.Storagecache/src/Generated +``` diff --git a/specification/storagecache/resource-manager/readme.go.md b/specification/storagecache/resource-manager/readme.go.md new file mode 100644 index 000000000000..8b8cdb232630 --- /dev/null +++ b/specification/storagecache/resource-manager/readme.go.md @@ -0,0 +1,19 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +```yaml $(go) +go: + license-header: MICROSOFT_APACHE_NO_VERSION + namespace: storagecache + clear-output-folder: true +``` + +### Tag: package-package-2019-08 and go + +These settings apply only when `--tag=package-package-2019-08 --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-package-2019-08' && $(go) +output-folder: $(go-sdks-folder)/services/$(namespace)/mgmt/2019-08/$(namespace) +``` diff --git a/specification/storagecache/resource-manager/readme.java.md b/specification/storagecache/resource-manager/readme.java.md new file mode 100644 index 000000000000..db7ff2df6f12 --- /dev/null +++ b/specification/storagecache/resource-manager/readme.java.md @@ -0,0 +1,26 @@ +## Java + +These settings apply only when `--java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(java) +azure-arm: true +fluent: true +namespace: com.microsoft.azure.management.storagecache +license-header: MICROSOFT_MIT_NO_CODEGEN +payload-flattening-threshold: 1 +output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-storagecache +``` + +### Tag: package-2019-08 and java + +These settings apply only when `--tag=package-2019-08 --java` is specified on the command line. +Please also specify the `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'package-2019-08' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.storagecache.v2019_08_01 + output-folder: $(azure-libraries-for-java-folder)/storagecache/resource-manager/v2019_08_01 +regenerate-manager: true +generate-interface: true +``` diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md index e0344573ca40..9b9d5a120091 100644 --- a/specification/storagecache/resource-manager/readme.md +++ b/specification/storagecache/resource-manager/readme.md @@ -29,16 +29,6 @@ openapi-type: arm tag: package-2019-08 ``` - -### Tag: package-2019-06 - -These settings apply only when `--tag=package-2019-06` is specified on the command line. - -``` yaml $(tag) == 'package-2019-06' -input-file: -- Microsoft.StorageCache/preview/2019-06-01-preview/storagecache.json -``` - ### Tag: package-2019-08 These settings apply only when `--tag=package-2019-08` is specified on the command line. @@ -56,9 +46,40 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-python + - repo: azure-sdk-for-net + - repo: azure-sdk-for-java + - repo: azure-sdk-for-go + - repo: azure-sdk-for-js + - repo: azure-sdk-for-ruby + - repo: azure-sdk-for-node + after_scripts: + - bundle install && rake arm:regen_all_profiles['azure_mgmt_storagecache'] ``` ## Python See configuration in [readme.python.md](./readme.python.md) +## C# + +See configuration in [readme.csharp.md](./readme.csharp.md) + +## Java + +See configuration in [readme.java.md](./readme.java.md) + +## Go + +See configuration in [readme.go.md](./readme.go.md) + +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + +## Ruby + +See configuration in [readme.ruby.md](./readme.ruby.md) + +## Node.js + +See configuration in [readme.nodejs.md](./readme.nodejs.md) diff --git a/specification/storagecache/resource-manager/readme.nodejs.md b/specification/storagecache/resource-manager/readme.nodejs.md new file mode 100644 index 000000000000..bf481146e8cd --- /dev/null +++ b/specification/storagecache/resource-manager/readme.nodejs.md @@ -0,0 +1,14 @@ +## Node.js + +These settings apply only when `--nodejs` is specified on the command line. +Please also specify `--node-sdks-folder=`. + +``` yaml $(nodejs) +nodejs: + azure-arm: true + package-name: azure-arm-storagecache + output-folder: $(node-sdks-folder)/lib/services/storagecache + generate-license-txt: true + generate-package-json: true + generate-readme-md: true +``` diff --git a/specification/storagecache/resource-manager/readme.ruby.md b/specification/storagecache/resource-manager/readme.ruby.md new file mode 100644 index 000000000000..004e9b9f00ea --- /dev/null +++ b/specification/storagecache/resource-manager/readme.ruby.md @@ -0,0 +1,19 @@ +## Ruby + +These settings apply only when `--ruby` is specified on the command line. + +```yaml +package-name: azure_mgmt_storagecache +package-version: 2019-08-01 +azure-arm: true +``` + +### Tag: package-2019-12-01 and ruby + +These settings apply only when `--tag=package-2019-08-01 --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2019-08-01' && $(ruby) +namespace: "Azure::StorageCache::Mgmt::V2019_08_01" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_storagecache/lib +``` diff --git a/specification/storagecache/resource-manager/readme.typescript.md b/specification/storagecache/resource-manager/readme.typescript.md new file mode 100644 index 000000000000..3c8bc521c8c9 --- /dev/null +++ b/specification/storagecache/resource-manager/readme.typescript.md @@ -0,0 +1,13 @@ +## TypeScript + +These settings apply only when `--typescript` is specified on the command line. +Please also specify `--typescript-sdks-folder=`. + +``` yaml $(typescript) +typescript: + azure-arm: true + package-name: "@azure/arm-storagecache" + payload-flattening-threshold: 2 + output-folder: "$(typescript-sdks-folder)/sdk/storagecache/arm-storagecache" + generate-metadata: true +``` From b81eda063b3c513e850969da7611a708e4320626 Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Tue, 27 Aug 2019 15:34:20 -0400 Subject: [PATCH 31/35] Fix typo and add custom words --- custom-words.txt | 4 ++++ .../preview/2019-08-01-preview/storagecache.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 46592c167985..ca4d131a8586 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -242,6 +242,9 @@ CIDR CIDRs CIFS ciphertext +Clfs +CLFS +clfs Clickthrough clientaccesspolicy clienterror @@ -1325,6 +1328,7 @@ storageaccounts storagedatalake storageimportexport storagesync +storagetarget storageuri storsimple streamanalytics diff --git a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json index 98f952101e57..f214b3cd01a3 100644 --- a/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json +++ b/specification/storagecache/resource-manager/Microsoft.StorageCache/preview/2019-08-01-preview/storagecache.json @@ -1359,7 +1359,7 @@ "type": "object" }, "ResourceName": { - "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate, this will contain the complete URL of the object. These names are case-preserving, but not case sensistive.", + "description": "Schema for the name of resources served by this provider. Note that objects will contain an odata @id annotation as appropriate, this will contain the complete URL of the object. These names are case-preserving, but not case sensitive.", "pattern": "^[-0-9a-zA-Z_]{1,31}$", "type": "string" }, From 7f4d8e25e86e340118d3621c83e7f5280216d5cb Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Tue, 27 Aug 2019 16:39:51 -0400 Subject: [PATCH 32/35] Add preview subfolder for supporting GO SDK Remove Node.js triggers for SDK generation --- custom-words.txt | 2 -- .../storagecache/resource-manager/readme.go.md | 2 +- .../storagecache/resource-manager/readme.md | 3 --- .../storagecache/resource-manager/readme.nodejs.md | 14 -------------- 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 specification/storagecache/resource-manager/readme.nodejs.md diff --git a/custom-words.txt b/custom-words.txt index ca4d131a8586..adec8fb8ab3c 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -242,8 +242,6 @@ CIDR CIDRs CIFS ciphertext -Clfs -CLFS clfs Clickthrough clientaccesspolicy diff --git a/specification/storagecache/resource-manager/readme.go.md b/specification/storagecache/resource-manager/readme.go.md index 8b8cdb232630..475bfb9db599 100644 --- a/specification/storagecache/resource-manager/readme.go.md +++ b/specification/storagecache/resource-manager/readme.go.md @@ -15,5 +15,5 @@ These settings apply only when `--tag=package-package-2019-08 --go` is specified Please also specify `--go-sdks-folder=`. ```yaml $(tag) == 'package-package-2019-08' && $(go) -output-folder: $(go-sdks-folder)/services/$(namespace)/mgmt/2019-08/$(namespace) +output-folder: $(go-sdks-folder)/services/preview/$(namespace)/mgmt/2019-08/$(namespace) ``` diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md index 9b9d5a120091..ddee19c6c771 100644 --- a/specification/storagecache/resource-manager/readme.md +++ b/specification/storagecache/resource-manager/readme.md @@ -80,6 +80,3 @@ See configuration in [readme.typescript.md](./readme.typescript.md) See configuration in [readme.ruby.md](./readme.ruby.md) -## Node.js - -See configuration in [readme.nodejs.md](./readme.nodejs.md) diff --git a/specification/storagecache/resource-manager/readme.nodejs.md b/specification/storagecache/resource-manager/readme.nodejs.md deleted file mode 100644 index bf481146e8cd..000000000000 --- a/specification/storagecache/resource-manager/readme.nodejs.md +++ /dev/null @@ -1,14 +0,0 @@ -## Node.js - -These settings apply only when `--nodejs` is specified on the command line. -Please also specify `--node-sdks-folder=`. - -``` yaml $(nodejs) -nodejs: - azure-arm: true - package-name: azure-arm-storagecache - output-folder: $(node-sdks-folder)/lib/services/storagecache - generate-license-txt: true - generate-package-json: true - generate-readme-md: true -``` From 570b6f73542c34f1eb0ab0a85e44b4d929ff55b6 Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Tue, 27 Aug 2019 17:10:50 -0400 Subject: [PATCH 33/35] Fix output folder path for GO SDK and fix typo in Tag --- specification/storagecache/resource-manager/readme.go.md | 8 ++++---- specification/storagecache/resource-manager/readme.md | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/specification/storagecache/resource-manager/readme.go.md b/specification/storagecache/resource-manager/readme.go.md index 475bfb9db599..6cefa8fb7cd2 100644 --- a/specification/storagecache/resource-manager/readme.go.md +++ b/specification/storagecache/resource-manager/readme.go.md @@ -9,11 +9,11 @@ go: clear-output-folder: true ``` -### Tag: package-package-2019-08 and go +### Tag: package-2019-08 and go -These settings apply only when `--tag=package-package-2019-08 --go` is specified on the command line. +These settings apply only when `--tag=package-2019-08 --go` is specified on the command line. Please also specify `--go-sdks-folder=`. -```yaml $(tag) == 'package-package-2019-08' && $(go) -output-folder: $(go-sdks-folder)/services/preview/$(namespace)/mgmt/2019-08/$(namespace) +```yaml $(tag) == 'package-2019-08' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-08-15/$(namespace) ``` diff --git a/specification/storagecache/resource-manager/readme.md b/specification/storagecache/resource-manager/readme.md index ddee19c6c771..ff8ed4822218 100644 --- a/specification/storagecache/resource-manager/readme.md +++ b/specification/storagecache/resource-manager/readme.md @@ -51,7 +51,6 @@ swagger-to-sdk: - repo: azure-sdk-for-go - repo: azure-sdk-for-js - repo: azure-sdk-for-ruby - - repo: azure-sdk-for-node after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_storagecache'] ``` From 908e3cd2e18a38be0711e03035c7acdc7ab6d1f2 Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Wed, 28 Aug 2019 09:05:13 -0400 Subject: [PATCH 34/35] Fix version in the path of output folder for GO SDK --- specification/storagecache/resource-manager/readme.go.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/storagecache/resource-manager/readme.go.md b/specification/storagecache/resource-manager/readme.go.md index 6cefa8fb7cd2..d11946e954ce 100644 --- a/specification/storagecache/resource-manager/readme.go.md +++ b/specification/storagecache/resource-manager/readme.go.md @@ -15,5 +15,5 @@ These settings apply only when `--tag=package-2019-08 --go` is specified on the Please also specify `--go-sdks-folder=`. ```yaml $(tag) == 'package-2019-08' && $(go) -output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2017-08-15/$(namespace) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-08/$(namespace) ``` From b62ee6d4c07c3758fb33db8851a038121b68c49a Mon Sep 17 00:00:00 2001 From: Rohit Mahamuni Date: Thu, 29 Aug 2019 10:35:17 -0400 Subject: [PATCH 35/35] Fix tag for ruby SDK --- .../storagecache/resource-manager/readme.ruby.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/storagecache/resource-manager/readme.ruby.md b/specification/storagecache/resource-manager/readme.ruby.md index 004e9b9f00ea..209e042d0485 100644 --- a/specification/storagecache/resource-manager/readme.ruby.md +++ b/specification/storagecache/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_storagecache -package-version: 2019-08-01 +package-version: 2019-08 azure-arm: true ``` -### Tag: package-2019-12-01 and ruby +### Tag: package-2019-08 and ruby -These settings apply only when `--tag=package-2019-08-01 --ruby` is specified on the command line. +These settings apply only when `--tag=package-2019-08 --ruby` is specified on the command line. Please also specify `--ruby-sdks-folder=`. -```yaml $(tag) == 'package-2019-08-01' && $(ruby) -namespace: "Azure::StorageCache::Mgmt::V2019_08_01" +```yaml $(tag) == 'package-2019-08' && $(ruby) +namespace: "Azure::StorageCache::Mgmt::V2019_08" output-folder: $(ruby-sdks-folder)/management/azure_mgmt_storagecache/lib ```