Merge pull request #3764 from Azure/restapi_auto_sql/resource-manager

[AutoPR] sql/resource-manager
Azure · Oct 5, 2018 · db378b4 · db378b4
2 parents a40855c + fb53915
commit db378b4
Show file tree

Hide file tree

Showing 12 changed files with 4,341 additions and 1 deletion.
diff --git a/lib/services/sqlManagement2/lib/models/index.d.ts b/lib/services/sqlManagement2/lib/models/index.d.ts
@@ -1342,6 +1342,10 @@ export interface Sku {
  * 'LicenseIncluded' and 'BasePrice'.
  * @member {number} [vCores] The number of VCores.
  * @member {number} [storageSizeInGB] The maximum storage size in GB.
+ * @member {string} [collation] Collation of the managed instance.
+ * @member {string} [dnsZone] The Dns Zone that the managed instance is in.
+ * @member {string} [dnsZonePartner] The resource id of another managed
+ * instance whose DNS zone this managed instance will share after creation.
  */
 export interface ManagedInstance extends TrackedResource {
   identity?: ResourceIdentity;
@@ -1354,6 +1358,9 @@ export interface ManagedInstance extends TrackedResource {
   licenseType?: string;
   vCores?: number;
   storageSizeInGB?: number;
+  readonly collation?: string;
+  readonly dnsZone?: string;
+  dnsZonePartner?: string;
 }
 
 /**
@@ -1388,6 +1395,10 @@ export interface ManagedInstance extends TrackedResource {
  * 'LicenseIncluded' and 'BasePrice'.
  * @member {number} [vCores] The number of VCores.
  * @member {number} [storageSizeInGB] The maximum storage size in GB.
+ * @member {string} [collation] Collation of the managed instance.
+ * @member {string} [dnsZone] The Dns Zone that the managed instance is in.
+ * @member {string} [dnsZonePartner] The resource id of another managed
+ * instance whose DNS zone this managed instance will share after creation.
  * @member {object} [tags] Resource tags.
  */
 export interface ManagedInstanceUpdate {
@@ -1400,6 +1411,9 @@ export interface ManagedInstanceUpdate {
   licenseType?: string;
   vCores?: number;
   storageSizeInGB?: number;
+  readonly collation?: string;
+  readonly dnsZone?: string;
+  dnsZonePartner?: string;
   tags?: { [propertyName: string]: string };
 }
 

diff --git a/lib/services/sqlManagement2/lib/models/managedInstance.js b/lib/services/sqlManagement2/lib/models/managedInstance.js
@@ -56,6 +56,10 @@ class ManagedInstance extends models['TrackedResource'] {
    * 'LicenseIncluded' and 'BasePrice'.
    * @member {number} [vCores] The number of VCores.
    * @member {number} [storageSizeInGB] The maximum storage size in GB.
+   * @member {string} [collation] Collation of the managed instance.
+   * @member {string} [dnsZone] The Dns Zone that the managed instance is in.
+   * @member {string} [dnsZonePartner] The resource id of another managed
+   * instance whose DNS zone this managed instance will share after creation.
    */
   constructor() {
     super();
@@ -193,6 +197,29 @@ class ManagedInstance extends models['TrackedResource'] {
             type: {
               name: 'Number'
             }
+          },
+          collation: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.collation',
+            type: {
+              name: 'String'
+            }
+          },
+          dnsZone: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.dnsZone',
+            type: {
+              name: 'String'
+            }
+          },
+          dnsZonePartner: {
+            required: false,
+            serializedName: 'properties.dnsZonePartner',
+            type: {
+              name: 'String'
+            }
           }
         }
       }

diff --git a/lib/services/sqlManagement2/lib/models/managedInstanceUpdate.js b/lib/services/sqlManagement2/lib/models/managedInstanceUpdate.js
@@ -44,6 +44,10 @@ class ManagedInstanceUpdate {
    * 'LicenseIncluded' and 'BasePrice'.
    * @member {number} [vCores] The number of VCores.
    * @member {number} [storageSizeInGB] The maximum storage size in GB.
+   * @member {string} [collation] Collation of the managed instance.
+   * @member {string} [dnsZone] The Dns Zone that the managed instance is in.
+   * @member {string} [dnsZonePartner] The resource id of another managed
+   * instance whose DNS zone this managed instance will share after creation.
    * @member {object} [tags] Resource tags.
    */
   constructor() {
@@ -129,6 +133,29 @@ class ManagedInstanceUpdate {
               name: 'Number'
             }
           },
+          collation: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.collation',
+            type: {
+              name: 'String'
+            }
+          },
+          dnsZone: {
+            required: false,
+            readOnly: true,
+            serializedName: 'properties.dnsZone',
+            type: {
+              name: 'String'
+            }
+          },
+          dnsZonePartner: {
+            required: false,
+            serializedName: 'properties.dnsZonePartner',
+            type: {
+              name: 'String'
+            }
+          },
           tags: {
             required: false,
             serializedName: 'tags',