Skip to content

Commit

Permalink
Add "reboot_vapp_on_removal" field to test's template (#1031)
Browse files Browse the repository at this point in the history
* Add "reboot_vapp_on_removal" field to test's template

---------

Signed-off-by: Adam Jasinski <[email protected]>
  • Loading branch information
adezxc authored Mar 27, 2023
1 parent 11638b3 commit 12e76fd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .changes/v3.9.0/1007-bug-fixes.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* Add `prefix_length` field to `vcd_vapp_network` as creating IPv6 vApp networks was not supported due to the lack of a suitable subnet representation (Issue #999) [GH-1007]
* Add `prefix_length` field to `vcd_vapp_network` as creating IPv6 vApp networks was not supported due to the lack of a suitable subnet representation (Issue #999) [GH-1007, GH-1031]
* Remove incorrect default value from `vcd_vapp_network` `netmask` field, as it prevents using IPV6 networks. Users of already defined resources need to add a `netmask = "255.255.255.0"` when using Ipv4 [GH-1007]
6 changes: 4 additions & 2 deletions vcd/resource_vcd_vapp_network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ func TestAccVcdVappNetwork_Isolated_ipv6(t *testing.T) {
"orgNetworkForUpdate": " ",
"retainIpMacEnabled": "false",
"retainIpMacEnabledForUpdate": "false",
"RebootVappOnRemoval": "true",
}
testParamsNotEmpty(t, params)

Expand Down Expand Up @@ -562,8 +563,9 @@ resource "vcd_vapp_network" "{{.resourceName}}" {
{{.OrgNetworkKey}} {{.equalsChar}} {{.quotationChar}}{{.orgNetwork}}{{.quotationChar}}
retain_ip_mac_enabled = "{{.retainIpMacEnabled}}"
reboot_vapp_on_removal = {{.RebootVappOnRemoval}}
depends_on = ["vcd_vapp.{{.vappName}}"]
depends_on = [vcd_vapp.{{.vappName}}]
}
`

Expand Down Expand Up @@ -683,7 +685,7 @@ resource "vcd_vapp_network" "{{.resourceName}}" {
{{.OrgNetworkKey}} {{.equalsChar}} {{.quotationChar}}{{.orgNetworkForUpdate}}{{.quotationChar}}
retain_ip_mac_enabled = "{{.retainIpMacEnabledForUpdate}}"
reboot_vapp_on_removal = true
reboot_vapp_on_removal = {{.RebootVappOnRemoval}}
depends_on = ["vcd_vapp.{{.vappName}}"]
}
Expand Down

0 comments on commit 12e76fd

Please sign in to comment.