Add support to fetch nested attributes

This PR add support to fetch nested attributes.

The first nested attirbute supported is:
/providers/vsphere/1/hosts/{hostid}?advancedOption=DataMover.HardwareAcceleratedMove

Issue: https://issues.redhat.com/browse/ECOPROJECT-2736

Signed-off-by: Ondra Machacek <[email protected]>

Author: machacekondra

pkg/controller/provider/container/openstack/collector.go

@@ -2,6 +2,7 @@ package openstack
 
 import (
 	"context"
+	"fmt"
 	liburl "net/url"
 	libpath "path"
 	"time"
@@ -118,6 +119,11 @@ func (r *Collector) Version() (_, _, _, _ string, err error) {
 	return
 }
 
+// Follow link
+func (r *Collector) Follow(moRef interface{}, p []string, dst interface{}) error {
+	return fmt.Errorf("not implemented")
+}
+
 // Start the collector.
 func (r *Collector) Start() error {
 	ctx := Context{

pkg/controller/provider/container/ova/collector.go

@@ -2,6 +2,7 @@ package ova
 
 import (
 	"context"
+	"fmt"
 	liburl "net/url"
 	libpath "path"
 	"time"
@@ -122,6 +123,11 @@ func (r *Collector) Version() (_, _, _, _ string, err error) {
 	return
 }
 
+// Follow link
+func (r *Collector) Follow(moRef interface{}, p []string, dst interface{}) error {
+	return fmt.Errorf("not implemented")
+}
+
 // Start the collector.
 func (r *Collector) Start() error {
 	ctx := Context{

pkg/controller/provider/container/ovirt/collector.go

@@ -128,6 +128,11 @@ func (r *Collector) HasParity() bool {
 	return r.parity
 }
 
+// Follow link
+func (r *Collector) Follow(moRef interface{}, p []string, dst interface{}) error {
+	return fmt.Errorf("not implemented")
+}
+
 // Test connect/logout.
 func (r *Collector) Test() (status int, err error) {
 	_, status, err = r.client.system()

pkg/controller/provider/container/vsphere/collector.go

@@ -2,6 +2,7 @@ package vsphere
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	liburl "net/url"
 	"path"
@@ -85,6 +86,7 @@ const (
 	fThumbprint     = "summary.config.sslThumbprint"
 	fMgtServerIp    = "summary.managementServerIp"
 	fScsiLun        = "config.storageDevice.scsiLun"
+	fAdvancedOption = "configManager.advancedOption"
 	// Network
 	fTag     = "tag"
 	fSummary = "summary"
@@ -315,6 +317,24 @@ func (r *Collector) HasParity() bool {
 	return r.parity
 }
 
+// Follow
+func (r *Collector) Follow(moRef interface{}, p []string, dst interface{}) error {
+	ref, ok := moRef.(types.ManagedObjectReference)
+	if !ok {
+		return fmt.Errorf("reference must be of type ManagedObjectReference")
+	}
+
+	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
+	client, err := r.buildClient(ctx)
+	if err != nil {
+		return err
+	}
+	defer client.CloseIdleConnections()
+	return client.RetrieveOne(ctx, ref, p, dst)
+}
+
 // Test connect/logout.
 func (r *Collector) Test() (status int, err error) {
 	ctx := context.Background()
@@ -531,35 +551,39 @@ func (r *Collector) watch() (list []*libmodel.Watch) {
 // Build the client.
 func (r *Collector) connect(ctx context.Context) (status int, err error) {
 	r.close()
-	url, err := liburl.Parse(r.url)
+	r.client, err = r.buildClient(ctx)
 	if err != nil {
-		err = liberr.Wrap(err)
+		if strings.Contains(err.Error(), "incorrect") && strings.Contains(err.Error(), "password") {
+			return http.StatusUnauthorized, err
+		}
 		return
 	}
+
+	return http.StatusOK, nil
+}
+
+// Build the client.
+func (r *Collector) buildClient(ctx context.Context) (*govmomi.Client, error) {
+	url, err := liburl.Parse(r.url)
+	if err != nil {
+		return nil, liberr.Wrap(err)
+	}
 	url.User = liburl.UserPassword(
 		r.user(),
 		r.password())
 	soapClient := soap.NewClient(url, r.getInsecureSkipVerifyFlag())
 	soapClient.SetThumbprint(url.Host, r.thumbprint())
 	vimClient, err := vim25.NewClient(ctx, soapClient)
 	if err != nil {
-		err = liberr.Wrap(err)
-		return
+		return nil, liberr.Wrap(err)
 	}
-	r.client = &govmomi.Client{
+	client := &govmomi.Client{
 		SessionManager: session.NewManager(vimClient),
 		Client:         vimClient,
 	}
-	err = r.client.Login(ctx, url.User)
-	if err != nil {
-		err = liberr.Wrap(err)
-		if strings.Contains(err.Error(), "incorrect") && strings.Contains(err.Error(), "password") {
-			return http.StatusUnauthorized, err
-		}
-		return
-	}
+	err = client.Login(ctx, url.User)
+	return client, err
 
-	return http.StatusOK, nil
 }
 
 // Close connections.
@@ -702,6 +726,7 @@ func (r *Collector) propertySpec() []types.PropertySpec {
 				fPNIC,
 				fVNIC,
 				fScsiLun,
+				fAdvancedOption,
 			},
 		},
 		{ // Network

pkg/controller/provider/container/vsphere/model.go

@@ -382,6 +382,8 @@ func (v *HostAdapter) Apply(u types.ObjectUpdate) {
 						v.model.HostScsiDisks = append(v.model.HostScsiDisks, hostScsiDisk)
 					}
 				}
+			case fAdvancedOption:
+				v.model.AdvancedOptions = v.Ref(p.Val)
 			}
 		}
 	}

pkg/controller/provider/model/vsphere/model.go

@@ -140,6 +140,7 @@ type Host struct {
 	Networks           []Ref          `sql:""`
 	Datastores         []Ref          `sql:""`
 	HostScsiDisks      []HostScsiDisk `sql:""`
+	AdvancedOptions    Ref            `sql:""`
 }
 
 type HostScsiDisk struct {

pkg/controller/provider/web/vsphere/host.go

@@ -2,15 +2,20 @@ package vsphere
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	"sort"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 	api "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	model "github.com/konveyor/forklift-controller/pkg/controller/provider/model/vsphere"
+	"github.com/vmware/govmomi/vim25/types"
+
 	"github.com/konveyor/forklift-controller/pkg/controller/provider/web/base"
 	libmodel "github.com/konveyor/forklift-controller/pkg/lib/inventory/model"
+
+	"github.com/vmware/govmomi/vim25/mo"
 )
 
 // Routes
@@ -124,13 +129,39 @@ func (h HostHandler) Get(ctx *gin.Context) {
 		ctx.Status(http.StatusInternalServerError)
 		return
 	}
+
+	// Parse advancedOption query parameter
+	h.parseAdvancedOptions(ctx, r, m)
+
 	r.Link(h.Provider)
 	r.Path = pb.Path(m)
 	content := r.Content(h.Detail)
 
 	ctx.JSON(http.StatusOK, content)
 }
 
+func (h *HostHandler) parseAdvancedOptions(ctx *gin.Context, r *Host, m *model.Host) {
+	// Check the advanced option is passed
+	advancedOption := ctx.Query("advancedOption")
+	if advancedOption == "" {
+		return
+	}
+
+	// Get settings of option manager
+	optManagers := mo.OptionManager{}
+	moRef := types.ManagedObjectReference{Type: m.AdvancedOptions.Kind, Value: m.AdvancedOptions.ID}
+	if err := h.Collector.Follow(moRef, []string{"setting"}, &optManagers); err != nil {
+		return
+	}
+
+	// Find the option we are interested in:
+	for _, option := range optManagers.Setting {
+		if option.GetOptionValue().Key == advancedOption {
+			r.AdvancedOptions = []AdvancedOptions{{Key: advancedOption, Value: fmt.Sprintf("%v", option.GetOptionValue().Value)}}
+		}
+	}
+}
+
 // Watch.
 func (h *HostHandler) watch(ctx *gin.Context) {
 	db := h.Collector.DB()
@@ -219,6 +250,12 @@ type Host struct {
 	VMs                []model.Ref          `json:"vms"`
 	NetworkAdapters    []NetworkAdapter     `json:"networkAdapters"`
 	HostScsiDisks      []model.HostScsiDisk `json:"hostScsiDisks"`
+	AdvancedOptions    []AdvancedOptions    `json:"advancedOptions"`
+}
+
+type AdvancedOptions struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
 }
 
 // Build the resource using the model.

pkg/lib/cmd/inventory/main.go

@@ -181,6 +181,10 @@ func (r *Collector) Name() string {
 	return "tester"
 }
 
+func (r *Collector) Follow(moRef interface{}, p []string, dst interface{}) error {
+	return nil
+}
+
 func (r *Collector) Owner() meta.Object {
 	return &meta.ObjectMeta{
 		UID: "TEST",

pkg/lib/inventory/container/container.go

@@ -146,6 +146,8 @@ type Collector interface {
 	// Return the status code of the connection
 	// 0 = Ignore
 	Test() (int, error)
+	// Follow the link
+	Follow(moRef interface{}, p []string, dst interface{}) error
 	// Reset
 	Reset()
 	// Get the system version - currently, ovirt-only

pkg/lib/inventory/container/ocp/collector.go

@@ -2,6 +2,7 @@ package ocp
 
 import (
 	"context"
+	"fmt"
 	"path"
 	"time"
 
@@ -112,6 +113,11 @@ func (r *Collector) HasParity() bool {
 	return r.parity
 }
 
+// Follow link
+func (r *Collector) Follow(moRef interface{}, p []string, dst interface{}) error {
+	return fmt.Errorf("not implemented")
+}
+
 // Update the versionThreshold
 func (r *Collector) UpdateThreshold(m libmodel.Model) {
 	if m, cast := m.(interface{ ResourceVersion() uint64 }); cast {