fixed vsphere ConvertInstallConfig to support multi vCenter

Author: vr4manta

pkg/types/vsphere/conversion/installconfig.go

@@ -3,6 +3,7 @@ package conversion
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/url"
 	"path"
 	"time"
@@ -100,7 +101,7 @@ func fixNoVCentersScenario(platform *vsphere.Platform) {
 	}
 }
 
-func fixTechPreviewZonalFailureDomainsScenario(platform *vsphere.Platform, finder *find.Finder) error {
+func fixTechPreviewZonalFailureDomainsScenario(platform *vsphere.Platform, finders map[string]*find.Finder) error {
 	if len(platform.FailureDomains) > 0 {
 		var err error
 
@@ -109,27 +110,36 @@ func fixTechPreviewZonalFailureDomainsScenario(platform *vsphere.Platform, finde
 			datastore := platform.FailureDomains[i].Topology.Datastore
 			folder := platform.FailureDomains[i].Topology.Folder
 			datacenter := platform.FailureDomains[i].Topology.Datacenter
-
+			vCenter := platform.FailureDomains[i].Server
+			fdName := platform.FailureDomains[i].Name
+
+			finder, ok := finders[vCenter]
+			if !ok {
+				// This is when invalid config happens.  There is a check later in cycle that will print it out.  For now,
+				// lets just log warning and return.
+				localLogger.Warnf("unable to find finder for vCenter %v in order to do upconvert", vCenter)
+				return nil
+			}
 			platform.FailureDomains[i].Topology.ComputeCluster, err = SetObjectPath(finder, "host", computeCluster, datacenter)
 			if err != nil {
-				return err
+				return fmt.Errorf("unable to SetObjectPath for compute cluster of failure domain %s: %w", fdName, err)
 			}
 
 			platform.FailureDomains[i].Topology.Datastore, err = SetObjectPath(finder, "datastore", datastore, datacenter)
 			if err != nil {
-				return err
+				return fmt.Errorf("unable to SetObjectPath for datastore of failure domain %s: %w", fdName, err)
 			}
 
 			platform.FailureDomains[i].Topology.Folder, err = SetObjectPath(finder, "vm", folder, datacenter)
 			if err != nil {
-				return err
+				return fmt.Errorf("unable to SetObjectPath for folder of failure domain %s: %w", fdName, err)
 			}
 		}
 	}
 	return nil
 }
 
-func fixLegacyPlatformScenario(platform *vsphere.Platform, finder *find.Finder) error {
+func fixLegacyPlatformScenario(platform *vsphere.Platform, finders map[string]*find.Finder) error {
 	if len(platform.FailureDomains) == 0 {
 		var err error
 		localLogger.Warn("vsphere topology fields are now deprecated; please use failureDomains")
@@ -145,6 +155,10 @@ func fixLegacyPlatformScenario(platform *vsphere.Platform, finder *find.Finder)
 		platform.FailureDomains[0].Topology.Networks = make([]string, 1)
 		platform.FailureDomains[0].Topology.Networks[0] = platform.DeprecatedNetwork
 
+		finder, ok := finders[platform.FailureDomains[0].Server]
+		if !ok {
+			return fmt.Errorf("unable to find finder for vCenter %v", platform.FailureDomains[0].Server)
+		}
 		platform.FailureDomains[0].Topology.ComputeCluster, err = SetObjectPath(finder, "host", platform.DeprecatedCluster, platform.DeprecatedDatacenter)
 		if err != nil {
 			return err
@@ -165,18 +179,23 @@ func fixLegacyPlatformScenario(platform *vsphere.Platform, finder *find.Finder)
 
 // ConvertInstallConfig modifies a given platform spec for the new requirements.
 func ConvertInstallConfig(config *types.InstallConfig) error {
+	var err error
 	platform := config.Platform.VSphere
 
 	fixNoVCentersScenario(platform)
-	finder, err := GetFinder(platform.VCenters[0].Server, platform.VCenters[0].Username, platform.VCenters[0].Password)
-	if err != nil {
-		return err
+	finders := make(map[string]*find.Finder)
+	for _, vcenter := range platform.VCenters {
+		finder, err := GetFinder(vcenter.Server, vcenter.Username, vcenter.Password)
+		if err != nil {
+			return err
+		}
+		finders[vcenter.Server] = finder
 	}
-	err = fixTechPreviewZonalFailureDomainsScenario(platform, finder)
+	err = fixTechPreviewZonalFailureDomainsScenario(platform, finders)
 	if err != nil {
 		return err
 	}
-	err = fixLegacyPlatformScenario(platform, finder)
+	err = fixLegacyPlatformScenario(platform, finders)
 	if err != nil {
 		return err
 	}

pkg/types/vsphere/conversion/installconfig_test.go

@@ -334,7 +334,7 @@ func validIpiInstallConfig() *types.InstallConfig {
 				Name:   "region-2-zone-2a",
 				Region: "region-2",
 				Zone:   "zone-2a",
-				Server: "",
+				Server: "test-server",
 				Topology: vsphere.Topology{
 					Datacenter:     "DC1",
 					ComputeCluster: "/DC1/host/DC1_C0",
@@ -348,7 +348,7 @@ func validIpiInstallConfig() *types.InstallConfig {
 				Name:   "region-3-zone-3a",
 				Region: "region-3",
 				Zone:   "zone-3a",
-				Server: "",
+				Server: "test-server",
 				Topology: vsphere.Topology{
 					Datacenter:     "DC2",
 					ComputeCluster: "/DC2/host/test-computecluster3",
@@ -362,7 +362,7 @@ func validIpiInstallConfig() *types.InstallConfig {
 				Name:   "region-4-zone-4a",
 				Region: "region-4",
 				Zone:   "zone-4a",
-				Server: "",
+				Server: "test-server",
 				Topology: vsphere.Topology{
 					Datacenter:     "DC3",
 					ComputeCluster: "/DC3/host/DC3_C0",
@@ -518,15 +518,18 @@ func TestConvertInstallConfig(t *testing.T) {
 
 			// This section is duplication from ConvertInstallConfig()
 			// which makes it easier to deal with the simulator and finder object.
+			finders := make(map[string]*find.Finder)
+
 			fixNoVCentersScenario(platform)
+			finders[platform.VCenters[0].Server] = finder
 			if err != nil {
 				assert.NoError(t, err)
 			}
-			err = fixTechPreviewZonalFailureDomainsScenario(platform, finder)
+			err = fixTechPreviewZonalFailureDomainsScenario(platform, finders)
 			if err != nil {
 				assert.NoError(t, err)
 			}
-			err = fixLegacyPlatformScenario(platform, finder)
+			err = fixLegacyPlatformScenario(platform, finders)
 			if err != nil {
 				assert.NoError(t, err)
 			}