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

Bugfix: Error creating VM with private IP in DTL. #3704

Closed
wants to merge 10 commits into from
Closed

Bugfix: Error creating VM with private IP in DTL. #3704

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2e9b9a6
Bugfix: Error creating VM with private IP in DTL.
kmsisco Jun 19, 2019
616a14c
Fixed formatting
kmsisco Jun 19, 2019
98d6c07
Don't update network properties unless natRules were set.
kmsisco Jun 20, 2019
47e127d
Added acceptance tests for bugfix
kmsisco Jun 22, 2019
af48b41
Simplified acctest changes.
kmsisco Jul 3, 2019
1fb11fb
Merge branch 'master' of github.com:kmsisco/terraform-provider-azurerm
kmsisco Jul 3, 2019
57514e9
Fixed whitespace
kmsisco Jul 3, 2019
8851344
Fixed whitespace
kmsisco Jul 3, 2019
b1ec1e5
Merge remote-tracking branch 'upstream/master'
kmsisco Aug 3, 2019
7730d0d
Updated test to use a VM with premium storage.
kmsisco Aug 5, 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
5 changes: 4 additions & 1 deletion azurerm/resource_arm_dev_test_linux_virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ func resourceArmDevTestLinuxVirtualMachineCreateUpdate(d *schema.ResourceData, m
GalleryImageReference: galleryImageReference,
LabSubnetName: utils.String(labSubnetName),
LabVirtualNetworkID: utils.String(labVirtualNetworkId),
NetworkInterface: &nic,
OsType: utils.String("Linux"),
Notes: utils.String(notes),
Password: utils.String(password),
Expand All @@ -207,6 +206,10 @@ func resourceArmDevTestLinuxVirtualMachineCreateUpdate(d *schema.ResourceData, m
Tags: expandTags(tags),
}

if len(natRules) > 0 {
parameters.LabVirtualMachineProperties.NetworkInterface = &nic
}

future, err := client.CreateOrUpdate(ctx, resourceGroup, labName, name, parameters)
if err != nil {
return fmt.Errorf("Error creating/updating DevTest Linux Virtual Machine %q (Lab %q / Resource Group %q): %+v", name, labName, resourceGroup, err)
Expand Down
5 changes: 4 additions & 1 deletion azurerm/resource_arm_dev_test_windows_virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ func resourceArmDevTestWindowsVirtualMachineCreateUpdate(d *schema.ResourceData,
GalleryImageReference: galleryImageReference,
LabSubnetName: utils.String(labSubnetName),
LabVirtualNetworkID: utils.String(labVirtualNetworkId),
NetworkInterface: &nic,
OsType: utils.String("Windows"),
Notes: utils.String(notes),
Password: utils.String(password),
Expand All @@ -196,6 +195,10 @@ func resourceArmDevTestWindowsVirtualMachineCreateUpdate(d *schema.ResourceData,
Tags: expandTags(tags),
}

if len(natRules) > 0 {
parameters.LabVirtualMachineProperties.NetworkInterface = &nic
}

future, err := client.CreateOrUpdate(ctx, resourceGroup, labName, name, parameters)
if err != nil {
return fmt.Errorf("Error creating/updating DevTest Windows Virtual Machine %q (Lab %q / Resource Group %q): %+v", name, labName, resourceGroup, err)
Expand Down