Merge pull request #2484 from Azure/restapi_auto_mysql/resource-manager

[AutoPR] mysql/resource-manager

codegen_mappings.json

@@ -425,6 +425,8 @@
   "mysql": {
     "resource-manager": {
       "packageName": "azure-arm-mysql",
+      "packageVersion": "2.0.0-preview",
+      "generateReadmeMd": false,
       "dir": "mysqlManagement",
       "source": "mysql/resource-manager/readme.md"
     }

lib/services/mysqlManagement/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Microsoft
+Copyright (c) 2018 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

lib/services/mysqlManagement/lib/models/index.d.ts

@@ -47,23 +47,46 @@ export interface TrackedResource extends ProxyResource {
   tags?: { [propertyName: string]: string };
 }
 
+/**
+ * @class
+ * Initializes a new instance of the StorageProfile class.
+ * @constructor
+ * Storage Profile properties of a server
+ *
+ * @member {number} [backupRetentionDays] Backup retention days for the server.
+ * @member {string} [geoRedundantBackup] Enable Geo-redundant or not for server
+ * backup. Possible values include: 'Enabled', 'Disabled'
+ * @member {number} [storageMB] Max storage allowed for a server.
+ */
+export interface StorageProfile {
+  backupRetentionDays?: number;
+  geoRedundantBackup?: string;
+  storageMB?: number;
+}
+
 /**
  * @class
  * Initializes a new instance of the ServerPropertiesForCreate class.
  * @constructor
  * The properties used to create a new server.
  *
- * @member {number} [storageMB] The maximum storage allowed for a server.
  * @member {string} [version] Server version. Possible values include: '5.6',
  * '5.7'
  * @member {string} [sslEnforcement] Enable ssl enforcement or not when connect
  * to server. Possible values include: 'Enabled', 'Disabled'
+ * @member {object} [storageProfile] Storage profile of a server.
+ * @member {number} [storageProfile.backupRetentionDays] Backup retention days
+ * for the server.
+ * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant or
+ * not for server backup. Possible values include: 'Enabled', 'Disabled'
+ * @member {number} [storageProfile.storageMB] Max storage allowed for a
+ * server.
  * @member {string} createMode Polymorphic Discriminator
  */
 export interface ServerPropertiesForCreate {
-  storageMB?: number;
   version?: string;
   sslEnforcement?: string;
+  storageProfile?: StorageProfile;
   createMode: string;
 }
 
@@ -105,10 +128,10 @@ export interface ServerPropertiesForRestore extends ServerPropertiesForCreate {
  * @constructor
  * Billing information related properties of a server.
  *
- * @member {string} [name] The name of the sku, typically, a letter + Number
- * code, e.g. P3.
+ * @member {string} [name] The name of the sku, typically, tier + family +
+ * cores, e.g. B_Gen4_1, GP_Gen5_8.
  * @member {string} [tier] The tier of the particular SKU, e.g. Basic. Possible
- * values include: 'Basic', 'Standard'
+ * values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized'
  * @member {number} [capacity] The scale up/out capacity, representing server's
  * compute units.
  * @member {string} [size] The size code, to be interpreted by resource as
@@ -130,10 +153,10 @@ export interface Sku {
  * Represents a server.
  *
  * @member {object} [sku] The SKU (pricing tier) of the server.
- * @member {string} [sku.name] The name of the sku, typically, a letter +
- * Number code, e.g. P3.
+ * @member {string} [sku.name] The name of the sku, typically, tier + family +
+ * cores, e.g. B_Gen4_1, GP_Gen5_8.
  * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic.
- * Possible values include: 'Basic', 'Standard'
+ * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized'
  * @member {number} [sku.capacity] The scale up/out capacity, representing
  * server's compute units.
  * @member {string} [sku.size] The size code, to be interpreted by resource as
@@ -142,7 +165,6 @@ export interface Sku {
  * @member {string} [administratorLogin] The administrator's login name of a
  * server. Can only be specified when the server is being created (and is
  * required for creation).
- * @member {number} [storageMB] The maximum storage allowed for a server.
  * @member {string} [version] Server version. Possible values include: '5.6',
  * '5.7'
  * @member {string} [sslEnforcement] Enable ssl enforcement or not when connect
@@ -151,15 +173,25 @@ export interface Sku {
  * user. Possible values include: 'Ready', 'Dropping', 'Disabled'
  * @member {string} [fullyQualifiedDomainName] The fully qualified domain name
  * of a server.
+ * @member {date} [earliestRestoreDate] Earliest restore point creation time
+ * (ISO8601 format)
+ * @member {object} [storageProfile] Storage profile of a server.
+ * @member {number} [storageProfile.backupRetentionDays] Backup retention days
+ * for the server.
+ * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant or
+ * not for server backup. Possible values include: 'Enabled', 'Disabled'
+ * @member {number} [storageProfile.storageMB] Max storage allowed for a
+ * server.
  */
 export interface Server extends TrackedResource {
   sku?: Sku;
   administratorLogin?: string;
-  storageMB?: number;
   version?: string;
   sslEnforcement?: string;
   userVisibleState?: string;
   fullyQualifiedDomainName?: string;
+  earliestRestoreDate?: Date;
+  storageProfile?: StorageProfile;
 }
 
 /**
@@ -169,22 +201,28 @@ export interface Server extends TrackedResource {
  * Represents a server to be created.
  *
  * @member {object} [sku] The SKU (pricing tier) of the server.
- * @member {string} [sku.name] The name of the sku, typically, a letter +
- * Number code, e.g. P3.
+ * @member {string} [sku.name] The name of the sku, typically, tier + family +
+ * cores, e.g. B_Gen4_1, GP_Gen5_8.
  * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic.
- * Possible values include: 'Basic', 'Standard'
+ * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized'
  * @member {number} [sku.capacity] The scale up/out capacity, representing
  * server's compute units.
  * @member {string} [sku.size] The size code, to be interpreted by resource as
  * appropriate.
  * @member {string} [sku.family] The family of hardware.
  * @member {object} properties Properties of the server.
- * @member {number} [properties.storageMB] The maximum storage allowed for a
- * server.
  * @member {string} [properties.version] Server version. Possible values
  * include: '5.6', '5.7'
  * @member {string} [properties.sslEnforcement] Enable ssl enforcement or not
  * when connect to server. Possible values include: 'Enabled', 'Disabled'
+ * @member {object} [properties.storageProfile] Storage profile of a server.
+ * @member {number} [properties.storageProfile.backupRetentionDays] Backup
+ * retention days for the server.
+ * @member {string} [properties.storageProfile.geoRedundantBackup] Enable
+ * Geo-redundant or not for server backup. Possible values include: 'Enabled',
+ * 'Disabled'
+ * @member {number} [properties.storageProfile.storageMB] Max storage allowed
+ * for a server.
  * @member {string} [properties.createMode] Polymorphic Discriminator
  * @member {string} location The location the resource resides in.
  * @member {object} [tags] Application-specific metadata in the form of
@@ -204,16 +242,22 @@ export interface ServerForCreate {
  * Parameters allowd to update for a server.
  *
  * @member {object} [sku] The SKU (pricing tier) of the server.
- * @member {string} [sku.name] The name of the sku, typically, a letter +
- * Number code, e.g. P3.
+ * @member {string} [sku.name] The name of the sku, typically, tier + family +
+ * cores, e.g. B_Gen4_1, GP_Gen5_8.
  * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic.
- * Possible values include: 'Basic', 'Standard'
+ * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized'
  * @member {number} [sku.capacity] The scale up/out capacity, representing
  * server's compute units.
  * @member {string} [sku.size] The size code, to be interpreted by resource as
  * appropriate.
  * @member {string} [sku.family] The family of hardware.
- * @member {number} [storageMB] The max storage allowed for a server.
+ * @member {object} [storageProfile] Storage profile of a server.
+ * @member {number} [storageProfile.backupRetentionDays] Backup retention days
+ * for the server.
+ * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant or
+ * not for server backup. Possible values include: 'Enabled', 'Disabled'
+ * @member {number} [storageProfile.storageMB] Max storage allowed for a
+ * server.
  * @member {string} [administratorLoginPassword] The password of the
  * administrator login.
  * @member {string} [version] The version of a server. Possible values include:
@@ -225,7 +269,7 @@ export interface ServerForCreate {
  */
 export interface ServerUpdateParameters {
   sku?: Sku;
-  storageMB?: number;
+  storageProfile?: StorageProfile;
   administratorLoginPassword?: string;
   version?: string;
   sslEnforcement?: string;
@@ -347,18 +391,16 @@ export interface OperationListResult {
  * @constructor
  * Represents a log file.
  *
- * @member {string} [logFileName] Log file name.
  * @member {number} [sizeInKB] Size of the log file.
  * @member {date} [createdTime] Creation timestamp of the log file.
  * @member {date} [lastModifiedTime] Last modified timestamp of the log file.
  * @member {string} [logFileType] Type of the log file.
  * @member {string} [url] The url to download the log file from.
  */
 export interface LogFile extends ProxyResource {
-  logFileName?: string;
   sizeInKB?: number;
-  createdTime?: Date;
-  lastModifiedTime?: Date;
+  readonly createdTime?: Date;
+  readonly lastModifiedTime?: Date;
   logFileType?: string;
   url?: string;
 }
@@ -371,16 +413,25 @@ export interface LogFile extends ProxyResource {
  *
  * @member {string} [id] ID for the service level objective.
  * @member {string} [edition] Edition of the performance tier.
- * @member {number} [dtu] Database throughput unit associated with the service
- * level objective
- * @member {number} [storageMB] Maximum storage in MB associated with the
- * service level objective
+ * @member {number} [vCore] vCore associated with the service level objective
+ * @member {string} [hardwareGeneration] Hardware generation associated with
+ * the service level objective
+ * @member {number} [maxBackupRetentionDays] Maximum Backup retention in days
+ * for the performance tier edition
+ * @member {number} [minBackupRetentionDays] Minimum Backup retention in days
+ * for the performance tier edition
+ * @member {number} [maxStorageMB] Max storage allowed for a server.
+ * @member {number} [minStorageMB] Max storage allowed for a server.
  */
 export interface PerformanceTierServiceLevelObjectives {
   id?: string;
   edition?: string;
-  dtu?: number;
-  storageMB?: number;
+  vCore?: number;
+  hardwareGeneration?: string;
+  maxBackupRetentionDays?: number;
+  minBackupRetentionDays?: number;
+  maxStorageMB?: number;
+  minStorageMB?: number;
 }
 
 /**
@@ -390,14 +441,11 @@ export interface PerformanceTierServiceLevelObjectives {
  * Performance tier properties
  *
  * @member {string} [id] ID of the performance tier.
- * @member {number} [backupRetentionDays] Backup retention in days for the
- * performance tier edition
  * @member {array} [serviceLevelObjectives] Service level objectives associated
  * with the performance tier
  */
 export interface PerformanceTierProperties {
   id?: string;
-  backupRetentionDays?: number;
   serviceLevelObjectives?: PerformanceTierServiceLevelObjectives[];
 }
 
@@ -407,11 +455,11 @@ export interface PerformanceTierProperties {
  * @constructor
  * Request from client to check resource name availability.
  *
- * @member {string} [name] Resource name to verify.
+ * @member {string} name Resource name to verify.
  * @member {string} [type] Resource type used for verification.
  */
 export interface NameAvailabilityRequest {
-  name?: string;
+  name: string;
   type?: string;
 }
 

lib/services/mysqlManagement/lib/models/index.js

@@ -20,6 +20,7 @@ exports.BaseResource = msRestAzure.BaseResource;
 exports.CloudError = msRestAzure.CloudError;
 exports.ProxyResource = require('./proxyResource');
 exports.TrackedResource = require('./trackedResource');
+exports.StorageProfile = require('./storageProfile');
 exports.ServerPropertiesForCreate = require('./serverPropertiesForCreate');
 exports.ServerPropertiesForDefaultCreate = require('./serverPropertiesForDefaultCreate');
 exports.ServerPropertiesForRestore = require('./serverPropertiesForRestore');

lib/services/mysqlManagement/lib/models/logFile.js

@@ -20,7 +20,6 @@ const models = require('./index');
 class LogFile extends models['ProxyResource'] {
   /**
    * Create a LogFile.
-   * @member {string} [logFileName] Log file name.
    * @member {number} [sizeInKB] Size of the log file.
    * @member {date} [createdTime] Creation timestamp of the log file.
    * @member {date} [lastModifiedTime] Last modified timestamp of the log file.
@@ -69,13 +68,6 @@ class LogFile extends models['ProxyResource'] {
               name: 'String'
             }
           },
-          logFileName: {
-            required: false,
-            serializedName: 'properties.name',
-            type: {
-              name: 'String'
-            }
-          },
           sizeInKB: {
             required: false,
             serializedName: 'properties.sizeInKB',
@@ -85,13 +77,15 @@ class LogFile extends models['ProxyResource'] {
           },
           createdTime: {
             required: false,
+            readOnly: true,
             serializedName: 'properties.createdTime',
             type: {
               name: 'DateTime'
             }
           },
           lastModifiedTime: {
             required: false,
+            readOnly: true,
             serializedName: 'properties.lastModifiedTime',
             type: {
               name: 'DateTime'

lib/services/mysqlManagement/lib/models/nameAvailabilityRequest.js

@@ -17,7 +17,7 @@
 class NameAvailabilityRequest {
   /**
    * Create a NameAvailabilityRequest.
-   * @member {string} [name] Resource name to verify.
+   * @member {string} name Resource name to verify.
    * @member {string} [type] Resource type used for verification.
    */
   constructor() {
@@ -38,7 +38,7 @@ class NameAvailabilityRequest {
         className: 'NameAvailabilityRequest',
         modelProperties: {
           name: {
-            required: false,
+            required: true,
             serializedName: 'name',
             type: {
               name: 'String'

lib/services/mysqlManagement/lib/models/performanceTierProperties.js

@@ -20,8 +20,6 @@ class PerformanceTierProperties {
   /**
    * Create a PerformanceTierProperties.
    * @member {string} [id] ID of the performance tier.
-   * @member {number} [backupRetentionDays] Backup retention in days for the
-   * performance tier edition
    * @member {array} [serviceLevelObjectives] Service level objectives
    * associated with the performance tier
    */
@@ -49,13 +47,6 @@ class PerformanceTierProperties {
               name: 'String'
             }
           },
-          backupRetentionDays: {
-            required: false,
-            serializedName: 'backupRetentionDays',
-            type: {
-              name: 'Number'
-            }
-          },
           serviceLevelObjectives: {
             required: false,
             serializedName: 'serviceLevelObjectives',