From 27c0982ff348ea856dda22d6ca96526e6b546ee8 Mon Sep 17 00:00:00 2001 From: leonard Date: Tue, 20 Nov 2018 08:04:47 +0000 Subject: [PATCH 01/14] NFSAAS-1505 minor update and validation fixes --- .../examples/MountTargets_Delete.json | 15 ------- .../preview/2017-08-15/netapp.json | 45 ++++++++----------- 2 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json deleted file mode 100644 index 5ba8004905e4..000000000000 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", - "accountName": "accountName", - "poolName": "poolName", - "volumeName": "volumeName", - "mountTargetName": "mountTargetName", - "api-version": "2017-08-15" - }, - "responses": { - "204": {}, - "202": {} - } -} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 103a2b754cf7..e7392ca8f979 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -49,6 +49,9 @@ "$ref": "#/parameters/ApiVersionParameter" } ], + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", @@ -83,6 +86,9 @@ "NetApp Accounts" ], "operationId": "Accounts_List", + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", @@ -272,6 +278,9 @@ "Capacity Pools" ], "operationId": "Pools_List", + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", @@ -467,6 +476,9 @@ "Volumes" ], "operationId": "Volumes_List", + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", @@ -668,6 +680,9 @@ ], "operationId": "MountTargets_List", "description": "List mount targets", + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", @@ -738,33 +753,6 @@ "$ref": "examples/MountTargets_Get.json" } } - }, - "delete": { - "tags": [ - "MountTargets" - ], - "operationId": "MountTargets_Delete", - "description": "Delete mount target", - "responses": { - "202": { - "description": "Accepted -- Create or update request accepted; operation will complete asynchronously" - }, - "204": { - "description": "NoContent -- Resource does not exist." - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/error" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-examples": { - "MountTargets_Delete": { - "$ref": "examples/MountTargets_Delete.json" - } - } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/snapshots": { @@ -794,6 +782,9 @@ ], "operationId": "Snapshots_List", "description": "List snapshots", + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", From d23b068b8b85841a849e8c85b73ed3085ce16330 Mon Sep 17 00:00:00 2001 From: leonard Date: Mon, 26 Nov 2018 08:06:09 +0000 Subject: [PATCH 02/14] NFSAAS-1505 bring in line with RP Put (and patch) for snapshots. Service level definition changes. --- .../2017-08-15/examples/Snapshots_Create.json | 27 +++ .../2017-08-15/examples/Snapshots_Update.json | 26 +++ .../preview/2017-08-15/netapp.json | 173 ++++++++++++++---- 3 files changed, 190 insertions(+), 36 deletions(-) create mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json create mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json new file mode 100644 index 000000000000..bcd7b8bcfafe --- /dev/null +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "subscriptionId", + "resourceGroup": "resourceGroup", + "accountName": "accountName", + "poolName": "poolName", + "volumeName": "volumeName", + "snapshotName": "snapshotName", + "api-version": "2017-08-15", + "body": {} + }, + "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333", + "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", + "creationDate": "2017-08-15T13:23:33Z", + "name": "snapshot1", + "provisioningState": "Created" + } + } + }, + "202": {} + } +} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json new file mode 100644 index 000000000000..fb3c11191136 --- /dev/null +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "subscriptionId", + "resourceGroup": "resourceGroup", + "accountName": "accountName", + "poolName": "poolName", + "volumeName": "volumeName", + "snapshotName": "snapshotName", + "api-version": "2017-08-15", + "body": {} + }, + "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333", + "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", + "creationDate": "2017-08-15T13:23:33Z", + "name": "snapshot1", + "provisioningState": "Created" + } + } + } + } +} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index e7392ca8f979..e7095b3d6144 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -856,6 +856,84 @@ } } }, + "put": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Create", + "description": "Create a snapshot", + "parameters": [ + { + "name": "body", + "description": "Snapshot object supplied in the body of the operation.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/snapshot" + } + } + ], + "responses": { + "200": { + "description": "Snapshot created", + "schema": { + "$ref": "#/definitions/snapshot" + } + }, + "202": { + "description": "Accepted -- Create request accepted; operation will complete asynchronously" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/error" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Snapshots_Create": { + "$ref": "examples/Snapshots_Create.json" + } + } + }, + "patch": { + "tags": [ + "Snapshots" + ], + "operationId": "Snapshots_Update", + "description": "Patch a snapshot", + "parameters": [ + { + "name": "body", + "description": "Snapshot object supplied in the body of the operation.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/snapshotPatch" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/snapshot" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/error" + } + } + }, + "x-ms-examples": { + "Snapshots_Update": { + "$ref": "examples/Snapshots_Update.json" + } + } + }, "delete": { "tags": [ "Snapshots" @@ -1200,27 +1278,24 @@ "size": { "title": "size", "type": "integer", - "description": "Provisioned size of the pool (in GB)", - "minimum": 4096, - "default": 4096 + "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104).", + "minimum": 4398046511104, + "maximum": 549755813888000, + "default": 4398046511104 }, "serviceLevel": { "title": "serviceLevel", "type": "string", "description": "The service level of the file system", "enum": [ - "Basic", "Standard", - "Premium" + "Premium", + "Extreme" ], "x-ms-enum": { "name": "ServiceLevel", "modelAsString": true, "values": [ - { - "value": "Basic", - "description": "Basic service level" - }, { "value": "Standard", "description": "Standard service level" @@ -1228,11 +1303,15 @@ { "value": "Premium", "description": "Premium service level" + }, + { + "value": "Extreme", + "description": "Extreme service level" } ] }, - "example": "Premium", - "default": "Standard" + "example": "Extreme", + "default": "Premium" }, "provisioningState": { "type": "string", @@ -1338,18 +1417,14 @@ "type": "string", "description": "The service level of the file system", "enum": [ - "Basic", "Standard", - "Premium" + "Premium", + "Extreme" ], "x-ms-enum": { "name": "ServiceLevel", "modelAsString": true, "values": [ - { - "value": "Basic", - "description": "Basic service level" - }, { "value": "Standard", "description": "Standard service level" @@ -1357,21 +1432,25 @@ { "value": "Premium", "description": "Premium service level" + }, + { + "value": "Extreme", + "description": "Extreme service level" } ] }, - "example": "Premium", - "default": "Standard" + "example": "Extreme", + "default": "Premium" }, "usageThreshold": { "title": "usageThreshold", "type": "integer", "format": "int64", - "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Upper limit is 100TB.", - "minimum": 0, + "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.", + "minimum": 107374182400, "maximum": 109951162777600, - "default": 0, - "example": 101010 + "default": 107374182400, + "example": 107374182400 }, "provisioningState": { "type": "string", @@ -1434,18 +1513,14 @@ "type": "string", "description": "The service level of the file system", "enum": [ - "Basic", "Standard", - "Premium" + "Premium", + "Extreme" ], "x-ms-enum": { "name": "ServiceLevel", "modelAsString": true, "values": [ - { - "value": "Basic", - "description": "Basic service level" - }, { "value": "Standard", "description": "Standard service level" @@ -1453,21 +1528,25 @@ { "value": "Premium", "description": "Premium service level" + }, + { + "value": "Extreme", + "description": "Extreme service level" } ] }, - "example": "Premium", - "default": "Standard" + "example": "Extreme", + "default": "Premium" }, "usageThreshold": { "title": "usageThreshold", "type": "integer", "format": "int64", - "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Upper limit is 100TB.", - "minimum": 0, + "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.", + "minimum": 107374182400, "maximum": 109951162777600, - "default": 0, - "example": 101010 + "default": 107374182400, + "example": 107374182400 } } }, @@ -1611,6 +1690,7 @@ "snapshot": { "description": "Snapshot of a Volume", "type": "object", + "x-ms-azure-resource": true, "required": [ "location", "properties" @@ -1618,7 +1698,11 @@ "properties": { "location": { "type": "string", - "description": "Resource location" + "description": "Resource location", + "x-ms-mutability": [ + "read", + "create" + ] }, "id": { "type": "string", @@ -1630,6 +1714,11 @@ "readOnly": true, "description": "Resource name" }, + "type": { + "type": "string", + "readOnly": true, + "description": "Resource type" + }, "tags": { "description": "Resource tags", "$ref": "#/definitions/resourceTags", @@ -1642,6 +1731,18 @@ } } }, + "snapshotPatch": { + "description": "Snapshot patch", + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "tags": { + "description": "Resource tags", + "$ref": "#/definitions/resourceTags", + "x-ms-client-flatten": true + } + } + }, "snapshotProperties": { "description": "Snapshot properties", "type": "object", From 2e3393a80846290eda0c1c2ac85db6dc847c231a Mon Sep 17 00:00:00 2001 From: leonard Date: Tue, 27 Nov 2018 18:59:47 +0000 Subject: [PATCH 03/14] NFSAAS-1505 correct resource reference and limits --- .../preview/2017-08-15/examples/Pools_CreateOrUpdate.json | 4 ++-- .../preview/2017-08-15/examples/Pools_Get.json | 2 +- .../preview/2017-08-15/examples/Pools_List.json | 2 +- .../preview/2017-08-15/examples/Pools_Update.json | 2 +- .../2017-08-15/examples/Volumes_CreateOrUpdate.json | 4 ++-- .../preview/2017-08-15/examples/Volumes_Get.json | 4 ++-- .../preview/2017-08-15/examples/Volumes_List.json | 4 ++-- .../preview/2017-08-15/examples/Volumes_Update.json | 2 +- .../Microsoft.NetApp/preview/2017-08-15/netapp.json | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json index c3b0ff61a100..8674438c325e 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json @@ -16,10 +16,10 @@ "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", - "size": 12345 + "size": 4398046511104 } } - }, + }, "202": {} } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json index 326433caa272..39ba8ffaa1c8 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json @@ -15,7 +15,7 @@ "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", - "size": 12345 + "size": 4398046511104 } } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json index e4dbb0624a0a..ddc46ca7bd61 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json @@ -16,7 +16,7 @@ "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", - "size": 12345 + "size": 4398046511104 } } ] diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json index 2dfb6f0d7166..6faa8404ec8d 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json @@ -16,7 +16,7 @@ "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", - "size": 12345 + "size": 4398046511104 } } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json index fd4a9a31e044..91f5cfbba280 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json @@ -16,10 +16,10 @@ "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", "name": "myvolume", "creationToken": "some-amazing-filepath", - "usageThreshold": 101010, + "usageThreshold": 107374182400, "serviceLevel": "Premium", "provisioningState": "Created", - "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" } } }, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json index db4770e998c4..31a895158193 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json @@ -15,10 +15,10 @@ "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", "name": "myvolume", "creationToken": "some-amazing-filepath", - "usageThreshold": 101010, + "usageThreshold": 107374182400, "serviceLevel": "Premium", "provisioningState": "Created", - "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" } } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json index 73b7c041619e..a532627e9f5e 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json @@ -16,10 +16,10 @@ "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", "name": "myvolume", "creationToken": "some-amazing-filepath", - "usageThreshold": 101010, + "usageThreshold": 107374182400, "serviceLevel": "Premium", "provisioningState": "Created", - "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" } } ] diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json index 43e41f274568..f0938be3e993 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json @@ -16,7 +16,7 @@ "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", "name": "myvolume", "creationToken": "some-amazing-filepath", - "usageThreshold": 101010, + "usageThreshold": 107374182400, "serviceLevel": "Premium", "provisioningState": "Created" } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index e7095b3d6144..4d7c7bf1df22 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -68,7 +68,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -110,7 +110,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -257,7 +257,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -302,7 +302,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" From f81874bcaa4947bfa609ff14d55eb9629000ee40 Mon Sep 17 00:00:00 2001 From: leonard Date: Tue, 4 Dec 2018 17:22:09 +0000 Subject: [PATCH 04/14] NFSAAS-1505 resource and property changes Incorrect pool resource reference Name elements of property not required Correction to return status code --- .../preview/2017-08-15/netapp.json | 69 +++---------------- 1 file changed, 11 insertions(+), 58 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 4d7c7bf1df22..231f208129d3 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -169,7 +169,7 @@ } ], "responses": { - "200": { + "201": { "description": "Account created", "schema": { "$ref": "#/definitions/netAppAccount" @@ -257,7 +257,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -302,7 +302,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -364,7 +364,7 @@ } ], "responses": { - "200": { + "201": { "description": "Pool created or updated", "schema": { "$ref": "#/definitions/capacityPool" @@ -452,7 +452,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -500,7 +500,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -653,7 +653,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/mountTargets": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -704,7 +704,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/mountTargets/{mountTargetName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets/{mountTargetName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -755,7 +755,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/snapshots": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -806,7 +806,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -1165,16 +1165,6 @@ "description": "NetApp account properties", "type": "object", "properties": { - "accountId": { - "title": "accountId", - "type": "string", - "readOnly": true, - "description": "UUID v4 used to identify the Account", - "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", - "maxLength": 36, - "minLength": 36, - "example": "9760acf5-4638-11e7-9bdb-020073ca7778" - }, "provisioningState": { "type": "string", "readOnly": true, @@ -1252,19 +1242,7 @@ "poolProperties": { "description": "Pool properties", "type": "object", - "required": [ - "accountId" - ], "properties": { - "accountId": { - "title": "accountId", - "type": "string", - "description": "UUID v4 used to identify the Account", - "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", - "maxLength": 36, - "minLength": 36, - "example": "9760acf5-4638-11e7-9bdb-020073ca7778" - }, "poolId": { "title": "poolId", "type": "string", @@ -1278,6 +1256,7 @@ "size": { "title": "size", "type": "integer", + "format": "int64", "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104).", "minimum": 4398046511104, "maximum": 549755813888000, @@ -1398,12 +1377,6 @@ "minLength": 36, "example": "9760acf5-4638-11e7-9bdb-020073ca7778" }, - "name": { - "title": "FileSystem name", - "type": "string", - "description": "FileSystem name", - "example": "myvolume" - }, "creationToken": { "title": "Creation Token or File Path", "type": "string", @@ -1502,12 +1475,6 @@ "description": "Patchable volume properties", "type": "object", "properties": { - "name": { - "title": "FileSystem name", - "type": "string", - "description": "FileSystem name", - "example": "myvolume" - }, "serviceLevel": { "title": "serviceLevel", "type": "string", @@ -1630,13 +1597,6 @@ "readOnly": true, "example": "1.2.3.4" }, - "name": { - "title": "name", - "type": "string", - "readOnly": true, - "description": "The name of the mount target", - "example": "mountTarget1" - }, "vlanId": { "title": "vlanid", "type": "integer", @@ -1769,13 +1729,6 @@ "minLength": 36, "example": "9760acf5-4638-11e7-9bdb-020073ca3333" }, - "name": { - "title": "name", - "type": "string", - "readOnly": true, - "description": "The name of the snapshot", - "example": "snapshot1" - }, "creationDate": { "title": "name", "type": "string", From 7ec6b9ec2d43e53e616aa5bffe12e2a59efc33ef Mon Sep 17 00:00:00 2001 From: leonard Date: Tue, 4 Dec 2018 21:48:02 +0000 Subject: [PATCH 05/14] NFSAAS-1505 status codes --- .../Microsoft.NetApp/preview/2017-08-15/netapp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 231f208129d3..a7ed1ecd4745 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -565,7 +565,7 @@ } ], "responses": { - "200": { + "201": { "description": "Volume created or updated", "schema": { "$ref": "#/definitions/volume" @@ -874,7 +874,7 @@ } ], "responses": { - "200": { + "201": { "description": "Snapshot created", "schema": { "$ref": "#/definitions/snapshot" From 79df0245295de6b13e4702600bd5a7a1deeffb91 Mon Sep 17 00:00:00 2001 From: leonard Date: Wed, 5 Dec 2018 07:38:57 +0000 Subject: [PATCH 06/14] NFSAAS-1505 tidy up examples --- .../preview/2017-08-15/examples/Pools_CreateOrUpdate.json | 1 - .../Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json | 1 - .../Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json | 1 - .../preview/2017-08-15/examples/Pools_Update.json | 1 - 4 files changed, 4 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json index 8674438c325e..4878793f44db 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json @@ -12,7 +12,6 @@ "body": { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json index 39ba8ffaa1c8..25aed0d6e384 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json @@ -11,7 +11,6 @@ "body": { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json index ddc46ca7bd61..5bccee6836c3 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json @@ -12,7 +12,6 @@ { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json index 6faa8404ec8d..6a8308ab5fc0 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json @@ -12,7 +12,6 @@ "body": { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created", "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", "serviceLevel": "Premium", From 728ffb4eeab8e295fb4f6485d8c82d824aa0b055 Mon Sep 17 00:00:00 2001 From: leonard Date: Wed, 5 Dec 2018 08:05:44 +0000 Subject: [PATCH 07/14] NFSAAS-1505 tidy up examples --- .../preview/2017-08-15/examples/Accounts_CreateOrUpdate.json | 3 +-- .../preview/2017-08-15/examples/Accounts_Get.json | 1 - .../preview/2017-08-15/examples/Accounts_List.json | 1 - .../preview/2017-08-15/examples/Accounts_Update.json | 1 - .../preview/2017-08-15/examples/MountTargets_Get.json | 1 - .../preview/2017-08-15/examples/MountTargets_List.json | 1 - .../preview/2017-08-15/examples/Pools_CreateOrUpdate.json | 2 +- .../preview/2017-08-15/examples/Snapshots_Create.json | 3 +-- .../preview/2017-08-15/examples/Snapshots_Get.json | 1 - .../preview/2017-08-15/examples/Snapshots_List.json | 1 - .../preview/2017-08-15/examples/Snapshots_Update.json | 1 - .../preview/2017-08-15/examples/Volumes_CreateOrUpdate.json | 3 +-- .../preview/2017-08-15/examples/Volumes_Get.json | 1 - .../preview/2017-08-15/examples/Volumes_List.json | 1 - .../preview/2017-08-15/examples/Volumes_Update.json | 1 - 15 files changed, 4 insertions(+), 18 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json index 927adc27928e..c60a0a23b150 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json @@ -7,11 +7,10 @@ "body": {} }, "responses": { - "200": { + "201": { "body": { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json index 1a2a98020a18..5147ae612456 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json @@ -10,7 +10,6 @@ "body": { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json index 84191dc2bc71..f1f7d17d6077 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json @@ -11,7 +11,6 @@ { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json index 157edf9f1627..c03d2dd45953 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json @@ -11,7 +11,6 @@ "body": { "location": "eastus", "properties": { - "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json index daed397cc47c..1571403b994d 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json @@ -15,7 +15,6 @@ "properties": { "endIp": "1.2.3.4", "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "name": "mountTarget1", "startIp": "1.2.3.4", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", "vlanId": 1337, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json index 8bc21a197dcd..bcd4a56f85b9 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json @@ -16,7 +16,6 @@ "properties": { "endIp": "1.2.3.4", "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "name": "mountTarget1", "startIp": "1.2.3.4", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", "vlanId": 1337, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json index 4878793f44db..10e856ed8e0a 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json @@ -8,7 +8,7 @@ "body": {} }, "responses": { - "200": { + "201": { "body": { "location": "eastus", "properties": { diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json index bcd7b8bcfafe..8cc5b55490ed 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json @@ -10,14 +10,13 @@ "body": {} }, "responses": { - "200": { + "201": { "body": { "location": "eastus", "properties": { "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", "creationDate": "2017-08-15T13:23:33Z", - "name": "snapshot1", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json index 5c660d874a8a..1869ef8f13de 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json @@ -16,7 +16,6 @@ "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", "creationDate": "2017-08-15T13:23:33Z", - "name": "snapshot1", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json index e71030ad44c2..61fc3f1f5ec0 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json @@ -17,7 +17,6 @@ "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", "creationDate": "2017-08-15T13:23:33Z", - "name": "snapshot1", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json index fb3c11191136..cfbb9f2dbff0 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json @@ -17,7 +17,6 @@ "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", "creationDate": "2017-08-15T13:23:33Z", - "name": "snapshot1", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json index 91f5cfbba280..a33791786874 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json @@ -9,12 +9,11 @@ "body": {} }, "responses": { - "200": { + "201": { "body": { "location": "eastus", "properties": { "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", - "name": "myvolume", "creationToken": "some-amazing-filepath", "usageThreshold": 107374182400, "serviceLevel": "Premium", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json index 31a895158193..67bd0e2abbd3 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json @@ -13,7 +13,6 @@ "location": "eastus", "properties": { "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", - "name": "myvolume", "creationToken": "some-amazing-filepath", "usageThreshold": 107374182400, "serviceLevel": "Premium", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json index a532627e9f5e..152c8d088946 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json @@ -14,7 +14,6 @@ "location": "eastus", "properties": { "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", - "name": "myvolume", "creationToken": "some-amazing-filepath", "usageThreshold": 107374182400, "serviceLevel": "Premium", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json index f0938be3e993..98002937dd14 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json @@ -14,7 +14,6 @@ "location": "eastus", "properties": { "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", - "name": "myvolume", "creationToken": "some-amazing-filepath", "usageThreshold": 107374182400, "serviceLevel": "Premium", From b820b48d948e6792ff5c9cd5028c41a7f60aef75 Mon Sep 17 00:00:00 2001 From: leonard Date: Tue, 11 Dec 2018 14:37:20 +0000 Subject: [PATCH 08/14] NFSAAS-1644 remove mt get and add put status code --- .../2017-08-15/examples/MountTargets_Get.json | 29 -------- .../examples/Pools_CreateOrUpdate.json | 11 +++ .../examples/Volumes_CreateOrUpdate.json | 13 ++++ .../preview/2017-08-15/netapp.json | 67 ++++--------------- 4 files changed, 38 insertions(+), 82 deletions(-) delete mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json deleted file mode 100644 index 1571403b994d..000000000000 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", - "accountName": "accountName", - "poolName": "poolName", - "volumeName": "volumeName", - "mountTargetName": "mountTargetName", - "api-version": "2017-08-15" - }, - "responses": { - "200": { - "body": { - "location": "eastus", - "properties": { - "endIp": "1.2.3.4", - "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "startIp": "1.2.3.4", - "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "vlanId": 1337, - "netmask": "255.255.255.0", - "ipAddress": "1.2.3.4", - "gateway": "1.2.3.4", - "provisioningState": "Created" - } - } - } - } -} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json index 10e856ed8e0a..963096c1c441 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json @@ -8,6 +8,17 @@ "body": {} }, "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "provisioningState": "Created", + "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", + "serviceLevel": "Premium", + "size": 4398046511104 + } + } + }, "201": { "body": { "location": "eastus", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json index a33791786874..9caac72ce596 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json @@ -9,6 +9,19 @@ "body": {} }, "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", + "creationToken": "some-amazing-filepath", + "usageThreshold": 107374182400, + "serviceLevel": "Premium", + "provisioningState": "Created", + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + } + } + }, "201": { "body": { "location": "eastus", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index a7ed1ecd4745..211777618569 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -364,8 +364,14 @@ } ], "responses": { + "200": { + "description": "OK - pool updated", + "schema": { + "$ref": "#/definitions/capacityPool" + } + }, "201": { - "description": "Pool created or updated", + "description": "Pool created", "schema": { "$ref": "#/definitions/capacityPool" } @@ -565,8 +571,14 @@ } ], "responses": { + "200": { + "description": "Ok - volume updated", + "schema": { + "$ref": "#/definitions/volume" + } + }, "201": { - "description": "Volume created or updated", + "description": "Volume created", "schema": { "$ref": "#/definitions/volume" } @@ -704,57 +716,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets/{mountTargetName}": { - "parameters": [ - { - "$ref": "#/parameters/SubscriptionId" - }, - { - "$ref": "#/parameters/ResourceGroup" - }, - { - "$ref": "#/parameters/AccountName" - }, - { - "$ref": "#/parameters/PoolName" - }, - { - "$ref": "#/parameters/VolumeName" - }, - { - "$ref": "#/parameters/MountTargetName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "get": { - "tags": [ - "MountTargets" - ], - "operationId": "MountTargets_Get", - "description": "Get a mount target", - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/mountTarget" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/error" - } - } - }, - "x-ms-examples": { - "MountTargets_Get": { - "$ref": "examples/MountTargets_Get.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots": { "parameters": [ { From c005d432d41092981cf0b2c895f9404457a042e1 Mon Sep 17 00:00:00 2001 From: leonard Date: Tue, 11 Dec 2018 15:47:02 +0000 Subject: [PATCH 09/14] NFSAAS-1644 remove mt get and add put status code --- .../2017-08-15/examples/MountTargets_Get.json | 29 -------- .../examples/Pools_CreateOrUpdate.json | 11 +++ .../examples/Volumes_CreateOrUpdate.json | 13 ++++ .../preview/2017-08-15/netapp.json | 67 ++++--------------- 4 files changed, 38 insertions(+), 82 deletions(-) delete mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json deleted file mode 100644 index 1571403b994d..000000000000 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", - "accountName": "accountName", - "poolName": "poolName", - "volumeName": "volumeName", - "mountTargetName": "mountTargetName", - "api-version": "2017-08-15" - }, - "responses": { - "200": { - "body": { - "location": "eastus", - "properties": { - "endIp": "1.2.3.4", - "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "startIp": "1.2.3.4", - "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "vlanId": 1337, - "netmask": "255.255.255.0", - "ipAddress": "1.2.3.4", - "gateway": "1.2.3.4", - "provisioningState": "Created" - } - } - } - } -} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json index 10e856ed8e0a..963096c1c441 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json @@ -8,6 +8,17 @@ "body": {} }, "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "provisioningState": "Created", + "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778", + "serviceLevel": "Premium", + "size": 4398046511104 + } + } + }, "201": { "body": { "location": "eastus", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json index a33791786874..9caac72ce596 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json @@ -9,6 +9,19 @@ "body": {} }, "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778", + "creationToken": "some-amazing-filepath", + "usageThreshold": 107374182400, + "serviceLevel": "Premium", + "provisioningState": "Created", + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + } + } + }, "201": { "body": { "location": "eastus", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 1bd7af70c77d..a717585a5e32 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -364,8 +364,14 @@ } ], "responses": { + "200": { + "description": "OK - pool updated", + "schema": { + "$ref": "#/definitions/capacityPool" + } + }, "201": { - "description": "Pool created or updated", + "description": "Pool created", "schema": { "$ref": "#/definitions/capacityPool" } @@ -565,8 +571,14 @@ } ], "responses": { + "200": { + "description": "Ok - volume updated", + "schema": { + "$ref": "#/definitions/volume" + } + }, "201": { - "description": "Volume created or updated", + "description": "Volume created", "schema": { "$ref": "#/definitions/volume" } @@ -704,57 +716,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets/{mountTargetName}": { - "parameters": [ - { - "$ref": "#/parameters/SubscriptionId" - }, - { - "$ref": "#/parameters/ResourceGroup" - }, - { - "$ref": "#/parameters/AccountName" - }, - { - "$ref": "#/parameters/PoolName" - }, - { - "$ref": "#/parameters/VolumeName" - }, - { - "$ref": "#/parameters/MountTargetName" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "get": { - "tags": [ - "MountTargets" - ], - "operationId": "MountTargets_Get", - "description": "Get a mount target", - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/mountTarget" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/error" - } - } - }, - "x-ms-examples": { - "MountTargets_Get": { - "$ref": "examples/MountTargets_Get.json" - } - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots": { "parameters": [ { From be1df19290f75d3c9476dc3651b248e0728cec41 Mon Sep 17 00:00:00 2001 From: leonard Date: Wed, 13 Mar 2019 08:11:35 +0000 Subject: [PATCH 10/14] NFSAAS-1875 update to R3.5 standard --- .../2017-08-15/examples/Snapshots_Delete.json | 3 +- .../preview/2017-08-15/netapp.json | 225 ++++++++++++++++-- 2 files changed, 204 insertions(+), 24 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json index 9fa97ec2bf26..246050fdac05 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json @@ -10,6 +10,7 @@ }, "responses": { "204": {}, - "202": {} + "202": {}, + "200": {} } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index a717585a5e32..81ac28cb3f06 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -902,6 +902,9 @@ "operationId": "Snapshots_Delete", "description": "Delete snapshot", "responses": { + "200": { + "description": "OK" + }, "202": { "description": "Accepted -- Create or update request accepted; operation will complete asynchronously" }, @@ -1116,9 +1119,33 @@ "type": "object", "x-ms-azure-resource": true, "properties": { + "location": { + "type": "string", + "description": "Resource location" + }, + "id": { + "type": "string", + "readOnly": true, + "description": "Resource Id" + }, + "name": { + "type": "string", + "readOnly": true, + "description": "Resource name" + }, + "type": { + "type": "string", + "readOnly": true, + "description": "Resource type" + }, "tags": { "description": "Resource tags", "$ref": "#/definitions/resourceTags" + }, + "properties": { + "description": "NetApp Account properties", + "$ref": "#/definitions/accountProperties", + "x-ms-client-flatten": true } } }, @@ -1130,6 +1157,45 @@ "type": "string", "readOnly": true, "description": "Azure lifecycle management" + }, + "activeDirectories": { + "description": "Active Directories", + "type": "array", + "$ref": "#/definitions/activeDirectories" + } + } + }, + "activeDirectories": { + "description": "Active Directories", + "type": "object", + "properties": { + "activeDirectoryId": { + "type": "string", + "description": "Id of the active drectory" + }, + "username": { + "type": "string", + "description": "Username of Active Directory domain administrator" + }, + "password": { + "type": "string", + "description": "Plain text password of Active Directory domain administrator" + }, + "domain": { + "type": "string", + "description": "Name of the Active Directory domain" + }, + "dNS": { + "type": "string", + "description": "Comma separated list of DNS server IP addresses for the Active Directory domain" + }, + "status": { + "type": "string", + "description": "Status of the active drectory" + }, + "sMBServerName": { + "type": "string", + "description": "NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes" } } }, @@ -1189,17 +1255,6 @@ } } }, - "capacityPoolPatch": { - "description": "Capacity pool patch resource", - "type": "object", - "x-ms-azure-resource": true, - "properties": { - "tags": { - "description": "Resource tags", - "$ref": "#/definitions/resourceTags" - } - } - }, "poolProperties": { "description": "Pool properties", "type": "object", @@ -1230,7 +1285,7 @@ "enum": [ "Standard", "Premium", - "Extreme" + "Ultra" ], "x-ms-enum": { "name": "ServiceLevel", @@ -1245,12 +1300,12 @@ "description": "Premium service level" }, { - "value": "Extreme", - "description": "Extreme service level" + "value": "Ultra", + "description": "Ultra service level" } ] }, - "example": "Extreme", + "example": "Ultra", "default": "Premium" }, "provisioningState": { @@ -1260,6 +1315,86 @@ } } }, + "capacityPoolPatch": { + "description": "Capacity pool patch resource", + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "location": { + "type": "string", + "description": "Resource location" + }, + "id": { + "type": "string", + "readOnly": true, + "description": "Resource Id" + }, + "name": { + "type": "string", + "readOnly": true, + "description": "Resource name" + }, + "type": { + "type": "string", + "readOnly": true, + "description": "Resource type" + }, + "tags": { + "description": "Resource tags", + "$ref": "#/definitions/resourceTags" + }, + "properties": { + "description": "Capacity pool properties", + "$ref": "#/definitions/poolPatchProperties", + "x-ms-client-flatten": true + } + } + }, + "poolPatchProperties": { + "description": "Patchable pool properties", + "type": "object", + "properties": { + "size": { + "title": "size", + "type": "integer", + "format": "int64", + "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104).", + "minimum": 4398046511104, + "maximum": 549755813888000, + "default": 4398046511104 + }, + "serviceLevel": { + "title": "serviceLevel", + "type": "string", + "description": "The service level of the file system", + "enum": [ + "Standard", + "Premium", + "Ultra" + ], + "x-ms-enum": { + "name": "ServiceLevel", + "modelAsString": true, + "values": [ + { + "value": "Standard", + "description": "Standard service level" + }, + { + "value": "Premium", + "description": "Premium service level" + }, + { + "value": "Ultra", + "description": "Ultra service level" + } + ] + }, + "example": "Ultra", + "default": "Premium" + } + } + }, "volumeList": { "description": "List of volume resources", "type": "object", @@ -1353,7 +1488,7 @@ "enum": [ "Standard", "Premium", - "Extreme" + "Ultra" ], "x-ms-enum": { "name": "ServiceLevel", @@ -1368,12 +1503,12 @@ "description": "Premium service level" }, { - "value": "Extreme", - "description": "Extreme service level" + "value": "Ultra", + "description": "Ultra service level" } ] }, - "example": "Extreme", + "example": "Ultra", "default": "Premium" }, "usageThreshold": { @@ -1386,6 +1521,11 @@ "default": 107374182400, "example": 107374182400 }, + "exportPolicy": { + "description": "Export policy rule", + "type": "array", + "$ref": "#/definitions/exportPolicyRule" + }, "provisioningState": { "type": "string", "readOnly": true, @@ -1397,6 +1537,40 @@ } } }, + "exportPolicyRule": { + "description": "Volume Export Policy Rule", + "type": "object", + "properties": { + "ruleIndex": { + "type": "integer", + "description": "Order index" + }, + "unixReadOnly": { + "type": "boolean", + "description": "Read only access" + }, + "unixReadWrite": { + "type": "boolean", + "description": "Read and write access" + }, + "cifs": { + "type": "boolean", + "description": "Allows CIFS protocol" + }, + "nfsv3": { + "type": "boolean", + "description": "Allows NFSv3 protocol" + }, + "nfsv4": { + "type": "boolean", + "description": "Allows NFSv4 protocol" + }, + "allowedClients": { + "type": "string", + "description": "Client ingress specification as comma seperated string with IPv4 CIDRs, IPv4 host addresses and host names" + } + } + }, "volumePatch": { "description": "Volume patch resource", "type": "object", @@ -1443,7 +1617,7 @@ "enum": [ "Standard", "Premium", - "Extreme" + "Ultra" ], "x-ms-enum": { "name": "ServiceLevel", @@ -1458,12 +1632,12 @@ "description": "Premium service level" }, { - "value": "Extreme", - "description": "Extreme service level" + "value": "Ultra", + "description": "Ultra service level" } ] }, - "example": "Extreme", + "example": "Ultra", "default": "Premium" }, "usageThreshold": { @@ -1475,6 +1649,11 @@ "maximum": 109951162777600, "default": 107374182400, "example": 107374182400 + }, + "exportPolicy": { + "description": "Export policy rule", + "type": "array", + "$ref": "#/definitions/exportPolicyRule" } } }, From 46f3cb6030777135484c1bdc4b1d2146053172f9 Mon Sep 17 00:00:00 2001 From: Leonard Francis Date: Wed, 13 Mar 2019 09:12:36 +0000 Subject: [PATCH 11/14] NFSAAS-1875 Update to R3.5 Standard (#11) --- .../examples/Accounts_CreateOrUpdate.json | 2 +- .../2017-08-15/examples/Accounts_Delete.json | 2 +- .../2017-08-15/examples/Accounts_Get.json | 2 +- .../2017-08-15/examples/Accounts_List.json | 2 +- .../2017-08-15/examples/Accounts_Update.json | 2 +- .../examples/MountTargets_List.json | 2 +- .../examples/Pools_CreateOrUpdate.json | 2 +- .../2017-08-15/examples/Pools_Delete.json | 2 +- .../2017-08-15/examples/Pools_Get.json | 2 +- .../2017-08-15/examples/Pools_List.json | 2 +- .../2017-08-15/examples/Pools_Update.json | 2 +- .../2017-08-15/examples/Snapshots_Create.json | 2 +- .../2017-08-15/examples/Snapshots_Delete.json | 2 +- .../2017-08-15/examples/Snapshots_Get.json | 2 +- .../2017-08-15/examples/Snapshots_List.json | 2 +- .../2017-08-15/examples/Snapshots_Update.json | 2 +- .../examples/Volumes_CreateOrUpdate.json | 2 +- .../2017-08-15/examples/Volumes_Delete.json | 2 +- .../2017-08-15/examples/Volumes_Get.json | 2 +- .../2017-08-15/examples/Volumes_List.json | 2 +- .../2017-08-15/examples/Volumes_Update.json | 2 +- .../preview/2017-08-15/netapp.json | 27 ++++++++++++------- 22 files changed, 38 insertions(+), 31 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json index c60a0a23b150..fdb4fb8ecb7a 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "api-version": "2017-08-15", "body": {} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Delete.json index 9f3bfe44fc65..e7e4528eca03 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Delete.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Delete.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "api-version": "2017-08-15" }, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json index 5147ae612456..c953da8952cf 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "api-version": "2017-08-15" }, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json index f1f7d17d6077..e43207b36fe3 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "api-version": "2017-08-15" }, "responses": { diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json index c03d2dd45953..fef82b77979e 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "api-version": "2017-08-15", "body": {} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json index bcd4a56f85b9..b027c4fdeae6 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json index 963096c1c441..ae144a6f3f19 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "api-version": "2017-08-15", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Delete.json index 996e30f74367..a51d84e63d50 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Delete.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Delete.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "api-version": "2017-08-15" diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json index 25aed0d6e384..51d1e82ec619 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "api-version": "2017-08-15" diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json index 5bccee6836c3..b8d37187d7bc 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "api-version": "2017-08-15" }, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json index 6a8308ab5fc0..cdb7c5996078 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "api-version": "2017-08-15", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json index 8cc5b55490ed..26da07d839d3 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json index 246050fdac05..c98926bae74d 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Delete.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json index 1869ef8f13de..0a7f8b2d384b 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json index 61fc3f1f5ec0..a23fcac21412 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json index cfbb9f2dbff0..d6860cd629d7 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json index 9caac72ce596..1a41ede9c80d 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Delete.json index 01c4188142ae..c03da96c7595 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Delete.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Delete.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json index 67bd0e2abbd3..e6cfaf1f2258 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json index 152c8d088946..7d14d2245ce1 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "api-version": "2017-08-15" diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json index 98002937dd14..67911caf8762 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 81ac28cb3f06..79174782ce3b 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -68,7 +68,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -110,7 +110,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -257,7 +257,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -302,7 +302,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -458,7 +458,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -506,7 +506,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -665,7 +665,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -716,7 +716,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -767,7 +767,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}": { "parameters": [ { "$ref": "#/parameters/SubscriptionId" @@ -1196,6 +1196,10 @@ "sMBServerName": { "type": "string", "description": "NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes" + }, + "organizationalUnit": { + "type": "string", + "description": "The Organizational Unit (OU) within the Windows Active Directory" } } }, @@ -1914,11 +1918,14 @@ "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." }, "ResourceGroup": { - "name": "resourceGroup", + "name": "resourceGroupName", "in": "path", "required": true, "type": "string", "description": "The name of the resource group.", + "pattern": "^[-\\w\\._\\(\\)]+$", + "minLength": 1, + "maxLength": 90, "x-ms-parameter-location": "method" }, "AccountName": { From 084552639aef23de670f0dc26ba5c9496eb6daff Mon Sep 17 00:00:00 2001 From: Leonard Francis Date: Wed, 13 Mar 2019 09:49:42 +0000 Subject: [PATCH 12/14] Nfsaas 1875 swagger update (#12) * NFSAAS-1875 Update to R3.5 Standard * NFSAAS-1875 update to R3.5 standard --- .../2017-08-15/examples/MountTargets_List.json | 3 ++- .../preview/2017-08-15/netapp.json | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json index b027c4fdeae6..8996708ca7cc 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json @@ -18,10 +18,11 @@ "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333", "startIp": "1.2.3.4", "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333", - "vlanId": 1337, + "subnet": "1.2.3.4", "netmask": "255.255.255.0", "ipAddress": "1.2.3.4", "gateway": "1.2.3.4", + "smbServerFqdn": "fullyqualified.domainname.com", "provisioningState": "Created" } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 79174782ce3b..9578a523d934 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -1741,11 +1741,11 @@ "readOnly": true, "example": "1.2.3.4" }, - "vlanId": { - "title": "vlanid", - "type": "integer", - "description": "Vlan Id", - "example": 1337 + "subnet": { + "title": "subnet", + "type": "string", + "description": "The subnet", + "example": "1.2.3.4" }, "startIp": { "title": "startIp", @@ -1754,7 +1754,7 @@ "example": "1.2.3.4" }, "endIp": { - "title": "startIp", + "title": "endIp", "description": "The end of IPv4 address range to use when creating a new mount target", "type": "string", "example": "1.2.3.4" @@ -1771,6 +1771,12 @@ "type": "string", "example": "255.255.255.0" }, + "smbServerFqdn": { + "title": "smbServerFQDN", + "description": "The SMB server's Fully Qualified Doman Name, FQDN", + "type": "string", + "example": "fullyqualified.domainname.com" + }, "provisioningState": { "type": "string", "readOnly": true, From 0af27c76c27c57415609e59ba20027b3808ba30e Mon Sep 17 00:00:00 2001 From: Leonard Francis Date: Wed, 13 Mar 2019 21:22:27 +0000 Subject: [PATCH 13/14] Nfsaas 1875 swagger update (#13) * NFSAAS-1875 Update to R3.5 Standard * NFSAAS-1875 update to R3.5 standard * NFSAAS-1875 updated from review comments --- .../Microsoft.NetApp/preview/2017-08-15/netapp.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index 9578a523d934..cc92d9f50787 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -1171,7 +1171,7 @@ "properties": { "activeDirectoryId": { "type": "string", - "description": "Id of the active drectory" + "description": "Id of the Active Directory" }, "username": { "type": "string", @@ -1191,7 +1191,7 @@ }, "status": { "type": "string", - "description": "Status of the active drectory" + "description": "Status of the Active Directory" }, "sMBServerName": { "type": "string", @@ -1571,7 +1571,7 @@ }, "allowedClients": { "type": "string", - "description": "Client ingress specification as comma seperated string with IPv4 CIDRs, IPv4 host addresses and host names" + "description": "Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names" } } }, @@ -1773,7 +1773,7 @@ }, "smbServerFqdn": { "title": "smbServerFQDN", - "description": "The SMB server's Fully Qualified Doman Name, FQDN", + "description": "The SMB server's Fully Qualified Domain Name, FQDN", "type": "string", "example": "fullyqualified.domainname.com" }, From a5d271cecbe26fc92dd1f7e003606fe79323bb5f Mon Sep 17 00:00:00 2001 From: leonard Date: Thu, 21 Mar 2019 15:48:33 +0000 Subject: [PATCH 14/14] NFSAAS-1875 small correction --- .../examples/Accounts_CreateOrUpdate.json | 10 +++++- .../2017-08-15/examples/Accounts_Update.json | 2 +- .../preview/2017-08-15/netapp.json | 34 +++++++++++++++---- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json index fdb4fb8ecb7a..3859118ea072 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json @@ -7,11 +7,19 @@ "body": {} }, "responses": { + "200": { + "body": { + "location": "eastus", + "properties": { + "provisioningState": "Succeeded" + } + } + }, "201": { "body": { "location": "eastus", "properties": { - "provisioningState": "Created" + "provisioningState": "Succeeded" } } }, diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json index fef82b77979e..ed2a522b4df6 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json @@ -11,7 +11,7 @@ "body": { "location": "eastus", "properties": { - "provisioningState": "Created" + "provisioningState": "Succeeded" } } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json index cc92d9f50787..56849cb2517e 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json @@ -169,6 +169,12 @@ } ], "responses": { + "200": { + "description": "OK - account updated", + "schema": { + "$ref": "#/definitions/netAppAccount" + } + }, "201": { "description": "Account created", "schema": { @@ -1161,12 +1167,14 @@ "activeDirectories": { "description": "Active Directories", "type": "array", - "$ref": "#/definitions/activeDirectories" + "items": { + "$ref": "#/definitions/activeDirectory" + } } } }, - "activeDirectories": { - "description": "Active Directories", + "activeDirectory": { + "description": "Active Directory", "type": "object", "properties": { "activeDirectoryId": { @@ -1527,8 +1535,14 @@ }, "exportPolicy": { "description": "Export policy rule", - "type": "array", - "$ref": "#/definitions/exportPolicyRule" + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/exportPolicyRule" + } + } + } }, "provisioningState": { "type": "string", @@ -1656,8 +1670,14 @@ }, "exportPolicy": { "description": "Export policy rule", - "type": "array", - "$ref": "#/definitions/exportPolicyRule" + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/exportPolicyRule" + } + } + } } } },