Add vSphere Cloud Provider simulator based tests #55918

dougm · 2017-11-17T04:22:04Z

What this PR does / why we need it:

Initial set of vSphere Cloud Provider functional tests against the vCenter simulator, provides test coverage without having to run against a real vCenter instance.

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

Special notes for your reviewer:

The vsphere simulator recently moved from vmware/vic to govmomi, I had discussed the idea of introducing it for testing with vSphere Cloud Provider maintainers. These tests provide 90%+ coverage for vclib/datacenter.go, but we can expand further of course.

Release note:

NONE

dims · 2017-11-17T14:48:13Z

/ok-to-test

dougm · 2017-11-20T16:15:52Z

/retest

dougm · 2017-11-27T18:15:45Z

Test failures are fixed by #56136 , but after rebase currently fails locally due to #56393 - I'll rebase again when that is fixed.

dougm · 2017-12-12T19:37:09Z

@rohitjogvmw @tusharnt anyone from the VCP team available to review?

abrarshivani

Thanks, @dougm for adding this.

abrarshivani · 2017-12-14T20:47:18Z

pkg/cloudprovider/providers/vsphere/vclib/datacenter_test.go

+
+	vc := &VSphereConnection{GoVmomiClient: c}
+
+	_, err = GetDatacenter(ctx, vc, "enoent")


I think it would better to add constants here instead of directly using strings. Do we have govmomi constants for the strings?

Sure we can add a constant for this name, but would be in this test rather than govmomi (see below).

Instead of adding constant in this file it would be better to add in here "pkg/cloudprovider/providers/vsphere/vclib/constants.go" so other tests can use it

abrarshivani · 2017-12-14T20:47:26Z

pkg/cloudprovider/providers/vsphere/vclib/datacenter_test.go

+		t.Error("expected error")
+	}
+
+	dc, err := GetDatacenter(ctx, vc, "DC0")


In this case DC0 is expected to exist. I can change the tests to avoid the string literal names, just makes the test code more verbose. For example, instead of hardcoding DCO and LocalDS_0: https://github.com/vmware/govmomi/blob/68f3d8490ce3e7967e0ec283cd13bee465887c78/simulator/virtual_machine_test.go#L54-L71

It is safer to avoid string literals. We can add util functions to avoid repetition of the same code across multiple tests.

abrarshivani · 2017-12-14T21:36:29Z

pkg/cloudprovider/providers/vsphere/vclib/datacenter_test.go

+	vc := &VSphereConnection{GoVmomiClient: c}
+
+	_, err = GetDatacenter(ctx, vc, "enoent")
+	if err == nil {


Can you please explain why enoent should return err as nil? Is this handled differently in the simulator? Since I cannot find it here https://github.com/vmware/govmomi/blob/master/vcsim/README.md/#usage

It is the opposite, these tests are making sure that enoent returns an error that is not nil. Look at the line below, calls t.Error if err == nil. The name enoent does not exist anywhere in the inventory, the tests are expecting these calls to fail, providing coverage of the error paths in datacenter.go.

Sounds good to me

abrarshivani · 2017-12-14T21:40:52Z

pkg/cloudprovider/providers/vsphere/vclib/datacenter_test.go

+		t.Error(err)
+	}
+
+	vmdk := ds.Path(avm.Name + "/disk1.vmdk")


I would prefer variable name such as disk1Path

sure, I'll change that.

abrarshivani · 2017-12-14T21:45:12Z

/test pull-kubernetes-e2e-gce

abrarshivani · 2017-12-14T21:52:28Z

@dougm just executing command make test is enough to run the tests, right?

dougm · 2017-12-14T22:16:50Z

@abrarshivani yes, make test will run these tests.

dougm · 2017-12-15T04:48:29Z

@abrarshivani I've moved the string literals to named constants.

abrarshivani · 2017-12-15T06:30:56Z

/test pull-kubernetes-unit

abrarshivani · 2017-12-15T06:32:06Z

LGTM

dougm · 2017-12-16T02:22:15Z

/retest

abrarshivani · 2017-12-18T20:19:37Z

/lgtm

Initial set of vcsim based tests.

lavalamp · 2018-01-08T21:43:01Z

Assigning to @thockin and @cheftako, one of them should know the current req's for cloud provider changes.

thockin · 2018-01-18T18:50:22Z

@cheftako the move-out can't happen soon enough :)

I'm going to approve this since it is tests and not functionality.

/lgtm
/approve no-issue

k8s-ci-robot · 2018-01-18T18:50:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abrarshivani, dougm, thockin

Associated issue requirement bypassed by: thockin

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

Needs approval from an approver in each of these OWNERS Files:

~~OWNERS~~ [thockin]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

k8s-github-robot · 2018-01-18T18:51:22Z

/test all

Tests are more than 96 hours old. Re-running tests.

dougm · 2018-01-18T19:35:53Z

/test pull-kubernetes-e2e-kops-aws

dougm · 2018-01-18T19:50:42Z

/test pull-kubernetes-verify

dougm · 2018-01-18T20:53:10Z

/test pull-kubernetes-e2e-kops-aws

k8s-github-robot · 2018-01-18T21:25:25Z

/test all

Tests are more than 96 hours old. Re-running tests.

dougm · 2018-01-18T21:29:27Z

/retest

dougm · 2018-01-18T21:59:27Z

/test pull-kubernetes-e2e-kops-aws

dougm · 2018-01-18T22:33:02Z

/test pull-kubernetes-e2e-kops-aws

k8s-github-robot · 2018-01-18T23:06:23Z

/test all

Tests are more than 96 hours old. Re-running tests.

k8s-github-robot · 2018-01-19T00:32:36Z

/test all [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2018-01-19T01:31:03Z

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

Automatic merge from submit-queue (batch tested with PRs 58756, 58758, 58725, 52799, 58534). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add vSphere Cloud Provider vclib tests **What this PR does / why we need it**: Additional vSphere Cloud Provider functional tests against vcsim, providing more test coverage without having to run against a real vCenter instance. Follow up to #55918 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: This set of tests focuses on Datastore, Folder and VirtualMachine types. A couple of TODOs depend on changes to vcsim, I will follow up on those. **Release note**: ```release-note NONE ```

k8s-github-robot assigned jbeda and lavalamp Nov 17, 2017

dougm changed the title ~~Vcp vcsim~~ Add vSphere Cloud Provider simulator based tests Nov 17, 2017

k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 17, 2017

k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 28, 2017

dougm force-pushed the vcp-vcsim branch from 049606b to 82b15fb Compare December 12, 2017 18:02

k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2017

dougm force-pushed the vcp-vcsim branch from 82b15fb to 113fa61 Compare December 13, 2017 19:34

abrarshivani reviewed Dec 14, 2017

View reviewed changes

dougm force-pushed the vcp-vcsim branch from 113fa61 to b8ede33 Compare December 15, 2017 04:42

dougm force-pushed the vcp-vcsim branch 3 times, most recently from 9b2e443 to 5e875c7 Compare December 16, 2017 00:56

k8s-ci-robot assigned abrarshivani Dec 18, 2017

k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 8, 2018

dougm added 2 commits January 8, 2018 09:16

Update vmware/govmomi godeps

09da53c

Add vSphere Cloud Provider simulator based tests

a8180d6

Initial set of vcsim based tests.

dougm force-pushed the vcp-vcsim branch from f806ebe to a8180d6 Compare January 8, 2018 17:16

k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 8, 2018

lavalamp assigned cheftako and thockin and unassigned jbeda, lavalamp and abrarshivani Jan 8, 2018

prashima mentioned this pull request Jan 9, 2018

Renews cached NodeInfo with new vSphere connection #57978

Merged

2 tasks

k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2018

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2018

k8s-github-robot merged commit c1f2da7 into kubernetes:master Jan 19, 2018

dougm mentioned this pull request Jan 19, 2018

Add vSphere Cloud Provider vclib tests #58534

Merged


		vc := &VSphereConnection{GoVmomiClient: c}

		_, err = GetDatacenter(ctx, vc, "enoent")

Add vSphere Cloud Provider simulator based tests #55918

Add vSphere Cloud Provider simulator based tests #55918

Conversation

dougm commented Nov 17, 2017

dims commented Nov 17, 2017

dougm commented Nov 20, 2017

dougm commented Nov 27, 2017

dougm commented Dec 12, 2017

abrarshivani left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abrarshivani Dec 14, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abrarshivani commented Dec 14, 2017

abrarshivani commented Dec 14, 2017 • edited

dougm commented Dec 14, 2017

dougm commented Dec 15, 2017

abrarshivani commented Dec 15, 2017

abrarshivani commented Dec 15, 2017

dougm commented Dec 16, 2017

abrarshivani commented Dec 18, 2017

lavalamp commented Jan 8, 2018

thockin commented Jan 18, 2018

k8s-ci-robot commented Jan 18, 2018

k8s-github-robot commented Jan 18, 2018

dougm commented Jan 18, 2018

dougm commented Jan 18, 2018

dougm commented Jan 18, 2018

k8s-github-robot commented Jan 18, 2018

dougm commented Jan 18, 2018

dougm commented Jan 18, 2018

dougm commented Jan 18, 2018

k8s-github-robot commented Jan 18, 2018

k8s-github-robot commented Jan 19, 2018

k8s-github-robot commented Jan 19, 2018

abrarshivani Dec 14, 2017 •

edited

abrarshivani commented Dec 14, 2017 •

edited