From 27f82d302e2199639648d9a87c7cc46b28613736 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Tue, 1 Sep 2020 17:18:51 +0800 Subject: [PATCH 1/6] Update MySQL flexibleServer swagger to change some APIs --- .../examples/CapabilitiesByLocationList.json | 180 +++++++ .../CheckVirtualNetworkSubnetUsage.json | 26 + .../examples/MaintenanceWindowCreate.json | 46 -- .../examples/MaintenanceWindowDelete.json | 14 - .../examples/MaintenanceWindowGet.json | 24 - .../examples/ServerGet.json | 14 +- .../examples/ServerGetWithVnet.json | 8 +- .../examples/ServerUpdate.json | 13 +- ...erUpdateWithCustomerMaintenanceWindow.json | 59 +++ .../2020-07-01-privatepreview/mysql.json | 475 ++++++++++-------- 10 files changed, 565 insertions(+), 294 deletions(-) create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json new file mode 100644 index 000000000000..0aa0dadf3265 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json @@ -0,0 +1,180 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "locationName": "WestUS" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "zone": "none", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + }, + { + "zone": "1", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + }, + { + "zone": "2", + "supportedFlexibleServerEditions": [ + { + "name": "Burstable", + "supportedStorageEditions": [ + { + "name": "ManagedDisk", + "supportedStorageMB": [ + { + "name": "32768", + "supportedIops": 120, + "storageSizeMB": 32768 + }, + { + "name": "65536", + "supportedIops": 240, + "storageSizeMB": 65536 + }, + { + "name": "131072", + "supportedIops": 500, + "storageSizeMB": 131072 + } + ] + } + ], + "supportedServerVersions": [ + { + "name": "12", + "supportedVcores": [ + { + "name": "Standard_B1s", + "vCores": 1, + "supportedIops": 320, + "supportedMemoryPerVcoreMB": 1024 + }, + { + "name": "Standard_B1ms", + "vCores": 1, + "supportedIops": 640, + "supportedMemoryPerVcoreMB": 2048 + }, + { + "name": "Standard_B2s", + "vCores": 2, + "supportedIops": 1280, + "supportedMemoryPerVcoreMB": 2048 + } + ] + } + ] + } + ] + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json new file mode 100644 index 000000000000..2b82b6978e3a --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CheckVirtualNetworkSubnetUsage.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "locationName": "WestUS", + "parameters": { + "virtualNetworkArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/testvnet" + } + }, + "responses": { + "200": { + "body": { + "delegatedSubnetsUsage": [ + { + "subnetName": "test-subnet-1", + "usage": 2 + }, + { + "subnetName": "test-subnet-2", + "usage": 3 + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json deleted file mode 100644 index 89163e0da956..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowCreate.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", - "parameters": { - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - } - } - }, - "responses": { - "201": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - }, - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforPostgreSQL/flexibleServers/maintenanceWindows" - } - }, - "202": {} - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json deleted file mode 100644 index 02d91e35a6fc..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "TestGroup", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": {}, - "202": {}, - "204": {} - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json deleted file mode 100644 index ba086b9877e5..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowGet.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "parameters": { - "maintenanceWindowName": "customerMaintenanceWindow", - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-07-01-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforMySQL/flexibleServers/maintenanceWindows" - } - } - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json index 26101224c4d2..e3d00e2641c6 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json @@ -28,7 +28,19 @@ "primaryServerId": "", "replicaCapacity": 5, "publicNetworkAccess": "Enabled", - "standbyCount": 0 + "haEnabled": "Enabled", + "haState": "Healthy", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + }, + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" + } }, "location": "westus", "tags": { diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json index a2fc5d608772..cef210adedba 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json @@ -27,11 +27,9 @@ "primaryServerId": "", "replicaCapacity": 5, "publicNetworkAccess": "Enabled", - "standbyCount": 0, - "vnetInjArgs": { - "delegatedSubnetName": "test-subnet", - "delegatedVnetID": "6ed504a3-24b8-4ba8-ac1f-7a1780195437", - "delegatedVnetName": "test-vnet" + "haEnabled": "Disabled", + "delegatedSubnetArguments": { + "subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet" } }, "location": "westus", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json index c042adec2a3d..5ce35b2dce59 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdate.json @@ -29,7 +29,18 @@ "sslEnforcement": "Disabled", "publicNetworkAccess": "Disabled", "state": "Ready", - "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com" + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "haEnabled": "Enabled", + "haState": "Healthy", + "availabilityZone": "1", + "standByAvailabilityZone": "2", + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0, + "customWindow": "Disabled" + }, + "delegatedSubnetArguments": {} }, "location": "westus", "tags": { diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json new file mode 100644 index 000000000000..3ee6ab2d831d --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "serverName": "mysqltestsvc4", + "resourceGroupName": "testrg", + "api-version": "2020-07-01-privatepreview", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "parameters": { + "properties": { + "maintenanceWindow": { + "customWindow": "Enabled", + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0 + } + } + } + }, + "responses": { + "200": { + "body": { + "sku": { + "name": "Standard_D12_v2", + "tier": "GeneralPurpose" + }, + "properties": { + "administratorLogin": "cloudsa", + "storageProfile": { + "storageMB": 128000, + "backupRetentionDays": 7 + }, + "version": "5.7", + "sslEnforcement": "Disabled", + "publicNetworkAccess": "Disabled", + "state": "Ready", + "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", + "haEnabled": "Disabled", + "haState": "NotEnabled", + "availabilityZone": "1", + "standByAvailabilityZone": null, + "maintenanceWindow": { + "dayOfWeek": 0, + "startHour": 8, + "startMinute": 0, + "customWindow": "Enabled" + }, + "delegatedSubnetArguments": {} + }, + "location": "westus", + "tags": { + "ElasticServer": "1" + }, + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/mysqltestsvc4", + "name": "mysqltestsvc4", + "type": "Microsoft.DBforMySQL/flexibleServers" + } + }, + "202": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index 52e7d53cd3da..58e33652de5b 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -108,6 +108,9 @@ "x-ms-examples": { "Update a server": { "$ref": "./examples/ServerUpdate.json" + }, + "Update server customer maintenance window": { + "$ref": "./examples/ServerUpdateWithCustomerMaintenanceWindow.json" } }, "description": "Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.", @@ -1040,127 +1043,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/maintenanceWindows/{maintenanceWindowName}": { - "put": { - "tags": [ - "MaintenanceWindows" - ], - "operationId": "MaintenanceWindows_CreateOrUpdate", - "x-ms-examples": { - "Create a maintenance window": { - "$ref": "./examples/MaintenanceWindowCreate.json" - } - }, - "description": "Creates a new maintenance window.", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/MaintenanceWindowNameParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/MaintenanceWindow" - }, - "description": "The required parameters for creating or updating a customer maintenance window." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/MaintenanceWindow" - } - }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/MaintenanceWindow" - } - }, - "202": { - "description": "Accepted" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-long-running-operation": true - }, - "delete": { - "tags": [ - "MaintenanceWindows" - ], - "operationId": "MaintenanceWindows_Delete", - "x-ms-examples": { - "Delete a maintenance window": { - "$ref": "./examples/MaintenanceWindowDelete.json" - } - }, - "description": "Deletes a maintenance window.", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/MaintenanceWindowNameParameter" - } - ], - "responses": { - "200": { - "description": "OK" - }, - "202": { - "description": "Accepted" - }, - "204": { - "description": "NoContent" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-long-running-operation": true - }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySql/locations/{locationName}/capabilities": { "get": { "tags": [ - "MaintenanceWindows" + "LocationBasedCapabilities" ], - "operationId": "MaintenanceWindows_Get", + "operationId": "LocationBasedCapabilities_List", "x-ms-examples": { - "Get a maintenance window": { - "$ref": "./examples/MaintenanceWindowGet.json" + "CapabilitiesList": { + "$ref": "./examples/CapabilitiesByLocationList.json" } }, - "description": "Get the maintenance windows of a given server.", + "description": "Get capabilities at specified location in a given subscription.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1169,20 +1063,14 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/MaintenanceWindowNameParameter" + "$ref": "#/parameters/LocationNameParameter" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/CapabilitiesListResult" } }, "default": { @@ -1191,21 +1079,24 @@ "$ref": "#/definitions/CloudError" } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/maintenanceWindows": { - "get": { + "/subscriptions/{subscriptionId}/providers/Microsoft.DBForMySql/locations/{locationName}/checkVirtualNetworkSubnetUsage": { + "post": { "tags": [ - "MaintenanceWindows" + "CheckVirtualNetworkSubnetUsage" ], - "operationId": "MaintenanceWindows_ListByServer", + "operationId": "CheckVirtualNetworkSubnetUsage", "x-ms-examples": { - "List maintenance windows for a server": { - "$ref": "./examples/MaintenanceWindowsListByServer.json" + "CapabilitiesList": { + "$ref": "./examples/CheckVirtualNetworkSubnetUsage.json" } }, - "description": "List all the maintenance windows in a given server.", + "description": "Get virtual network subnet usage for a given vNet resource id.", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -1214,17 +1105,23 @@ "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/LocationNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/VirtualNetworkSubnetUsageParameter" + }, + "description": "The required parameters for creating or updating a server." } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MaintenanceWindowListResult" + "$ref": "#/definitions/VirtualNetworkSubnetUsageResult" } }, "default": { @@ -1233,9 +1130,6 @@ "$ref": "#/definitions/CloudError" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } }, @@ -1244,7 +1138,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "CheckNameAvailability_Execute", + "operationId": "CheckNameAvailability", "x-ms-examples": { "Check name availability": { "$ref": "./examples/CheckNameAvailability.json" @@ -1366,22 +1260,51 @@ "modelAsString": true } }, - "VnetInjArgs": { + "HaEnabled": { + "type": "string", + "description": "Whether or not HA is enabled for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "HaEnabledEnum", + "modelAsString": true + } + }, + "DelegatedSubnetArguments": { "properties": { - "delegatedVnetID": { + "subnetArmResourceId": { "type": "string", - "description": "delegated vNet ID" - }, - "delegatedSubnetName": { + "description": "delegated subnet arm resource id." + } + }, + "description": "Delegated subnet arguments of a server" + }, + "MaintenanceWindow": { + "type": "object", + "description": "Maintenance window of a server.", + "properties": { + "customWindow": { "type": "string", - "description": "delegated subnet name" + "description": "indicates whether custom window is enabled or disabled" }, - "delegatedVnetName": { - "type": "string", - "description": "delegated vNet name" + "startHour": { + "type": "integer", + "format": "int32", + "description": "start hour for maintenance window" + }, + "startMinute": { + "type": "integer", + "format": "int32", + "description": "start minute for maintenance window" + }, + "dayOfWeek": { + "type": "integer", + "format": "int32", + "description": "day of week for maintenance window" } - }, - "description": "Vnet properties of a server" + } }, "StorageProfile": { "properties": { @@ -1435,6 +1358,10 @@ } } }, + "required": [ + "name", + "tier" + ], "description": "Billing information related properties of a server." }, "ServerProperties": { @@ -1507,10 +1434,9 @@ "modelAsString": true } }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" + "haEnabled": { + "$ref": "#/definitions/HaEnabled", + "description": "Enable HA or not for a server." }, "fullyQualifiedDomainName": { "type": "string", @@ -1545,6 +1471,10 @@ "$ref": "#/definitions/PublicNetworkAccess", "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'" }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." + }, "sourceServerId": { "type": "string", "description": "The source MySQL server name to restore from.", @@ -1560,9 +1490,23 @@ "create" ] }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "Vnet arguments." + "availabilityZone": { + "type": "string", + "description": "availability Zone information of the server." + }, + "standByAvailabilityZone": { + "type": "string", + "description": "availability Zone information of the server.", + "readOnly": true + }, + "byokEnforcement": { + "type": "string", + "description": "Status showing whether the data encryption is enabled with customer-managed keys.", + "readOnly": true + }, + "delegatedSubnetArguments": { + "$ref": "#/definitions/DelegatedSubnetArguments", + "description": "Delegated subnet arguments." }, "createMode": { "type": "string", @@ -1629,19 +1573,22 @@ "$ref": "#/definitions/SslEnforcement", "description": "Enable ssl enforcement or not when connect to server." }, - "vnetInjArgs": { - "$ref": "#/definitions/VnetInjArgs", - "description": "Vnet arguments." + "delegatedSubnetArguments": { + "$ref": "#/definitions/DelegatedSubnetArguments", + "description": "Delegated subnet arguments." }, - "standbyCount": { - "type": "integer", - "format": "int32", - "description": "stand by count value can be either 0 or 1" + "haEnabled": { + "$ref": "#/definitions/HaEnabled", + "description": "Enable HA or not for a server." }, "publicNetworkAccess": { "$ref": "#/definitions/PublicNetworkAccess", "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'" }, + "maintenanceWindow": { + "$ref": "#/definitions/MaintenanceWindow", + "description": "Maintenance window of a server." + }, "replicationRole": { "type": "string", "description": "The replication role of the server." @@ -1890,70 +1837,192 @@ }, "description": "A list of server configurations." }, - "MaintenanceWindowProperties": { + "VirtualNetworkSubnetUsageParameter": { + "type": "object", "properties": { - "dayOfWeek": { + "virtualNetworkArmResourceId": { + "type": "string", + "description": "Virtual network resource id." + } + }, + "description": "Virtual network subnet usage parameter" + }, + "DelegatedSubnetUsage": { + "type": "object", + "properties": { + "subnetName": { + "type": "string", + "readOnly": true, + "description": "name of the subnet" + }, + "usage": { "type": "integer", - "format": "int32", - "description": "The day of week of the maintenance window to start" + "format": "int64", + "readOnly": true, + "description": "Number of used delegated subnets" + } + }, + "description": "Delegated subnet usage data." + }, + "VirtualNetworkSubnetUsageResult": { + "type": "object", + "properties": { + "delegatedSubnetsUsage": { + "type": "array", + "items": { + "$ref": "#/definitions/DelegatedSubnetUsage" + }, + "readOnly": true + } + }, + "description": "Virtual network subnet usage data." + }, + "StorageMBCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "storage MB name", + "readOnly": true }, - "durationInMinutes": { + "supportedIops": { "type": "integer", - "format": "int32", - "description": "The duration of the maintenance window to run." + "format": "int64", + "description": "supported IOPS", + "readOnly": true }, - "startHour": { + "storageSizeMB": { "type": "integer", - "format": "int32", - "description": "The starting hour of the maintenance window." + "format": "int64", + "description": "storage size in MB", + "readOnly": true + } + }, + "description": "storage size in MB capability" + }, + "VcoreCapability": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "vCore name", + "readOnly": true }, - "startMinute": { + "vCores": { "type": "integer", - "format": "int32", - "description": "The starting minutes of the maintenance window." + "format": "int64", + "description": "supported vCores", + "readOnly": true + }, + "supportedIops": { + "type": "integer", + "format": "int64", + "description": "supported IOPS", + "readOnly": true + }, + "supportedMemoryPerVcoreMB": { + "type": "integer", + "format": "int64", + "description": "supported memory per vCore in MB", + "readOnly": true } }, - "required": [ - "dayOfWeek", - "startHour", - "startMinute" - ], - "description": "The properties of a server maintenance window." + "description": "Vcores capability" }, - "MaintenanceWindow": { + "ServerVersionCapability": { + "type": "object", "properties": { - "properties": { - "$ref": "#/definitions/MaintenanceWindowProperties", - "x-ms-client-flatten": true, - "description": "The properties of a customer maintenance window." + "name": { + "type": "string", + "description": "server version", + "readOnly": true + }, + "supportedVcores": { + "type": "array", + "items": { + "$ref": "#/definitions/VcoreCapability" + }, + "readOnly": true } }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + "description": "Server version capabilities." + }, + "StorageEditionCapability": { + "properties": { + "name": { + "type": "string", + "description": "storage edition name", + "readOnly": true + }, + "supportedStorageMB": { + "type": "array", + "items": { + "$ref": "#/definitions/StorageMBCapability" + }, + "readOnly": true } - ], - "required": [ - "properties" - ], - "description": "Represents a server maintenance window." + }, + "description": "storage edition capability" + }, + "ServerEditionCapability": { + "properties": { + "name": { + "type": "string", + "description": "Server edition name", + "readOnly": true + }, + "supportedStorageEditions": { + "type": "array", + "items": { + "$ref": "#/definitions/StorageEditionCapability" + }, + "readOnly": true + }, + "supportedServerVersions": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerVersionCapability" + }, + "readOnly": true + } + }, + "description": "Server edition capabilities." }, - "MaintenanceWindowListResult": { + "CapabilityProperties": { + "properties": { + "zone": { + "type": "string", + "description": "zone name", + "readOnly": true + }, + "supportedFlexibleServerEditions": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerEditionCapability" + }, + "readOnly": true + } + }, + "description": "Location capabilities." + }, + "CapabilitiesListResult": { "type": "object", "properties": { "value": { + "description": "A list of supported capabilities.", "type": "array", "items": { - "$ref": "#/definitions/MaintenanceWindow" + "$ref": "#/definitions/CapabilityProperties" }, - "description": "The list of server maintenance window." + "readOnly": true }, "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string" + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true } }, - "description": "A list of maintenance windows for a MySQL server." + "description": "location capability" }, "OperationDisplay": { "properties": { @@ -2107,12 +2176,12 @@ "description": "The name of the server configuration.", "x-ms-parameter-location": "method" }, - "MaintenanceWindowNameParameter": { - "name": "maintenanceWindowName", + "LocationNameParameter": { + "name": "locationName", "in": "path", "required": true, "type": "string", - "description": "The name of the maintenance window.", + "description": "The name of the location.", "x-ms-parameter-location": "method" } } From ac5b46bc65e0a57f70cf201f860f35d117f3d6e0 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Thu, 3 Sep 2020 14:36:39 +0800 Subject: [PATCH 2/6] Add BYOK APIs and change primaryServerId to sourceServerId --- .../examples/KeyCreate.json | 43 +++ .../examples/KeyDelete.json | 14 + .../examples/KeyGet.json | 24 ++ .../examples/KeysListByServer.json | 27 ++ .../MaintenanceWindowsListByServer.json | 27 -- .../examples/ReplicasListByServer.json | 6 +- .../examples/ServerCreateReplica.json | 4 +- .../examples/ServerGet.json | 2 +- .../examples/ServerGetWithVnet.json | 2 +- .../2020-07-01-privatepreview/mysql.json | 290 +++++++++++++++++- 10 files changed, 398 insertions(+), 41 deletions(-) create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyCreate.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyDelete.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyGet.json create mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeysListByServer.json delete mode 100644 specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyCreate.json new file mode 100644 index 000000000000..02d3e9afc8f4 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyCreate.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "keyName": "someVault_someKey_01234567890123456789012345678901", + "api-version": "2020-07-01-privatepreview", + "parameters": { + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBForMySql/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "omeVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforMySQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2017-05-01T00:00:00.0Z" + } + } + }, + "202": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBForMySql/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "omeVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforMySQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2017-05-01T00:00:00.0Z" + } + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyDelete.json new file mode 100644 index 000000000000..09475f2b43b8 --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "keyName": "someVault_someKey_01234567890123456789012345678901", + "api-version": "2020-07-01-privatepreview" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyGet.json new file mode 100644 index 000000000000..18d96d5f825b --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyGet.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "keyName": "someVault_someKey_01234567890123456789012345678901", + "api-version": "2020-07-01-privatepreview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBForMySql/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "someVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforMySQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2019-12-01T00:00:00.0Z" + } + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeysListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeysListByServer.json new file mode 100644 index 000000000000..c54140e20c4f --- /dev/null +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeysListByServer.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "testrg", + "serverName": "testserver", + "api-version": "2020-07-01-privatepreview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBForMySql/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", + "name": "someVault_someKey_01234567890123456789012345678901", + "type": "Microsoft.DBforMySQL/flexibleServers/keys", + "kind": "azurekeyvault", + "properties": { + "serverKeyType": "AzureKeyVault", + "uri": "https://someVault.vault.azure.net/keys/someKey/01234567890123456789012345678901", + "creationDate": "2019-12-01T00:00:00.0Z" + } + } + ] + } + } + } +} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json deleted file mode 100644 index d67701018154..000000000000 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/MaintenanceWindowsListByServer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "serverName": "testserver", - "resourceGroupName": "testrg", - "api-version": "2020-02-14-privatepreview", - "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/flexibleServers/testserver/maintenanceWindows/customerMaintenanceWindow", - "name": "customerMaintenanceWindow", - "properties": { - "dayOfWeek": 1, - "startHour": 0, - "startMinute": 30, - "durationInMinutes": 30 - }, - "type": "Microsoft.DBforMySQL/flexibleServers/maintenanceWindows" - } - ] - } - } - } -} diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json index 3adac848f697..81d22cd3151f 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ReplicasListByServer.json @@ -34,7 +34,7 @@ "fullyQualifiedDomainName": "testserver.mysql.database.azure.com", "version": "5.7", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", "replicaCapacity": 0 } }, @@ -63,7 +63,7 @@ "fullyQualifiedDomainName": "testserver1.mysql.database.azure.com", "version": "5.7", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", "replicaCapacity": 0 } }, @@ -92,7 +92,7 @@ "fullyQualifiedDomainName": "testserver2.mysql.database.azure.com", "version": "5.7", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforMySQL/flexibleServers/testprimary", "replicaCapacity": 0 } } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json index 5fd812fe0901..bc1f9f6d98b5 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerCreateReplica.json @@ -32,7 +32,7 @@ "state": "Ready", "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver", "replicaCapacity": 0 }, "location": "westus", @@ -63,7 +63,7 @@ "state": "Ready", "fullyQualifiedDomainName": "targetserver.mysql.database.azure.com", "replicationRole": "Replica", - "primaryServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver", + "sourceServerId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/PrimaryResourceGroup/providers/Microsoft.DBforMySQL/flexibleServers/primaryserver", "replicaCapacity": 0 }, "location": "westus", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json index e3d00e2641c6..70ce494f9d78 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGet.json @@ -25,7 +25,7 @@ "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com", "earliestRestoreDate": "2020-03-14T18:02:41.577+00:00", "replicationRole": "None", - "primaryServerId": "", + "sourceServerId": "", "replicaCapacity": 5, "publicNetworkAccess": "Enabled", "haEnabled": "Enabled", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json index cef210adedba..728e6eb631cf 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerGetWithVnet.json @@ -24,7 +24,7 @@ "state": "Ready", "fullyQualifiedDomainName": "mysqltestsrv.mysql.database.azure.com", "replicationRole": "None", - "primaryServerId": "", + "sourceServerId": "", "replicaCapacity": 5, "publicNetworkAccess": "Enabled", "haEnabled": "Disabled", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index 58e33652de5b..ac8432a2483c 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -499,6 +499,202 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/keys/{keyName}": { + "put": { + "tags": [ + "Keys" + ], + "operationId": "Keys_CreateOrUpdate", + "x-ms-examples": { + "Creates or updates a MySQL Server key": { + "$ref": "./examples/KeyCreate.json" + } + }, + "description": "Creates or updates a MySQL Server key.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/KeyNameParameter" + }, + { + "name": "parameters", + "in": "body", + "description": "The requested MySQL Server key resource state.", + "required": true, + "schema": { + "$ref": "#/definitions/ServerKey" + } + } + ], + "responses": { + "200": { + "description": "Successfully updated the MySQL Server key.", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "202": { + "description": "Operation in progress", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "Keys" + ], + "operationId": "Keys_Delete", + "x-ms-examples": { + "Delete the MySQL Server key": { + "$ref": "./examples/KeyDelete.json" + } + }, + "description": "Deletes the MySQL Server key with the given name.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/KeyNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the MySQL Server key." + }, + "202": { + "description": "Operation in progress" + }, + "204": { + "description": "The specified MySQL Server key does not exist." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "Keys" + ], + "operationId": "Keys_Get", + "x-ms-examples": { + "Get a server key": { + "$ref": "./examples/KeyGet.json" + } + }, + "description": "Gets a server key.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/KeyNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the specified server key.", + "schema": { + "$ref": "#/definitions/ServerKey" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/keys": { + "get": { + "tags": [ + "Keys" + ], + "operationId": "Keys_ListByServer", + "x-ms-examples": { + "List the keys for a server.": { + "$ref": "./examples/KeysListByServer.json" + } + }, + "description": "Gets a list of Server keys.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the list of MySQL Server keys.", + "schema": { + "$ref": "#/definitions/ServerKeyListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/firewallRules/{firewallRuleName}": { "put": { "tags": [ @@ -1456,11 +1652,6 @@ "type": "string", "description": "The replication role." }, - "primaryServerId": { - "type": "string", - "description": "The primary server id of a replica server.", - "readOnly": true - }, "replicaCapacity": { "type": "integer", "format": "int32", @@ -1477,9 +1668,10 @@ }, "sourceServerId": { "type": "string", - "description": "The source MySQL server name to restore from.", + "description": "The source MySQL server id.", "x-ms-mutability": [ - "create" + "create", + "read" ] }, "restorePointInTime": { @@ -1634,6 +1826,76 @@ }, "description": "A list of servers." }, + "ServerKeyProperties": { + "description": "Properties for a key execution.", + "required": [ + "serverKeyType" + ], + "type": "object", + "properties": { + "serverKeyType": { + "description": "The key type like 'AzureKeyVault'.", + "enum": [ + "AzureKeyVault" + ], + "type": "string", + "x-ms-enum": { + "name": "ServerKeyType", + "modelAsString": true + } + }, + "uri": { + "description": "The URI of the key.", + "type": "string" + }, + "creationDate": { + "format": "date-time", + "description": "The key creation date.", + "type": "string", + "readOnly": true + } + } + }, + "ServerKey": { + "description": "A MySQL Server key.", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "properties": { + "kind": { + "description": "Kind of encryption protector used to protect the key.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/ServerKeyProperties", + "description": "Properties of the ServerKey Resource.", + "x-ms-client-flatten": true + } + } + }, + "ServerKeyListResult": { + "description": "A list of MySQL Server keys.", + "type": "object", + "properties": { + "value": { + "description": "A list of MySQL Server keys.", + "type": "array", + "items": { + "$ref": "#/definitions/ServerKey" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + }, "FirewallRuleProperties": { "properties": { "startIpAddress": { @@ -1868,6 +2130,7 @@ "type": "object", "properties": { "delegatedSubnetsUsage": { + "description": "A list of delegated subnet usage", "type": "array", "items": { "$ref": "#/definitions/DelegatedSubnetUsage" @@ -1938,6 +2201,7 @@ "readOnly": true }, "supportedVcores": { + "description": "A list of supported Vcores", "type": "array", "items": { "$ref": "#/definitions/VcoreCapability" @@ -1955,6 +2219,7 @@ "readOnly": true }, "supportedStorageMB": { + "description": "A list of supported storage size in MB", "type": "array", "items": { "$ref": "#/definitions/StorageMBCapability" @@ -1972,6 +2237,7 @@ "readOnly": true }, "supportedStorageEditions": { + "description": "A list of supported storage editions", "type": "array", "items": { "$ref": "#/definitions/StorageEditionCapability" @@ -1979,6 +2245,7 @@ "readOnly": true }, "supportedServerVersions": { + "description": "A list of supported server versions.", "type": "array", "items": { "$ref": "#/definitions/ServerVersionCapability" @@ -1996,6 +2263,7 @@ "readOnly": true }, "supportedFlexibleServerEditions": { + "description": "A list of supported flexible server editions.", "type": "array", "items": { "$ref": "#/definitions/ServerEditionCapability" @@ -2183,6 +2451,14 @@ "type": "string", "description": "The name of the location.", "x-ms-parameter-location": "method" + }, + "KeyNameParameter": { + "name": "keyName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the server key.", + "x-ms-parameter-location": "method" } } } From d8feea940f42da8c11f7f433fb08522ec090d168 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Thu, 3 Sep 2020 15:14:39 +0800 Subject: [PATCH 3/6] Rename keys to serverkeys to follow the old naming --- .../{KeyCreate.json => ServerKeyCreate.json} | 0 .../{KeyDelete.json => ServerKeyDelete.json} | 0 .../{KeyGet.json => ServerKeyGet.json} | 0 ...erver.json => ServerKeysListByServer.json} | 0 .../2020-07-01-privatepreview/mysql.json | 24 +++++++++---------- 5 files changed, 12 insertions(+), 12 deletions(-) rename specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/{KeyCreate.json => ServerKeyCreate.json} (100%) rename specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/{KeyDelete.json => ServerKeyDelete.json} (100%) rename specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/{KeyGet.json => ServerKeyGet.json} (100%) rename specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/{KeysListByServer.json => ServerKeysListByServer.json} (100%) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyCreate.json similarity index 100% rename from specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyCreate.json rename to specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyCreate.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyDelete.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyDelete.json similarity index 100% rename from specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyDelete.json rename to specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyDelete.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyGet.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyGet.json similarity index 100% rename from specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeyGet.json rename to specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyGet.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeysListByServer.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeysListByServer.json similarity index 100% rename from specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/KeysListByServer.json rename to specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeysListByServer.json diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index ac8432a2483c..79056cfc9101 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -502,12 +502,12 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/keys/{keyName}": { "put": { "tags": [ - "Keys" + "ServerKeys" ], - "operationId": "Keys_CreateOrUpdate", + "operationId": "ServerKeys_CreateOrUpdate", "x-ms-examples": { "Creates or updates a MySQL Server key": { - "$ref": "./examples/KeyCreate.json" + "$ref": "./examples/ServerKeyCreate.json" } }, "description": "Creates or updates a MySQL Server key.", @@ -561,12 +561,12 @@ }, "delete": { "tags": [ - "Keys" + "ServerKeys" ], - "operationId": "Keys_Delete", + "operationId": "ServerKeys_Delete", "x-ms-examples": { "Delete the MySQL Server key": { - "$ref": "./examples/KeyDelete.json" + "$ref": "./examples/ServerKeyDelete.json" } }, "description": "Deletes the MySQL Server key with the given name.", @@ -608,12 +608,12 @@ }, "get": { "tags": [ - "Keys" + "ServerKeys" ], - "operationId": "Keys_Get", + "operationId": "ServerKeys_Get", "x-ms-examples": { "Get a server key": { - "$ref": "./examples/KeyGet.json" + "$ref": "./examples/ServerKeyGet.json" } }, "description": "Gets a server key.", @@ -653,12 +653,12 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMySql/flexibleServers/{serverName}/keys": { "get": { "tags": [ - "Keys" + "ServerKeys" ], - "operationId": "Keys_ListByServer", + "operationId": "ServerKeys_ListByServer", "x-ms-examples": { "List the keys for a server.": { - "$ref": "./examples/KeysListByServer.json" + "$ref": "./examples/ServerKeysListByServer.json" } }, "description": "Gets a list of Server keys.", From 52f210af9f7a0c2020464da65b3cbabde96d15e9 Mon Sep 17 00:00:00 2001 From: suna Liu Date: Fri, 4 Sep 2020 10:58:59 +0800 Subject: [PATCH 4/6] Fix 202 response for ServerKey PUT API --- .../examples/ServerKeyCreate.json | 5 +++-- .../2020-07-01-privatepreview/mysql.json | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyCreate.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyCreate.json index 02d3e9afc8f4..fa91152a79d9 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyCreate.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/ServerKeyCreate.json @@ -26,7 +26,7 @@ } } }, - "202": { + "201": { "body": { "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBForMySql/flexibleServers/testserver/keys/someVault_someKey_01234567890123456789012345678901", "name": "omeVault_someKey_01234567890123456789012345678901", @@ -38,6 +38,7 @@ "creationDate": "2017-05-01T00:00:00.0Z" } } - } + }, + "202": {} } } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index 79056cfc9101..2f76bf4ef4de 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -539,17 +539,20 @@ ], "responses": { "200": { - "description": "Successfully updated the MySQL Server key.", + "description": "OK", "schema": { "$ref": "#/definitions/ServerKey" } }, - "202": { - "description": "Operation in progress", + "201": { + "description": "Created", "schema": { "$ref": "#/definitions/ServerKey" } }, + "202": { + "description": "Accepted" + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -589,13 +592,13 @@ ], "responses": { "200": { - "description": "Successfully deleted the MySQL Server key." + "description": "OK" }, "202": { - "description": "Operation in progress" + "description": "Accepted" }, "204": { - "description": "The specified MySQL Server key does not exist." + "description": "NoContent" }, "default": { "description": "Error response describing why the operation failed.", @@ -636,7 +639,7 @@ ], "responses": { "200": { - "description": "Successfully retrieved the specified server key.", + "description": "OK", "schema": { "$ref": "#/definitions/ServerKey" } @@ -678,7 +681,7 @@ ], "responses": { "200": { - "description": "Successfully retrieved the list of MySQL Server keys.", + "description": "OK", "schema": { "$ref": "#/definitions/ServerKeyListResult" } From 361f53c4daf522e0c707f7d8d1d3b5ae6045ef8b Mon Sep 17 00:00:00 2001 From: suna Liu Date: Fri, 4 Sep 2020 14:58:26 +0800 Subject: [PATCH 5/6] Remove CheckVirtualNetworkSubnetUsage operation id --- .../preview/2020-07-01-privatepreview/mysql.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index 2f76bf4ef4de..b190670c86fb 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -1289,7 +1289,7 @@ "tags": [ "CheckVirtualNetworkSubnetUsage" ], - "operationId": "CheckVirtualNetworkSubnetUsage", + "operationId": "CheckVirtualNetworkSubnetUsage_Execute", "x-ms-examples": { "CapabilitiesList": { "$ref": "./examples/CheckVirtualNetworkSubnetUsage.json" @@ -1337,7 +1337,7 @@ "tags": [ "CheckNameAvailability" ], - "operationId": "CheckNameAvailability", + "operationId": "CheckNameAvailability_Execute", "x-ms-examples": { "Check name availability": { "$ref": "./examples/CheckNameAvailability.json" From fed73dd683d9b4bd4a18e4816ad526c73d85447d Mon Sep 17 00:00:00 2001 From: suna Liu Date: Tue, 8 Sep 2020 14:42:56 +0800 Subject: [PATCH 6/6] Change LocationBasedCapabilities_List response body --- .../examples/CapabilitiesByLocationList.json | 209 ++++++++++-------- .../2020-07-01-privatepreview/mysql.json | 32 ++- 2 files changed, 133 insertions(+), 108 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json index 0aa0dadf3265..ac537987f888 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/examples/CapabilitiesByLocationList.json @@ -15,35 +15,28 @@ "name": "Burstable", "supportedStorageEditions": [ { - "name": "ManagedDisk", - "supportedStorageMB": [ - { - "name": "32768", - "supportedIops": 120, - "storageSizeMB": 32768 - }, - { - "name": "65536", - "supportedIops": 240, - "storageSizeMB": 65536 - }, - { - "name": "131072", - "supportedIops": 500, - "storageSizeMB": 131072 - } - ] + "name": "PremiumFileShare", + "minStorageSize": { + "name": "10240", + "storageSizeMB": 10240 + }, + "maxStorageSize": { + "name": "16777216", + "storageSizeMB": 16777216 + }, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35 } ], "supportedServerVersions": [ { - "name": "12", + "name": "5.7", "supportedVcores": [ { "name": "Standard_B1s", "vCores": 1, "supportedIops": 320, - "supportedMemoryPerVcoreMB": 1024 + "supportedMemoryPerVcoreMB": 2048 }, { "name": "Standard_B1ms", @@ -60,112 +53,136 @@ ] } ] - } - ] - }, - { - "zone": "1", - "supportedFlexibleServerEditions": [ + }, { - "name": "Burstable", + "name": "GeneralPurpose", "supportedStorageEditions": [ { - "name": "ManagedDisk", - "supportedStorageMB": [ - { - "name": "32768", - "supportedIops": 120, - "storageSizeMB": 32768 - }, - { - "name": "65536", - "supportedIops": 240, - "storageSizeMB": 65536 - }, - { - "name": "131072", - "supportedIops": 500, - "storageSizeMB": 131072 - } - ] + "name": "PremiumFileShare", + "minStorageSize": { + "name": "10240", + "storageSizeMB": 10240 + }, + "maxStorageSize": { + "name": "16777216", + "storageSizeMB": 16777216 + }, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35 } ], "supportedServerVersions": [ { - "name": "12", + "name": "5.7", "supportedVcores": [ { - "name": "Standard_B1s", - "vCores": 1, - "supportedIops": 320, - "supportedMemoryPerVcoreMB": 1024 + "name": "Standard_D2ds_v4", + "vCores": 2, + "supportedIops": 3200, + "supportedMemoryPerVcoreMB": 4096 }, { - "name": "Standard_B1ms", - "vCores": 1, - "supportedIops": 640, - "supportedMemoryPerVcoreMB": 2048 + "name": "Standard_D4ds_v4", + "vCores": 4, + "supportedIops": 6400, + "supportedMemoryPerVcoreMB": 4096 }, { - "name": "Standard_B2s", - "vCores": 2, - "supportedIops": 1280, - "supportedMemoryPerVcoreMB": 2048 - } - ] - } - ] - } - ] - }, - { - "zone": "2", - "supportedFlexibleServerEditions": [ - { - "name": "Burstable", - "supportedStorageEditions": [ - { - "name": "ManagedDisk", - "supportedStorageMB": [ + "name": "Standard_D8ds_v4", + "vCores": 8, + "supportedIops": 12800, + "supportedMemoryPerVcoreMB": 4096 + }, { - "name": "32768", - "supportedIops": 120, - "storageSizeMB": 32768 + "name": "Standard_D16ds_v4", + "vCores": 16, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 4096 }, { - "name": "65536", - "supportedIops": 240, - "storageSizeMB": 65536 + "name": "Standard_D32ds_v4", + "vCores": 32, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 4096 }, { - "name": "131072", - "supportedIops": 500, - "storageSizeMB": 131072 + "name": "Standard_D48ds_v4", + "vCores": 48, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 4096 + }, + { + "name": "Standard_D64ds_v4", + "vCores": 64, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 4096 } ] } + ] + }, + { + "name": "MemoryOptimized", + "supportedStorageEditions": [ + { + "name": "PremiumFileShare", + "minStorageSize": { + "name": "10240", + "storageSizeMB": 10240 + }, + "maxStorageSize": { + "name": "16777216", + "storageSizeMB": 16777216 + }, + "minBackupRetentionDays": 7, + "maxBackupRetentionDays": 35 + } ], "supportedServerVersions": [ { - "name": "12", + "name": "5.7", "supportedVcores": [ { - "name": "Standard_B1s", - "vCores": 1, - "supportedIops": 320, - "supportedMemoryPerVcoreMB": 1024 + "name": "Standard_E2ds_v4", + "vCores": 2, + "supportedIops": 3200, + "supportedMemoryPerVcoreMB": 8192 }, { - "name": "Standard_B1ms", - "vCores": 1, - "supportedIops": 640, - "supportedMemoryPerVcoreMB": 2048 + "name": "Standard_E4ds_v4", + "vCores": 4, + "supportedIops": 6400, + "supportedMemoryPerVcoreMB": 8192 }, { - "name": "Standard_B2s", - "vCores": 2, - "supportedIops": 1280, - "supportedMemoryPerVcoreMB": 2048 + "name": "Standard_E8ds_v4", + "vCores": 8, + "supportedIops": 12800, + "supportedMemoryPerVcoreMB": 8192 + }, + { + "name": "Standard_E16ds_v4", + "vCores": 16, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 8192 + }, + { + "name": "Standard_E32ds_v4", + "vCores": 32, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 8192 + }, + { + "name": "Standard_E48ds_v4", + "vCores": 48, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 8192 + }, + { + "name": "Standard_E64ds_v4", + "vCores": 64, + "supportedIops": 20000, + "supportedMemoryPerVcoreMB": 8192 } ] } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json index b190670c86fb..6b2d9e2a5270 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2020-07-01-privatepreview/mysql.json @@ -2151,12 +2151,6 @@ "description": "storage MB name", "readOnly": true }, - "supportedIops": { - "type": "integer", - "format": "int64", - "description": "supported IOPS", - "readOnly": true - }, "storageSizeMB": { "type": "integer", "format": "int64", @@ -2221,12 +2215,26 @@ "description": "storage edition name", "readOnly": true }, - "supportedStorageMB": { - "description": "A list of supported storage size in MB", - "type": "array", - "items": { - "$ref": "#/definitions/StorageMBCapability" - }, + "minStorageSize": { + "description": "The minimal supported storage size in MB", + "$ref": "#/definitions/StorageMBCapability", + "readOnly": true + }, + "maxStorageSize": { + "description": "The maximum supported storage size in MB", + "$ref": "#/definitions/StorageMBCapability", + "readOnly": true + }, + "minBackupRetentionDays": { + "type": "integer", + "format": "int64", + "description": "Minimal backup retention days", + "readOnly": true + }, + "maxBackupRetentionDays": { + "type": "integer", + "format": "int64", + "description": "Maximum backup retention days", "readOnly": true } },