Merge pull request #918 from openshift-cherrypick-robot/cherry-pick-9…

…12-to-release-4.9

[release-4.9] Bug 2004953: Fix user-agent in vCenter sessions list

pkg/controller/vsphere/session/session.go

@@ -67,6 +67,7 @@ func GetOrCreate(
 			return &session, nil
 		}
 	}
+	klog.Infof("No existing vCenter session found, creating new session")
 
 	soapURL, err := soap.ParseURL(server)
 	if err != nil {
@@ -76,20 +77,26 @@ func GetOrCreate(
 		return nil, fmt.Errorf("error parsing vSphere URL %q", server)
 	}
 
-	soapURL.User = url.UserPassword(username, password)
-
+	// Set user to nil there for prevent login during client creation.
+	// See https://github.com/vmware/govmomi/blob/master/client.go#L91
+	soapURL.User = nil
 	client, err := govmomi.NewClient(ctx, soapURL, insecure)
 	if err != nil {
 		return nil, fmt.Errorf("error setting up new vSphere SOAP client: %w", err)
 	}
 
+	// Set up user agent before login for being able to track mapi component in vcenter sessions list
+	client.UserAgent = "machineAPIvSphereProvider"
+	if err := client.Login(ctx, url.UserPassword(username, password)); err != nil {
+		return nil, fmt.Errorf("unable to login to vCenter: %w", err)
+	}
+
 	session := Session{
 		Client:   client,
 		username: username,
 		password: password,
 	}
 
-	session.UserAgent = "machineAPIvSphereProvider"
 	session.Finder = find.NewFinder(session.Client.Client, false)
 
 	dc, err := session.Finder.DatacenterOrDefault(ctx, datacenter)