Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify vcsim endpoint setup #740

Merged
merged 1 commit into from
Jul 18, 2023

Conversation

dougm
Copy link
Member

@dougm dougm commented Jul 18, 2023

What this PR does / why we need it:

The vcsim 'RegisterEndpoints' flag was added after the initial version of vsphere_test was written. With the flag set, tests only need to import the simulator packages it needs.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

See: vmware/govmomi#3178

Special notes for your reviewer:

@lubronzhan another option when bumping the govmomi version is the patch below. But this PR will also simplify the code a bit.

modified   pkg/cloudprovider/vsphere/vsphere_test.go
@@ -96,7 +96,7 @@ func configFromSimWithTLS(tlsConfig *tls.Config, insecureAllowed bool, multiDc b
 	model.Service.ServeMux.Handle(path, handler)
 
 	// vAPI simulator
-	vapiPath, handler := vapi.New(s.URL, nil)
+	vapiPath, handler := vapi.New(s.URL, simulator.Map)
 	model.Service.ServeMux.Handle(vapiPath[0], handler)
 
 	// Lookup Service simulator

Release note:

NONE

@dougm dougm requested a review from lubronzhan July 18, 2023 17:14
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 18, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 18, 2023
The vcsim 'RegisterEndpoints' flag was added after the initial version
of vsphere_test was written. With the flag set, tests only need to import
the simulator packages it needs.
@lubronzhan
Copy link
Contributor

/lgtm
/approve
Thanks Doug!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dougm, lubronzhan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2023
@k8s-ci-robot k8s-ci-robot merged commit 35bd2c7 into kubernetes:master Jul 18, 2023
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants