Improved VM network to allow reference vApp routed network

vcd/datasource_vcd_vapp_network_test.go

@@ -53,7 +53,7 @@ func TestAccVcdVappNetworkDS(t *testing.T) {
 		"Org":                testConfig.VCD.Org,
 		"VDC":                testConfig.VCD.Vdc,
 		"vappName":           "TestAccVcdVappNetworkDS",
-		"FuncName":           "TestVappNetworkDS",
+		"FuncName":           "TestAccVcdVappNetworkDS",
 		"vappNetworkName":    networkName,
 		"description":        description,
 		"gateway":            gateway,

vcd/datasource_vcd_vapp_org_network_test.go

@@ -13,13 +13,6 @@ import (
 
 // TestAccVcdVappOrgNetworkDS tests a vApp org network data source if a vApp is found in the VDC
 func TestAccVcdVappOrgNetworkDS(t *testing.T) {
-	// This test requires access to the vCD before filling templates
-	// Thus it won't run in the short test
-	if vcdShortTest {
-		t.Skip(acceptanceTestsSkipped)
-		return
-	}
-
 	err := getAvailableNetworks()
 
 	if err != nil {
@@ -52,11 +45,16 @@ func TestAccVcdVappOrgNetworkDS(t *testing.T) {
 		"natEnabled":         natEnabled,
 		"retainIpMacEnabled": retainIpMacEnabled,
 		"isFenced":           "true",
-		"FuncName":           "TestVappOrgNetworkDS",
+		"FuncName":           "TestAccVcdVappOrgNetworkDS",
 	}
 	configText := templateFill(datasourceTestVappOrgNetwork, params)
 	debugPrintf("#[DEBUG] CONFIGURATION: %s", configText)
 
+	if vcdShortTest {
+		t.Skip(acceptanceTestsSkipped)
+		return
+	}
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,

vcd/resource_vcd_vapp_network.go

@@ -515,7 +515,7 @@ func resourceVcdVappNetworkImport(d *schema.ResourceData, meta interface{}) ([]*
 	}
 
 	if vappNetworkToImport.Configuration.FenceMode == types.FenceModeBridged ||
-		(vappNetworkToImport.Configuration.FenceMode == types.FenceModeNAT && vappNetworkToImport.Configuration.Features.DhcpService == nil) {
+		(vappNetworkToImport.Configuration.FenceMode == types.FenceModeNAT && vappNetworkToImport.Configuration.IPScopes.IPScope[0].IsInherited == true) {
 		return nil, fmt.Errorf("found vApp org network, not vApp network: %s", networkName)
 	}
 

vcd/resource_vcd_vapp_org_network.go

@@ -300,7 +300,7 @@ func resourceVcdVappOrgNetworkImport(d *schema.ResourceData, meta interface{}) (
 	}
 
 	if vappNetworkToImport.Configuration.FenceMode == types.FenceModeIsolated ||
-		(vappNetworkToImport.Configuration.FenceMode == types.FenceModeNAT && vappNetworkToImport.Configuration.Features.DhcpService != nil) {
+		(vappNetworkToImport.Configuration.FenceMode == types.FenceModeNAT && vappNetworkToImport.Configuration.IPScopes.IPScope[0].IsInherited == false) {
 		return nil, fmt.Errorf("found vApp network, not vApp org network: %s", networkName)
 	}
 

vcd/resource_vcd_vapp_org_network_test.go

@@ -147,7 +147,7 @@ resource "vcd_network_routed" "{{.NetworkName}}" {
 resource "vcd_vapp_org_network" "{{.resourceName}}" {
   org                = "{{.Org}}"
   vdc                = "{{.Vdc}}"
-  vapp_name          = "{{.vappName}}"
+  vapp_name          = vcd_vapp.{{.vappName}}.name
   org_network_name   = "{{.orgNetwork}}"
 
   is_fenced = "{{.isFenced}}"

vcd/resource_vcd_vapp_vm.go

@@ -668,8 +668,28 @@ func addVdcNetwork(networkNameToAdd string, vdc *govcd.Vdc, vapp govcd.VApp, vcd
 	return vdcNetwork, nil
 }
 
-// isItVappNetwork checks if it is a genuine vApp network (not only attached to vApp)
+// isItVappNetwork checks if it is a vApp network (not vApp Org Network)
 func isItVappNetwork(vAppNetworkName string, vapp govcd.VApp) (bool, error) {
+	vAppNetworkConfig, err := vapp.GetNetworkConfig()
+	if err != nil {
+		return false, fmt.Errorf("error getting vApp networks: %s", err)
+	}
+
+	for _, networkConfig := range vAppNetworkConfig.NetworkConfig {
+		if networkConfig.NetworkName == vAppNetworkName &&
+			networkConfig.Configuration.FenceMode == types.FenceModeIsolated ||
+			(networkConfig.Configuration.FenceMode == types.FenceModeNAT &&
+				networkConfig.Configuration.IPScopes.IPScope[0].IsInherited == false) {
+			log.Printf("[TRACE] vApp network found: %s", vAppNetworkName)
+			return true, nil
+		}
+	}
+
+	return false, fmt.Errorf("configured vApp network isn't found: %s", vAppNetworkName)
+}
+
+// isItIsolatedVappNetwork checks if it is a isolated vApp network (not only attached to vApp)
+func isItIsolatedVappNetwork(vAppNetworkName string, vapp govcd.VApp) (bool, error) {
 
 	vAppNetworkConfig, err := vapp.GetNetworkConfig()
 	if err != nil {
@@ -1565,7 +1585,7 @@ func getVmNicIndexesWithDhcpEnabled(networkConnectionSection *types.NetworkConne
 // TODO v3.0 remove this function once 'network_name', 'vapp_network_name', 'ip' are deprecated
 func deprecatedNetworksToConfig(network_name, vapp_network_name, ip string, vdc *govcd.Vdc, vapp govcd.VApp, vcdClient *VCDClient) (types.NetworkConnectionSection, error) {
 	if vapp_network_name != "" {
-		isVappNetwork, err := isItVappNetwork(vapp_network_name, vapp)
+		isVappNetwork, err := isItIsolatedVappNetwork(vapp_network_name, vapp)
 		if err != nil {
 			return types.NetworkConnectionSection{}, fmt.Errorf("unable to find vApp network %s: %s", vapp_network_name, err)
 		}
@@ -1670,7 +1690,8 @@ func readNetworks(d *schema.ResourceData, vm govcd.VM, vapp govcd.VApp) ([]map[s
 		switch {
 		case netConfig.NetworkName == types.NoneNetwork:
 			vAppNetworkTypes[netConfig.NetworkName] = types.NoneNetwork
-		case netConfig.Configuration.ParentNetwork == nil && netConfig.Configuration.FenceMode == "isolated":
+		case netConfig.Configuration.FenceMode == types.FenceModeIsolated ||
+			(netConfig.Configuration.FenceMode == types.FenceModeNAT && netConfig.Configuration.IPScopes.IPScope[0].IsInherited == false):
 			vAppNetworkTypes[netConfig.NetworkName] = "vapp"
 		default:
 			vAppNetworkTypes[netConfig.NetworkName] = "org"

vcd/resource_vcd_vapp_vm_multinetwork_test.go

@@ -121,6 +121,22 @@ func TestAccVcdVAppVmMultiNIC(t *testing.T) {
 					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.6.ip", "192.168.2.51"),
 					resource.TestCheckResourceAttrSet("vcd_vapp_vm."+netVmName1, "network.6.mac"),
 					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.6.adapter_type", "VMXNET3"),
+
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.7.name", "vapp-routed-net"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.7.type", "vapp"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.7.is_primary", "false"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.7.ip_allocation_mode", "MANUAL"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.7.ip", "192.168.2.2"),
+
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.8.name", "multinic-net"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.8.type", "org"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.8.is_primary", "false"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.8.ip_allocation_mode", "POOL"),
+
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.9.name", "multinic-net2"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.9.type", "org"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.9.is_primary", "false"),
+					resource.TestCheckResourceAttr("vcd_vapp_vm."+netVmName1, "network.9.ip_allocation_mode", "POOL"),
 				),
 			},
 			// Step 1 - update
@@ -222,7 +238,7 @@ resource "vcd_vapp" "{{.VAppName}}" {
   depends_on = ["vcd_network_routed.net", "vcd_network_routed.net2"]
 }
 
-resource "vcd_vapp_network" "vappNet" {
+resource "vcd_vapp_network" "vappIsolatedNet" {
   org = "{{.Org}}"
   vdc = "{{.Vdc}}"
 
@@ -238,8 +254,6 @@ resource "vcd_vapp_network" "vappNet" {
     start_address = "192.168.2.51"
     end_address   = "192.168.2.100"
   }
-
-  depends_on = ["vcd_vapp.{{.VAppName}}"]
 }
 
 resource "vcd_network_routed" "net" {
@@ -261,6 +275,35 @@ resource "vcd_network_routed" "net" {
   }
 }
 
+resource "vcd_vapp_org_network" "vappAttachedNet" {
+  org = "{{.Org}}"
+  vdc = "{{.Vdc}}"
+
+  vapp_name  = vcd_vapp.{{.VAppName}}.name
+  org_network_name = vcd_network_routed.net.name
+}
+
+resource "vcd_vapp_org_network" "vappAttachedRoutedNet2" {
+  org = "{{.Org}}"
+  vdc = "{{.Vdc}}"
+
+  vapp_name  = vcd_vapp.{{.VAppName}}.name
+  org_network_name = vcd_network_routed.net2.name
+  is_fenced        = true
+}
+
+resource "vcd_vapp_network" "vappRoutedNet" {
+  org = "{{.Org}}"
+  vdc = "{{.Vdc}}"
+
+  name             = "vapp-routed-net"
+  vapp_name        = vcd_vapp.{{.VAppName}}.name
+  gateway          = "192.168.2.1"
+  netmask          = "255.255.255.0"
+  org_network_name = vcd_network_routed.net.name
+}
+
+
 resource "vcd_network_routed" "net2" {
   org = "{{.Org}}"
   vdc = "{{.Vdc}}"
@@ -336,11 +379,30 @@ resource "vcd_vapp_vm" "{{.VMName}}" {
 
   network {
     type               = "vapp"
-    name               = vcd_vapp_network.vappNet.name
+    name               = vcd_vapp_network.vappIsolatedNet.name
     ip_allocation_mode = "POOL"
     adapter_type       = "VMXNET3"
   }
-}
+
+  network {
+    type               = "vapp"
+    name               = vcd_vapp_network.vappRoutedNet.name
+    ip_allocation_mode = "MANUAL"
+    ip                 = "192.168.2.2"
+  }
+
+  network {
+    type               = "org"
+    name               = vcd_vapp_org_network.vappAttachedNet.org_network_name
+    ip_allocation_mode = "POOL"
+  }
+
+  network {
+    type               = "org"
+     name              = vcd_vapp_org_network.vappAttachedRoutedNet2.org_network_name
+    ip_allocation_mode = "POOL"
+  }
+ }
 `
 
 const testAccCheckVcdVAppVmNetworkVmStep1 = testAccCheckVcdVAppVmNetworkShared + `
@@ -386,6 +448,25 @@ resource "vcd_vapp_vm" "{{.VMName}}" {
     is_primary         = false
 	mac                = "00:00:00:11:11:11"
   }
+
+  network {
+    type               = "vapp"
+    name               = vcd_vapp_network.vappRoutedNet.name
+    ip_allocation_mode = "MANUAL"
+    ip                 = "192.168.2.2"
+  }
+
+  network {
+    type               = "org"
+    name               = vcd_vapp_org_network.vappAttachedNet.org_network_name
+    ip_allocation_mode = "POOL"
+  }
+
+  network {
+    type               = "org"
+     name              = vcd_vapp_org_network.vappAttachedRoutedNet2.org_network_name
+    ip_allocation_mode = "POOL"
+  }
 }
 `
 
@@ -426,7 +507,7 @@ resource "vcd_vapp_vm" "{{.VMName}}" {
 
   network {
     type               = "vapp"
-    name               = vcd_vapp_network.vappNet.name
+    name               = vcd_vapp_network.vappIsolatedNet.name
     ip_allocation_mode = "POOL"
     is_primary         = true
   }