Generated from 488aaf5293d8677d79f040f78b30fa4fe70c46ee

Merge remote-tracking branch 'upstream/master' # Conflicts: # specification/compute/resource-manager/readme.md
AzureSDKAutomation · Feb 19, 2020 · 619a7c9 · 619a7c9
1 parent e6289b7
commit 619a7c9
Show file tree

Hide file tree

Showing 35 changed files with 573 additions and 104 deletions.
diff --git a/sdk/compute/arm-compute/src/models/availabilitySetsMappers.ts b/sdk/compute/arm-compute/src/models/availabilitySetsMappers.ts
@@ -38,6 +38,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -52,9 +53,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/containerServicesMappers.ts b/sdk/compute/arm-compute/src/models/containerServicesMappers.ts
@@ -38,6 +38,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -52,9 +53,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/dedicatedHostGroupsMappers.ts b/sdk/compute/arm-compute/src/models/dedicatedHostGroupsMappers.ts
@@ -37,6 +37,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -52,9 +53,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/dedicatedHostsMappers.ts b/sdk/compute/arm-compute/src/models/dedicatedHostsMappers.ts
@@ -37,6 +37,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -52,9 +53,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/diskEncryptionSetsMappers.ts b/sdk/compute/arm-compute/src/models/diskEncryptionSetsMappers.ts
@@ -37,6 +37,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -53,9 +54,11 @@ export {
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
   DiskEncryptionSetUpdate,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -102,6 +105,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -118,6 +122,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -131,6 +136,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/disksMappers.ts b/sdk/compute/arm-compute/src/models/disksMappers.ts
@@ -38,6 +38,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -52,11 +53,13 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskList,
   DiskSku,
   DiskUpdate,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -104,6 +107,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -120,6 +124,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -133,6 +138,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/galleriesMappers.ts b/sdk/compute/arm-compute/src/models/galleriesMappers.ts
@@ -37,6 +37,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -51,9 +52,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/galleryApplicationVersionsMappers.ts b/sdk/compute/arm-compute/src/models/galleryApplicationVersionsMappers.ts
@@ -37,6 +37,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -51,9 +52,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,

diff --git a/sdk/compute/arm-compute/src/models/galleryApplicationsMappers.ts b/sdk/compute/arm-compute/src/models/galleryApplicationsMappers.ts
@@ -37,6 +37,7 @@ export {
   CreationData,
   DataDisk,
   DataDiskImage,
+  DataDiskImageEncryption,
   DedicatedHost,
   DedicatedHostAllocatableVM,
   DedicatedHostAvailableCapacity,
@@ -51,9 +52,11 @@ export {
   DiskEncryptionSet,
   DiskEncryptionSetParameters,
   DiskEncryptionSettings,
+  DiskImageEncryption,
   DiskInstanceView,
   DiskSku,
   Encryption,
+  EncryptionImages,
   EncryptionSetIdentity,
   EncryptionSettingsCollection,
   EncryptionSettingsElement,
@@ -101,6 +104,7 @@ export {
   NetworkProfile,
   OSDisk,
   OSDiskImage,
+  OSDiskImageEncryption,
   OSProfile,
   Plan,
   ProximityPlacementGroup,
@@ -117,6 +121,7 @@ export {
   RollingUpgradeStatusInfo,
   ScaleInPolicy,
   ScheduledEventsProfile,
+  ShareInfoElement,
   Sku,
   Snapshot,
   SnapshotSku,
@@ -130,6 +135,7 @@ export {
   TargetRegion,
   TerminateNotificationProfile,
   UpdateResource,
+  UpdateResourceDefinition,
   UpgradePolicy,
   UserArtifactSource,
   VaultCertificate,