Add support for IP reporting when NIC uses DHCP

.travis.yml

@@ -4,7 +4,6 @@ go:
     - "1.12.x"
 
 sudo: false
-install: false
 
 script:
     - env GO111MODULE=on make

CHANGELOG.md

@@ -4,8 +4,13 @@
 * Added methods `VM.AddInternalDisk`, `VM.GetInternalDiskById`, `VM.DeleteInternalDisk`, `VM.UpdateInternalDisks` and `VM.UpdateInternalDisksAsync` [#272](https://github.com/vmware/go-vcloud-director/pull/272)
 * Added methods `vdc.GetEdgeGatewayReferenceList` and `catalog.GetVappTemplateByHref` [#278](https://github.com/vmware/go-vcloud-director/pull/278)
 * Improved functions to not expect XML namespaces provided in argument structure [#284](https://github.com/vmware/go-vcloud-director/pull/284)
-* Change `int` and `bool` fields from types.VAppTemplateLeaseSettings and VAppLeaseSettings into pointers
-* Added method `catalog.GetVappTemplateByHref`, and expose methods `vdc.GetEdgeGatewayByHref` and `vdc.GetEdgeGatewayRecordsType`
+* Change `int` and `bool` fields from types.VAppTemplateLeaseSettings and VAppLeaseSettings into
+  pointers  [#281](https://github.com/vmware/go-vcloud-director/pull/281)
+* Added method `catalog.GetVappTemplateByHref`, and expose methods `vdc.GetEdgeGatewayByHref` and
+  `vdc.GetEdgeGatewayRecordsType`  [#278](https://github.com/vmware/go-vcloud-director/pull/278)
+* Added methods `EdgeGateway.GetAllNsxvDhcpLeases()`, `EdgeGateway.GetNsxvActiveDhcpLeaseByMac()`
+  `VM.WaitForDhcpIpByNicIndexes()`, `VM.GetParentVApp()`, `VM.GetParentVdc()`
+  [#283](https://github.com/vmware/go-vcloud-director/pull/283)
 
 ## 2.5.1 (December 12, 2019)
 

Makefile

@@ -7,7 +7,7 @@ default: fmtcheck vet static build
 # test runs the test suite and vets the code
 test: testunit
 	@echo "==> Running Functional Tests"
-	cd govcd && go test -tags "functional" -timeout=90m -check.vv .
+	cd govcd && go test -tags "functional" -timeout=200m -check.vv .
 
 # testunit runs the unit tests
 testunit: fmtcheck

govcd/api_vcd_test.go

@@ -50,6 +50,7 @@ const (
 	TestCreateOrgVdc              = "TestCreateOrgVdc"
 	TestRefreshOrgVdc             = "TestRefreshOrgVdc"
 	TestCreateOrgVdcNetworkRouted = "TestCreateOrgVdcNetworkRouted"
+	TestCreateOrgVdcNetworkDhcp   = "TestCreateOrgVdcNetworkDhcp"
 	TestCreateOrgVdcNetworkIso    = "TestCreateOrgVdcNetworkIso"
 	TestCreateOrgVdcNetworkDirect = "TestCreateOrgVdcNetworkDirect"
 	TestUploadMedia               = "TestUploadMedia"
@@ -589,7 +590,13 @@ func (vcd *TestVCD) removeLeftoverEntities(entity CleanupEntity) {
 		}
 		task, _ := vapp.Undeploy()
 		_ = task.WaitTaskCompletion()
+		// Detach all Org networks during vApp removal because network removal errors if it happens
+		// very quickly (as the next task) after vApp removal
+		task, _ = vapp.RemoveAllNetworks()
+		_ = task.WaitTaskCompletion()
 		task, err = vapp.Delete()
+		_ = task.WaitTaskCompletion()
+
 		if err != nil {
 			vcd.infoCleanup(notDeletedMsg, entity.EntityType, entity.Name, err)
 			return

govcd/nsxv_dhcplease.go

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019 VMware, Inc.  All rights reserved.  Licensed under the Apache v2 License.
+ */
+
+package govcd
+
+import (
+	"encoding/xml"
+	"fmt"
+	"net/http"
+
+	"github.com/vmware/go-vcloud-director/v2/types/v56"
+	"github.com/vmware/go-vcloud-director/v2/util"
+)
+
+type responseEdgeDhcpLeases struct {
+	XMLName   xml.Name            `xml:"dhcpLeases"`
+	TimeStamp string              `xml:"timeStamp"`
+	DhcpLease types.EdgeDhcpLease `xml:"dhcpLeaseInfo"`
+}
+
+// GetNsxvActiveDhcpLeaseByMac finds active DHCP lease for a given hardware address (MAC)
+func (egw *EdgeGateway) GetNsxvActiveDhcpLeaseByMac(mac string) (*types.EdgeDhcpLeaseInfo, error) {
+	if mac == "" {
+		return nil, fmt.Errorf("MAC address must be provided to lookup DHCP lease")
+	}
+	dhcpLeases, err := egw.GetAllNsxvDhcpLeases()
+	if err != nil {
+		return nil, err
+	}
+
+	util.Logger.Printf("[DEBUG] Looking up active DHCP lease for MAC: %s", mac)
+	for _, lease := range dhcpLeases {
+		util.Logger.Printf("[DEBUG] Checking DHCP lease: %#+v", lease)
+		if lease.BindingState == "active" && lease.MacAddress == mac {
+			return lease, nil
+		}
+	}
+
+	return nil, ErrorEntityNotFound
+}
+
+// GetAllNsxvDhcpLeases retrieves all DHCP leases defined in NSX-V edge gateway
+func (egw *EdgeGateway) GetAllNsxvDhcpLeases() ([]*types.EdgeDhcpLeaseInfo, error) {
+	if !egw.HasAdvancedNetworking() {
+		return nil, fmt.Errorf("only advanced edge gateways support DHCP")
+	}
+
+	httpPath, err := egw.buildProxiedEdgeEndpointURL(types.EdgeDhcpLeasePath)
+	if err != nil {
+		return nil, fmt.Errorf("could not get Edge Gateway API endpoint: %s", err)
+	}
+
+	dhcpLeases := &responseEdgeDhcpLeases{}
+
+	// This query returns all DHCP leases
+	_, err = egw.client.ExecuteRequest(httpPath, http.MethodGet, types.AnyXMLMime,
+		"unable to read DHCP leases: %s", nil, dhcpLeases)
+	if err != nil {
+		return nil, err
+	}
+
+	if dhcpLeases != nil && len(dhcpLeases.DhcpLease.DhcpLeaseInfos) == 0 {
+		util.Logger.Printf("[DEBUG] GetAllNsxvDhcpLeases found 0 leases available")
+		return nil, ErrorEntityNotFound
+	}
+
+	return dhcpLeases.DhcpLease.DhcpLeaseInfos, nil
+}

govcd/orgvdcnetwork.go

@@ -234,5 +234,5 @@ func (vdc *Vdc) FindEdgeGatewayNameByNetwork(networkName string) (string, error)
 			}
 		}
 	}
-	return "", fmt.Errorf("no edge gateway connection found")
+	return "", ErrorEntityNotFound
 }