Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_virtual_machine: add support for Ultra SSD's to the managed_disk_type property #3860

Merged
merged 21 commits into from
Sep 1, 2019
Merged

azurerm_virtual_machine: add support for Ultra SSD's to the managed_disk_type property #3860

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f8394d6
added ultra ssd support
Jul 17, 2019
9a91e81
added documentation for addtional capabilities and code optimization
Jul 18, 2019
be125a5
added addtional_capabilities in virtual_machine markdown as optional
Jul 18, 2019
04d1ac2
added test case for addtional capabilities
Jul 20, 2019
ac41960
modified test case of additional_capabilities
Jul 20, 2019
731c0d1
Update azurerm/resource_arm_virtual_machine_unmanaged_disks_test.go
venkey1000 Jul 22, 2019
927be40
Update azurerm/resource_arm_virtual_machine.go
venkey1000 Jul 22, 2019
ef97eec
Update azurerm/resource_arm_virtual_machine.go
venkey1000 Jul 22, 2019
9fe3af2
fix of parenthesis miss
Jul 22, 2019
1ffeafb
change log
Jul 22, 2019
f73f0d7
removed addtional capabilities from changelog
Jul 22, 2019
d80ca15
making absolutely no changes in changelog
Jul 22, 2019
433892d
bug fix: for testcase of addtional_Capabilities
Jul 23, 2019
b068ba0
modified the test case of addtional capabilites to suit the requireme…
Aug 3, 2019
5b88385
linting
Aug 3, 2019
8601679
linting 2
Aug 3, 2019
a221d6f
linting 2
Aug 3, 2019
9ff0fd9
linting 2
Aug 3, 2019
0da7390
Merge branch 'master' into enable_ultra_ssd
katbyte Aug 31, 2019
f567c52
Update to address PR comments and get test to pass
katbyte Aug 31, 2019
d294f47
fix website
katbyte Aug 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions azurerm/resource_arm_virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ func resourceArmVirtualMachine() *schema.Resource {
string(compute.StorageAccountTypesPremiumLRS),
string(compute.StorageAccountTypesStandardLRS),
string(compute.StorageAccountTypesStandardSSDLRS),
string(compute.StorageAccountTypesUltraSSDLRS),
katbyte marked this conversation as resolved.
Show resolved Hide resolved
}, true),
},

Expand Down Expand Up @@ -356,6 +357,19 @@ func resourceArmVirtualMachine() *schema.Resource {
},
},
},
"additional_capabilities": {
tombuildsstuff marked this conversation as resolved.
Show resolved Hide resolved
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"ultra_ssd_enabled": {
Type: schema.TypeBool,
Required: true,
katbyte marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
},

"os_profile": {
Type: schema.TypeSet,
Expand Down Expand Up @@ -630,6 +644,12 @@ func resourceArmVirtualMachineCreateUpdate(d *schema.ResourceData, meta interfac
properties.DiagnosticsProfile = diagnosticsProfile
}
}
if _, ok := d.GetOk("additional_capabilities"); ok {
additionalCapabilities := expandAzureRmVirtualMachineAdditionalCapabilities(d)
if additionalCapabilities != nil {
properties.AdditionalCapabilities = additionalCapabilities
tombuildsstuff marked this conversation as resolved.
Show resolved Hide resolved
}
}

if _, ok := d.GetOk("os_profile"); ok {
osProfile, err2 := expandAzureRmVirtualMachineOsProfile(d)
Expand Down Expand Up @@ -811,6 +831,11 @@ func resourceArmVirtualMachineRead(d *schema.ResourceData, meta interface{}) err
return fmt.Errorf("Error setting `boot_diagnostics`: %#v", err)
}
}
if profile := props.AdditionalCapabilities; profile != nil {
venkey1000 marked this conversation as resolved.
Show resolved Hide resolved
if err := d.Set("additional_capabilities", flattenAzureRmVirtualMachineAdditionalCapabilities(profile)); err != nil {
venkey1000 marked this conversation as resolved.
Show resolved Hide resolved
return fmt.Errorf("Error setting `additional_capabilities`: %#v", err)
}
}

if profile := props.NetworkProfile; profile != nil {
if err := d.Set("network_interface_ids", flattenAzureRmVirtualMachineNetworkInterfaces(profile)); err != nil {
Expand Down Expand Up @@ -1091,6 +1116,19 @@ func flattenAzureRmVirtualMachineDiagnosticsProfile(profile *compute.BootDiagnos
return []interface{}{result}
}

func flattenAzureRmVirtualMachineAdditionalCapabilities(profile *compute.AdditionalCapabilities) []interface{} {
if profile == nil {
return []interface{}{}
}

result := make(map[string]interface{})

if profile.UltraSSDEnabled != nil {
result["ultra_ssd_enabled"] = *profile.UltraSSDEnabled
}
return []interface{}{result}
}

func flattenAzureRmVirtualMachineNetworkInterfaces(profile *compute.NetworkProfile) []interface{} {
result := make([]interface{}, 0)
for _, nic := range *profile.NetworkInterfaces {
Expand Down Expand Up @@ -1636,6 +1674,20 @@ func expandAzureRmVirtualMachineDiagnosticsProfile(d *schema.ResourceData) *comp
return nil
}

func expandAzureRmVirtualMachineAdditionalCapabilities(d *schema.ResourceData) *compute.AdditionalCapabilities {
additionalCapabilities := d.Get("additional_capabilities").([]interface{})
if len(additionalCapabilities) > 0 {
additionalCapability := additionalCapabilities[0].(map[string]interface{})

capability := &compute.AdditionalCapabilities{
UltraSSDEnabled: utils.Bool(additionalCapability["ultra_ssd_enabled"].(bool)),
}
return capability
}

return nil
}

func expandAzureRmVirtualMachineImageReference(d *schema.ResourceData) (*compute.ImageReference, error) {
storageImageRefs := d.Get("storage_image_reference").(*schema.Set).List()

Expand Down