From 9850202aba55bdcd07d6960a4722ea83c464d2f0 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sat, 2 Jun 2018 06:27:11 -0700 Subject: [PATCH] [AutoPR compute/resource-manager] [Compute] Fix List VM Extension API name, description updates and other fixes. (#1949) * Generated from d4855e2ca85a8ed773644fdb69da2a852097cca4 Add VMSS Ip Tag * Generated from d4855e2ca85a8ed773644fdb69da2a852097cca4 Add VMSS Ip Tag --- .../latest/compute/mgmt/compute/models.go | 1 + .../preview/compute/mgmt/compute/models.go | 1 + .../compute/mgmt/2018-04-01/compute/models.go | 33 +++++++++++++++---- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/profiles/latest/compute/mgmt/compute/models.go b/profiles/latest/compute/mgmt/compute/models.go index 62f73987a75b..cf20c0506189 100644 --- a/profiles/latest/compute/mgmt/compute/models.go +++ b/profiles/latest/compute/mgmt/compute/models.go @@ -596,6 +596,7 @@ type ResourceSkuRestrictions = original.ResourceSkuRestrictions type ResourceSkusResult = original.ResourceSkusResult type ResourceSkusResultIterator = original.ResourceSkusResultIterator type ResourceSkusResultPage = original.ResourceSkusResultPage +type ResourceUpdate = original.ResourceUpdate type RollbackStatusInfo = original.RollbackStatusInfo type RollingUpgradePolicy = original.RollingUpgradePolicy type RollingUpgradeProgressInfo = original.RollingUpgradeProgressInfo diff --git a/profiles/preview/compute/mgmt/compute/models.go b/profiles/preview/compute/mgmt/compute/models.go index 0b7b12da2907..b196d2f3e27a 100644 --- a/profiles/preview/compute/mgmt/compute/models.go +++ b/profiles/preview/compute/mgmt/compute/models.go @@ -596,6 +596,7 @@ type ResourceSkuRestrictions = original.ResourceSkuRestrictions type ResourceSkusResult = original.ResourceSkusResult type ResourceSkusResultIterator = original.ResourceSkusResultIterator type ResourceSkusResultPage = original.ResourceSkusResultPage +type ResourceUpdate = original.ResourceUpdate type RollbackStatusInfo = original.RollbackStatusInfo type RollingUpgradePolicy = original.RollingUpgradePolicy type RollingUpgradeProgressInfo = original.RollingUpgradeProgressInfo diff --git a/services/compute/mgmt/2018-04-01/compute/models.go b/services/compute/mgmt/2018-04-01/compute/models.go index 707a78d2afc0..1c3f892ebe5f 100644 --- a/services/compute/mgmt/2018-04-01/compute/models.go +++ b/services/compute/mgmt/2018-04-01/compute/models.go @@ -1656,7 +1656,7 @@ type DataDisk struct { Caching CachingTypes `json:"caching,omitempty"` // WriteAcceleratorEnabled - Specifies whether writeAccelerator should be enabled or disabled on the disk. WriteAcceleratorEnabled *bool `json:"writeAcceleratorEnabled,omitempty"` - // CreateOption - Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described. Possible values include: 'DiskCreateOptionTypesFromImage', 'DiskCreateOptionTypesEmpty', 'DiskCreateOptionTypesAttach' + // CreateOption - Specifies how the virtual machine should be created.

Possible values are:

**Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described. Possible values include: 'DiskCreateOptionTypesFromImage', 'DiskCreateOptionTypesEmpty', 'DiskCreateOptionTypesAttach' CreateOption DiskCreateOptionTypes `json:"createOption,omitempty"` // DiskSizeGB - Specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image.

This value cannot be larger than 1023 GB DiskSizeGB *int32 `json:"diskSizeGB,omitempty"` @@ -3121,7 +3121,7 @@ type OSDisk struct { Caching CachingTypes `json:"caching,omitempty"` // WriteAcceleratorEnabled - Specifies whether writeAccelerator should be enabled or disabled on the disk. WriteAcceleratorEnabled *bool `json:"writeAcceleratorEnabled,omitempty"` - // CreateOption - Specifies how the virtual machine should be created.

Possible values are:

**Attach** This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described. Possible values include: 'DiskCreateOptionTypesFromImage', 'DiskCreateOptionTypesEmpty', 'DiskCreateOptionTypesAttach' + // CreateOption - Specifies how the virtual machine should be created.

Possible values are:

**Attach** \u2013 This value is used when you are using a specialized disk to create the virtual machine.

**FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described. Possible values include: 'DiskCreateOptionTypesFromImage', 'DiskCreateOptionTypesEmpty', 'DiskCreateOptionTypesAttach' CreateOption DiskCreateOptionTypes `json:"createOption,omitempty"` // DiskSizeGB - Specifies the size of an empty data disk in gigabytes. This element can be used to overwrite the name of the disk in a virtual machine image.

This value cannot be larger than 1023 GB DiskSizeGB *int32 `json:"diskSizeGB,omitempty"` @@ -3430,13 +3430,32 @@ func (page ResourceSkusResultPage) Values() []ResourceSku { return *page.rsr.Value } -// RollbackStatusInfo information about rollback on failed VM instances after a OS Upgrade operation +// ResourceUpdate the Resource model definition. +type ResourceUpdate struct { + // Tags - Resource tags + Tags map[string]*string `json:"tags"` + Sku *DiskSku `json:"sku,omitempty"` +} + +// MarshalJSON is the custom marshaler for ResourceUpdate. +func (ru ResourceUpdate) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if ru.Tags != nil { + objectMap["tags"] = ru.Tags + } + if ru.Sku != nil { + objectMap["sku"] = ru.Sku + } + return json.Marshal(objectMap) +} + +// RollbackStatusInfo information about rollback on failed VM instances after a OS Upgrade operation. type RollbackStatusInfo struct { // SuccessfullyRolledbackInstanceCount - The number of instances which have been successfully rolled back. SuccessfullyRolledbackInstanceCount *int32 `json:"successfullyRolledbackInstanceCount,omitempty"` // FailedRolledbackInstanceCount - The number of instances which failed to rollback. FailedRolledbackInstanceCount *int32 `json:"failedRolledbackInstanceCount,omitempty"` - // RollbackError - Error Details if OS rollback failed. + // RollbackError - Error details if OS rollback failed. RollbackError *APIError `json:"rollbackError,omitempty"` } @@ -4268,7 +4287,7 @@ type SnapshotUpdate struct { *DiskUpdateProperties `json:"properties,omitempty"` // Tags - Resource tags Tags map[string]*string `json:"tags"` - Sku *SnapshotSku `json:"sku,omitempty"` + Sku *DiskSku `json:"sku,omitempty"` } // MarshalJSON is the custom marshaler for SnapshotUpdate. @@ -4315,7 +4334,7 @@ func (su *SnapshotUpdate) UnmarshalJSON(body []byte) error { } case "sku": if v != nil { - var sku SnapshotSku + var sku DiskSku err = json.Unmarshal(*v, &sku) if err != nil { return err @@ -6562,7 +6581,7 @@ type VirtualMachineScaleSetOSDisk struct { Caching CachingTypes `json:"caching,omitempty"` // WriteAcceleratorEnabled - Specifies whether writeAccelerator should be enabled or disabled on the disk. WriteAcceleratorEnabled *bool `json:"writeAcceleratorEnabled,omitempty"` - // CreateOption - Specifies how the virtual machines in the scale set should be created.

The only allowed value is: **FromImage** This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described. Possible values include: 'DiskCreateOptionTypesFromImage', 'DiskCreateOptionTypesEmpty', 'DiskCreateOptionTypesAttach' + // CreateOption - Specifies how the virtual machines in the scale set should be created.

The only allowed value is: **FromImage** \u2013 This value is used when you are using an image to create the virtual machine. If you are using a platform image, you also use the imageReference element described above. If you are using a marketplace image, you also use the plan element previously described. Possible values include: 'DiskCreateOptionTypesFromImage', 'DiskCreateOptionTypesEmpty', 'DiskCreateOptionTypesAttach' CreateOption DiskCreateOptionTypes `json:"createOption,omitempty"` // OsType - This property allows you to specify the type of the OS that is included in the disk if creating a VM from user-image or a specialized VHD.

Possible values are:

**Windows**

**Linux**. Possible values include: 'Windows', 'Linux' OsType OperatingSystemTypes `json:"osType,omitempty"`