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..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 @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subscriptionId", - "resourceGroup": "resourceGroup", + "resourceGroupName": "resourceGroup", "accountName": "accountName", "poolName": "poolName", "volumeName": "volumeName", @@ -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/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..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 @@ -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" } } }, @@ -1737,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", @@ -1750,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" @@ -1767,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, @@ -1914,11 +1924,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": {