Add vApp network resources and data sources

[vbauzys]

Depends on vmware/go-vcloud-director#290
Ref: #329, #447, #264

• new vcd_vapp_org_network - vApp organization network
• vcd_vapp_network` - enhanced functionality - read/import/update. Also supports networks connected to Org VDC netw.
• vcd_vapp_org_network new data source
• vcd_vapp_network new data source

[lvirbalas]

"[vApp network resource]" should be exact resource name as in similar references in pages of other data sources. Same applies to the other data source page as well.

[vbauzys]

updated

[dataclouder]

Documentation clean up

[dataclouder]

Suggested change

	Provides a data source for vCloud director Org network attached to vApp.. This can be used to access vApp Org VDC network.
	Provides a data source for vCloud director Org network attached to vApp. This can be used to access vApp Org VDC network.

[vbauzys]

fixed

[dataclouder]

Suggested change

	Provides a vCloud Director vApp network data source. This can be used to access vApp network.
	Provides a vCloud Director vApp network data source. This can be used to access a vApp network.

[vbauzys]

updated

[dataclouder]

Suggested change

	Allows to provision vApp network and optionally connect it to existing Org VDC network.
	Allows to provision a vApp network and optionally connect it to an existing Org VDC network.

[vbauzys]

updated

[dataclouder]

Suggested change

	Allows to provision vApp network and optionally connect it to existing Org VDC network.
	Allows to provision a vApp network and optionally connect it to an existing Org VDC network.

[vbauzys]

updated

[dataclouder]

Suggested change

	* `org_network_name` - (Optional; *v2.7+*) An Org network name to which vApp network is connected to. If not configured, then isolated network created.
	* `org_network_name` - (Optional; *v2.7+*) An Org network name to which vApp network is connected. If not configured, then an isolated network is created.

[vbauzys]

updated

[dataclouder]

Suggested change

	Provides capability to attach existing Org VDC Network to vApp and toggle network features.
	Provides capability to attach an existing Org VDC Network to a vApp and toggle network features.

[vbauzys]

updated

[dataclouder]

Suggested change

	* `vapp_name` - (Required) The vApp this VM should belong to.
	* `vapp_name` - (Required) The vApp this network belongs to.

[vbauzys]

updated

[lvirbalas]

We need an example below how to "connect it to existing Org VDC network". What about adding these lines to the example below:

  # Comment below line to create an isolated vApp network
  org_network_name = "my-org-network"

BTW, please polish from "#Optional" to "# Optional" in the example too.

[vbauzys]

updated

[lvirbalas]

Let's add a newline above to make the new parameter (and comment) stand-out.

[vbauzys]

done

[lvirbalas]

We need a "DEPRECATIONS:" section with the note about behavior we're deprecating of VM creating vApp Org Network if it doesn't exist.

[vbauzys]

added

[lvirbalas]

Let's quote vcd_vapp_org_network word too.

[vbauzys]

done

[lvirbalas]

Ability to control all kinds of vApp networks are great additions and it's especially nice that they auto-address #264 too. The fact that we can now create and destroy vApp networks at a separate resource level, as opposed to the old way of inside the VM, makes the workflow and responsibilities of vApp vs. VM clearly defined. BTW, please close #264 together with the issue of this PR, unless you see otherwise.

I have added two more small requests to this PR, LGTM otherwise!

p.s. I was having issues with destroy workflows, but they turned out to be because of https://github.com/terraform-providers/terraform-provider-vcd/issues/464

[lvirbalas]

Suggested change

	* `resource/vcd_vapp_vm` `network.name` deprecated creation/attaching vApp network when doesn't exist. Requires to create/attach
	* `resource/vcd_vapp_vm` `network.name` deprecate automatic creation/attaching of a vApp network when it doesn't exist. Requires to create/attach

Also, isn't this deprecation actual only for type = org? This message needs to be adjusted to reflect that. Now you can read it as if even isolated vApp network is being auto-created, which is not.

Also, the comment looks to be split into two lines needlessly.

[vbauzys]

adjusted

[lvirbalas]

Something is not right here. So, after reading the new changelog message:

DEPRECATIONS:

• resource/vcd_vapp_vm network.name deprecated automatic attaching of vApp Org network when network.type=org and it doesn't exist. Requires to create/attach vApp network with vcd_vapp_network or vcd_vapp_org_network before referencing it.

I interpret that I should be able to create the needed vApp network not only with vcd_vapp_org_network, but also with vcd_vapp_network. So, I'm trying this:

resource "vcd_vapp_network" "demo_vapp_net_w_org" {
  name = "demo-vapp-net-w-org"
  vapp_name         = vcd_vapp.demo_vapp.name
  org_network_name  = vcd_network_routed.demo_routed_net_multi_pool.name
}

and then in VM:

  network {
    type               = "org"
    # 2.7.0 will throw a warning if vApp Network doesn't exist and it auto-creates it
    name = vcd_vapp_network.demo_vapp_net_w_org.org_network_name
    ip_allocation_mode = "DHCP"
  }

However, it says that gateway is required (which would conflict with the highlighted doc line of this comment):

$ terraform apply

Error: Missing required argument

  on xendi.tf line 320, in resource "vcd_vapp_network" "demo_vapp_net_w_org":
 320: resource "vcd_vapp_network" "demo_vapp_net_w_org" {

The argument "gateway" is required, but no definition was found.

So, I add the whole network definition:

resource "vcd_vapp_network" "demo_vapp_net_w_org" {
  name = "demo-vapp-net-w-org"
  vapp_name         = vcd_vapp.demo_vapp.name
  org_network_name  = vcd_network_routed.demo_routed_net_multi_pool.name

  gateway            = "192.168.9.1"
  netmask            = "255.255.255.0"
  dns1               = "192.168.9.1"
  dns2               = "192.168.9.2"
  dns_suffix         = "mybiz.biz"
  guest_vlan_allowed = true

  # 2.7.0
  #org_network_name = vcd_network_routed.demo_routed_net_multi_pool.name

  static_ip_pool {
    start_address = "192.168.9.51"
    end_address   = "192.168.9.100"
  }

  dhcp_pool {
    start_address = "192.168.9.2"
    end_address   = "192.168.9.50"
  }
}

And run apply, but then I get the DEPRECATED message even though I did create the vcd_vapp_network as per your changelog message:

vcd_vapp_network.demo_vapp_net_w_org: Creating...
vcd_vapp_network.demo_vapp_net_w_org: Still creating... [10s elapsed]
vcd_vapp_network.demo_vapp_net_w_org: Still creating... [20s elapsed]
vcd_vapp_network.demo_vapp_net_w_org: Creation complete after 25s [id=b68affa0-c540-46c9-a2ec-0180041c8973]
vcd_vapp_vm.demo_vm_wordpress: Modifying... [id=urn:vcloud:vm:ef2bb818-6462-4db5-bd71-0df42cdec2ad]
vcd_vapp_vm.demo_vm_wordpress: Still modifying... [id=urn:vcloud:vm:ef2bb818-6462-4db5-bd71-0df42cdec2ad, 10s elapsed]
DEPRECATED: attaching an Org network `demo-net-multi_pool` to a vApp `demo-web` through VM's network block alone is deprecated. Network should be first attached to a vApp by creating a `vcd_vapp_org_network` resource and only then referenced in the network block.

Finally, the result of such config is that I get two networks in the vApp! My expected one "demo-vapp-net-w-org " from vcd_vapp_network, but also one "demo-net-multi_pool" auto-created by the VM:

And, the VM did not connect to the "demo_vapp_net_w_org":

I believe the changelog message is incorrect and should only reference the vcd_vapp_org_network, but I will leave it up to you to confirm.

CC: @Didainius

[vbauzys]

yes, only vcd_vapp_org_network . My aim was to tell everyone to use new resource more explicitly for every case. I doubt anyone have understood or noticed that automagic which existed.

[Didainius]

Approved!
I've got some last minute issues with TestAccVcdVAppVmDhcpWait test on some environments, but it looks to be related to the env stability in general as I've checked and VM simply didn't get DHCP lease, so the reporting test failed. Never fails on some other envs.

[dataclouder]

LGTM