diff --git a/.drone.local.yml b/.drone.local.yml
index 79951eb2f4..72ec9aed93 100644
--- a/.drone.local.yml
+++ b/.drone.local.yml
@@ -4,7 +4,7 @@ workspace:
 
 pipeline:
   vic-integration-test-on-pr:
-    image: '${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.48}'
+    image: '${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.49}'
     pull: true
     environment:
       BIN: bin
diff --git a/.drone.yml b/.drone.yml
index 1179a0e6ec..3e013bf72e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,7 +13,7 @@ clone:
 pipeline:
 
   display-status:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     environment:
       BIN: bin
@@ -25,7 +25,7 @@ pipeline:
       - 'git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo ''Build matches'' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo ''Build is of a merge commit'' || (echo ''Build does not match!'' && exit 1))'
 
   wait-for-build:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     environment:
       BIN: bin
@@ -41,7 +41,7 @@ pipeline:
       - tests/wait_until_previous_builds_complete.sh
 
   check-org-membership:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     environment:
       BIN: bin
@@ -58,7 +58,7 @@ pipeline:
       status: success
 
   vic-engine:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     environment:
       BIN: bin
@@ -77,7 +77,7 @@ pipeline:
       status: success
 
   vic-integration-test-on-pr:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     privileged: true
     environment:
@@ -245,7 +245,7 @@ pipeline:
       status: success
 
   vic-machine-server-tags-dev:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     environment:
       BIN: bin
@@ -261,7 +261,7 @@ pipeline:
       status: success
 
   vic-machine-server-tags-release:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
+    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.49'
     pull: true
     environment:
       BIN: bin
diff --git a/Makefile b/Makefile
index 72c5bafe9a..9f5e55f18c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 SHELL=/bin/bash
 
 GO ?= go
-GOVERSION ?= go1.8
+GOVERSION ?= go1.10
 OS := $(shell uname | tr '[:upper:]' '[:lower:]')
 ifeq (vagrant, $(filter vagrant,$(USER) $(SUDO_USER)))
 	# assuming we are in a shared directory where host arch is different from the guest
diff --git a/cmd/docker/main_test.go b/cmd/docker/main_test.go
index fdd9181e44..969d4e201e 100644
--- a/cmd/docker/main_test.go
+++ b/cmd/docker/main_test.go
@@ -34,5 +34,7 @@ func TestSystem(t *testing.T) {
 }
 
 func TestHandleFlags(t *testing.T) {
-	assert.True(t, handleFlags(), "Flags were not parsed correctly")
+	if *systemTest {
+		assert.True(t, handleFlags(), "Flags were not parsed correctly")
+	}
 }
diff --git a/cmd/vicadmin/vicadm.go b/cmd/vicadmin/vicadm.go
index 67c65b0e5e..22aa116686 100644
--- a/cmd/vicadmin/vicadm.go
+++ b/cmd/vicadmin/vicadm.go
@@ -492,12 +492,22 @@ func (r datastoreReader) open() (entry, error) {
 		req.AddCookie(ticket)
 	}
 
-	res, err := r.ds.Client().Do(req)
-	if err != nil {
+	res := make(chan entry, 1)
+
+	err = r.ds.Client().Do(r.ctx, req, func(response *http.Response) error {
+		e, err := httpEntry(r.path, response)
+
+		res <- e
+
+		return err
+	})
+
+	select {
+	case e := <-res:
+		return e, err
+	default:
 		return nil, err
 	}
-
-	return httpEntry(r.path, res)
 }
 
 // stripCredentials removes user credentials from "in"
diff --git a/infra/integration-image/Dockerfile b/infra/integration-image/Dockerfile
index 4370222b32..ac37845ed8 100644
--- a/infra/integration-image/Dockerfile
+++ b/infra/integration-image/Dockerfile
@@ -8,12 +8,12 @@
 # docker tag vic-test wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.x
 # docker push wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.x
 
-FROM golang:1.8
+FROM golang:1.10
 
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
 
-RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
     apt-get update && apt-get install -y --no-install-recommends \
     jq \
     bc \
@@ -25,7 +25,7 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
     sshpass \
     ant \
 	ant-optional \
-    openjdk-7-jdk \
+    openjdk-8-jdk \
     rpcbind \
     nfs-common \
     unzip \
@@ -88,9 +88,6 @@ RUN wget https://github.com/drone/drone-cli/releases/download/v0.8.3/drone_linux
 
 RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.17.1/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && chmod +x /usr/local/bin/govc
 
-RUN  wget https://launchpad.net/ubuntu/+source/wget/1.18-2ubuntu1/+build/10470166/+files/wget_1.18-2ubuntu1_amd64.deb && \
-     dpkg -i wget_1.18-2ubuntu1_amd64.deb
-
 # Add docker in docker support
 # version: docker:1.13-dind
 # reference: https://github.com/docker-library/docker/blob/b202ec7e529f5426e2ad7e8c0a8b82cacd406573/1.13/dind/Dockerfile
diff --git a/infra/scripts/local-ci.sh b/infra/scripts/local-ci.sh
index 7b39fa4156..3bd4a8c201 100755
--- a/infra/scripts/local-ci.sh
+++ b/infra/scripts/local-ci.sh
@@ -19,7 +19,7 @@ secretsfile=""
 docker_test="Group1-Docker-Commands"
 target_vch=""
 odir="ci-results"
-ci_container="gcr.io/eminent-nation-87317/vic-integration-test:1.48"
+ci_container="gcr.io/eminent-nation-87317/vic-integration-test:1.49"
 github_api_key=""
 test_url=""
 test_datastore=""
diff --git a/lib/apiservers/engine/proxy/container_proxy.go b/lib/apiservers/engine/proxy/container_proxy.go
index f4413dba89..ef9b338fcb 100644
--- a/lib/apiservers/engine/proxy/container_proxy.go
+++ b/lib/apiservers/engine/proxy/container_proxy.go
@@ -1268,12 +1268,12 @@ func hostConfigFromContainerInfo(vc *viccontainer.VicContainer, info *models.Con
 	//
 	// The values we fill out below is an abridged list of the original struct.
 	resourceConfig := container.Resources{
-	// Applicable to all platforms
-	//			CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
-	//			Memory    int64 // Memory limit (in bytes)
+		// Applicable to all platforms
+		//			CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
+		//			Memory    int64 // Memory limit (in bytes)
 
-	//			// Applicable to UNIX platforms
-	//			DiskQuota            int64           // Disk limit (in bytes)
+		//			// Applicable to UNIX platforms
+		//			DiskQuota            int64           // Disk limit (in bytes)
 	}
 
 	hostConfig.VolumeDriver = portlayerName
diff --git a/lib/archive/stripper_test.go b/lib/archive/stripper_test.go
index 0911aa7083..0e109cad83 100644
--- a/lib/archive/stripper_test.go
+++ b/lib/archive/stripper_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/uid"
@@ -32,7 +33,7 @@ import (
 // based on that data. It returns:
 // index of entry names in the archive
 // archive byte stream
-func generateArchive(name string, num, size int) ([]string, io.Reader) {
+func generateArchive(t *testing.T, name string, num, size int) ([]string, io.Reader) {
 	r, w := io.Pipe()
 	tw := tar.NewWriter(w)
 
@@ -45,7 +46,7 @@ func generateArchive(name string, num, size int) ([]string, io.Reader) {
 	// our file contents are zeros - this is the worst case for stripping trailing headers
 	zeros := make([]byte, size)
 
-	go func() {
+	go func(t *testing.T) {
 		for i := 0; i < num; i++ {
 			// we only really care about two things in the header
 			hdr := &tar.Header{
@@ -53,13 +54,13 @@ func generateArchive(name string, num, size int) ([]string, io.Reader) {
 				Size: int64(size),
 			}
 
-			fmt.Printf("Writing header for file %s:%d\n", name, i)
+			t.Logf("Writing header for file %s:%d", name, i)
 			err := tw.WriteHeader(hdr)
 			if err != nil {
 				panic(err)
 			}
 
-			fmt.Printf("Writing data for file %s:%d\n", name, i)
+			t.Logf("Writing data for file %s:%d", name, i)
 			n, err := tw.Write(zeros)
 			if err != nil {
 				panic(err)
@@ -72,7 +73,7 @@ func generateArchive(name string, num, size int) ([]string, io.Reader) {
 		// add the end-of-archive
 		tw.Close()
 		w.Close()
-	}()
+	}(t)
 
 	return index, r
 }
@@ -84,7 +85,7 @@ func generateArchive(name string, num, size int) ([]string, io.Reader) {
 func TestSingleStripper(t *testing.T) {
 	size := 2048
 	count := 5
-	index, reader := generateArchive("single", count, size)
+	index, reader := generateArchive(t, "single", count, size)
 
 	source := tar.NewReader(reader)
 	stripper := NewStripper(trace.NewOperation(context.Background(), "strip"), source, nil)
@@ -99,7 +100,7 @@ func TestSingleStripper(t *testing.T) {
 		pw.Close()
 
 		wg.Done()
-		fmt.Printf("Done copying from stripper: %d, %s\n", n, err)
+		t.Logf("Done copying from stripper: %d, %s", n, err)
 		if !assert.NoError(t, err, "Expected nil error from io.Copy on end-of-file") {
 			t.FailNow()
 		}
@@ -107,7 +108,7 @@ func TestSingleStripper(t *testing.T) {
 	}()
 
 	for i := 0; i <= len(index); i++ {
-		fmt.Printf("Reading header for file %d\n", i)
+		t.Logf("Reading header for file %d", i)
 		header, err := tr.Next()
 		if err == io.EOF {
 			fmt.Printf("End-of-file")
@@ -115,33 +116,20 @@ func TestSingleStripper(t *testing.T) {
 			return
 		}
 
-		if err != nil {
-			fmt.Printf("Error from archive: %s\n", err)
-			t.FailNow()
-		}
-
-		if !assert.NotEqual(t, i, len(index), "Expected EOF after index exhausted") {
-			t.FailNow()
-		}
-
-		if !assert.Equal(t, header.Name, index[i], "Expected header name to match index") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size") {
-			t.FailNow()
-		}
+		require.NoError(t, err, "Error from archive: %s", err)
+		require.NotEqual(t, i, len(index), "Expected EOF after index exhausted")
+		require.Equal(t, header.Name, index[i], "Expected header name to match index")
+		require.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size")
 
 		// make the buf just that little bit bigger to allow for errrors in the copy if they would occur
 		buf := make([]byte, size+10)
 
-		fmt.Printf("Reading data for file %d\n", i)
+		t.Logf("Reading data for file %d", i)
 		n, err := tr.Read(buf)
 
-		if !assert.NoError(t, err, "No expected errors from file data copy") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, n, size, "Expected file data size to match target generated size") {
-			t.FailNow()
+		require.Equal(t, n, size, "Expected file data size to match target generated size")
+		if err != io.EOF && err != nil {
+			assert.FailNow(t, "Unexpected error from file data copy: %s", err)
 		}
 	}
 
@@ -160,7 +148,7 @@ func TestConjoinedStrippers(t *testing.T) {
 
 	for m := 0; m < multiplicity; m++ {
 		var reader io.Reader
-		indices[m], reader = generateArchive(fmt.Sprintf("archive-%d", m), count, size)
+		indices[m], reader = generateArchive(t, fmt.Sprintf("archive-%d", m), count, size)
 		source := tar.NewReader(reader)
 		strippers[m] = NewStripper(trace.NewOperation(context.Background(), fmt.Sprintf("strip-%d", m)), source, nil)
 	}
@@ -177,52 +165,38 @@ func TestConjoinedStrippers(t *testing.T) {
 		pw.Close()
 
 		wg.Done()
-		fmt.Printf("Done copying from strippers: %d, %s\n", n, err)
-		if !assert.NoError(t, err, "Expected nil error from io.Copy on end-of-file") {
-			t.FailNow()
-		}
+		t.Logf("Done copying from strippers: %d, %s", n, err)
+		require.NoError(t, err, "Expected nil error from io.Copy on end-of-file")
 	}()
 
 	expectedEntries := count * multiplicity
 	for i := 0; i <= expectedEntries; i++ {
-		fmt.Printf("Reading header for file %d\n", i)
+		t.Logf("Reading header for file %d", i)
 		header, err := tr.Next()
 		if err == io.EOF {
-			fmt.Printf("End-of-file\n")
+			t.Logf("End-of-file")
 			// TODO: is this pass or fail?
 			return
 		}
 
-		if err != nil {
-			fmt.Printf("Error from archive: %s\n", err)
-			t.FailNow()
-		}
-
-		if !assert.NotEqual(t, i, expectedEntries, "Expected EOF after index exhausted") {
-			t.FailNow()
-		}
+		require.NoError(t, err, "Error from archive: %s", err)
+		require.NotEqual(t, i, expectedEntries, "Expected EOF after index exhausted")
 
 		member := i / count
 		entry := i % count
 
-		if !assert.Equal(t, header.Name, indices[member][entry], "Expected header name to match index") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size") {
-			t.FailNow()
-		}
+		require.Equal(t, header.Name, indices[member][entry], "Expected header name to match index")
+		require.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size")
 
 		// make the buf just that little bit bigger to allow for errrors in the copy if they would occur
 		buf := make([]byte, size+10)
 
-		fmt.Printf("Reading data for file %d\n", i)
+		t.Logf("Reading data for file %d", i)
 		n, err := tr.Read(buf)
 
-		if !assert.NoError(t, err, "No expected errors from file data copy") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, n, size, "Expected file data size to match target generated size") {
-			t.FailNow()
+		require.Equal(t, n, size, "Expected file data size to match target generated size")
+		if err != io.EOF && err != nil {
+			assert.FailNow(t, "Unexpected error from file data copy: %s", err)
 		}
 	}
 
@@ -242,14 +216,14 @@ func TestConjoinedStrippersWithCloser(t *testing.T) {
 
 	for m := 0; m < multiplicity; m++ {
 		var reader io.Reader
-		indices[m], reader = generateArchive(fmt.Sprintf("archive-%d", m), count, size)
+		indices[m], reader = generateArchive(t, fmt.Sprintf("archive-%d", m), count, size)
 		source := tar.NewReader(reader)
 
 		if m < multiplicity-1 {
-			fmt.Printf("added stripper\n")
+			t.Logf("added stripper")
 			readers[m] = NewStripper(trace.NewOperation(context.Background(), fmt.Sprintf("strip-%d", m)), source, nil)
 		} else {
-			fmt.Printf("added raw\n")
+			t.Logf("added raw")
 			readers[m] = reader
 		}
 	}
@@ -266,53 +240,39 @@ func TestConjoinedStrippersWithCloser(t *testing.T) {
 		pw.Close()
 
 		wg.Done()
-		fmt.Printf("Done copying from all sources: %d, %s\n", n, err)
-		if !assert.NoError(t, err, "Expected nil error from io.Copy on end-of-file") {
-			t.FailNow()
-		}
+		t.Logf("Done copying from all sources: %d, %s", n, err)
+		require.NoError(t, err, "Expected nil error from io.Copy on end-of-file")
 	}()
 
 	expectedEntries := count * multiplicity
 	for i := 0; i <= expectedEntries; i++ {
-		fmt.Printf("Reading header for file %d\n", i)
+		t.Logf("Reading header for file %d", i)
 		header, err := tr.Next()
 		if err == io.EOF {
-			fmt.Printf("End-of-file\n")
+			t.Logf("End-of-file")
 
 			wg.Wait()
 			return
 		}
 
-		if err != nil {
-			fmt.Printf("Error from archive: %s\n", err)
-			t.FailNow()
-		}
-
-		if !assert.NotEqual(t, i, expectedEntries, "Expected EOF after index exhausted") {
-			t.FailNow()
-		}
+		require.NoError(t, err, "Error from archive: %s", err)
+		require.NotEqual(t, i, expectedEntries, "Expected EOF after index exhausted")
 
 		member := i / count
 		entry := i % count
 
-		if !assert.Equal(t, header.Name, indices[member][entry], "Expected header name to match index") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size") {
-			t.FailNow()
-		}
+		require.Equal(t, header.Name, indices[member][entry], "Expected header name to match index")
+		require.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size")
 
 		// make the buf just that little bit bigger to allow for errrors in the copy if they would occur
 		buf := make([]byte, size+10)
 
-		fmt.Printf("Reading data for file %d\n", i)
+		t.Logf("Reading data for file %d", i)
 		n, err := tr.Read(buf)
 
-		if !assert.NoError(t, err, "No expected errors from file data copy") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, n, size, "Expected file data size to match target generated size") {
-			t.FailNow()
+		require.Equal(t, n, size, "Expected file data size to match target generated size")
+		if err != io.EOF && err != nil {
+			assert.FailNow(t, "Unexpected error from file data copy: %s", err)
 		}
 	}
 
diff --git a/lib/install/validate/validator.go b/lib/install/validate/validator.go
index 2d8f67fa86..911e2fb202 100644
--- a/lib/install/validate/validator.go
+++ b/lib/install/validate/validator.go
@@ -488,9 +488,11 @@ func (v *Validator) credentials(op trace.Operation, input *data.Data, conf *conf
 
 	if input.Thumbprint != "" {
 		// if any thumprint is specified, then object if there's a mismatch
-		soapClient = soap.NewClient(stripped, false)
+                op.Debugf("Building client for validation of operations credentials with thumbprint=%s, force=%t", conf.TargetThumbprint, input.Force)
+		soapClient = soap.NewClient(stripped, input.Force)
 		soapClient.SetThumbprint(stripped.Host, conf.TargetThumbprint)
 	} else {
+                op.Debugf("Building client for validation of operations credentials without a thumbprint, force=%t", input.Force)
 		soapClient = soap.NewClient(stripped, input.Force)
 	}
 	soapClient.UserAgent = "vice-validator"
diff --git a/pkg/dio/multi_test.go b/pkg/dio/multi_test.go
index 749ea1ecb0..0a23e6b57a 100644
--- a/pkg/dio/multi_test.go
+++ b/pkg/dio/multi_test.go
@@ -99,8 +99,9 @@ func read(t *testing.T, mreader DynamicMultiReader, limit int) []byte {
 }
 
 func each(t *testing.T, buffers []*bytes.Buffer, s string) {
-	for i := range buffers {
-		assert.Equal(t, buffers[i].String(), s)
+	for _, b := range buffers {
+		// TODO: something about the way some of these test are written causes the length of the buffer to start at 512
+		assert.Equal(t, s, strings.TrimRight(b.String(), "\x00"))
 	}
 }
 
@@ -162,6 +163,7 @@ func TestWriteAdd(t *testing.T) {
 		}
 		wgAdded.Add(1)
 		go func(i int) {
+			// TODO: Something about this goroutine seems to cause the len of the buffer to jump to 512! (Work-around above)
 			if i%3 != 0 {
 				io.CopyN(&buffer, reader, int64(len(base)))
 				wg.Done()
diff --git a/tests/drs-disabled/jenkins-drs-disabled-run.sh b/tests/drs-disabled/jenkins-drs-disabled-run.sh
index 491d6332ae..ac874f480e 100755
--- a/tests/drs-disabled/jenkins-drs-disabled-run.sh
+++ b/tests/drs-disabled/jenkins-drs-disabled-run.sh
@@ -61,7 +61,7 @@ fi
 
 # Run the Robot tests in a container
 envfile="vic-internal/drs-disabled-secrets.list"
-image="gcr.io/eminent-nation-87317/vic-integration-test:1.48"
+image="gcr.io/eminent-nation-87317/vic-integration-test:1.49"
 cmd="pabot --processes 1 --removekeywords TAG:secret -d drs-disabled tests/manual-test-cases/Group19-DRS-Disabled"
 docker run --rm -v $PWD/vic:/go --env-file $envfile $image $cmd
 
diff --git a/tests/local-integration-test.sh b/tests/local-integration-test.sh
index 9c4d0c0198..bb428c4afa 100755
--- a/tests/local-integration-test.sh
+++ b/tests/local-integration-test.sh
@@ -73,7 +73,7 @@ workspace:
 
 pipeline:
   vic-integration-test-on-pr:
-    image: gcr.io/eminent-nation-87317/vic-integration-test:1.48
+    image: gcr.io/eminent-nation-87317/vic-integration-test:1.49
     pull: true
     environment:
       GITHUB_AUTOMATION_API_KEY: $GITHUB_TOKEN
diff --git a/tests/longevity-tests/run-longevity.bash b/tests/longevity-tests/run-longevity.bash
index fb8ab0e74c..5566c2f053 100755
--- a/tests/longevity-tests/run-longevity.bash
+++ b/tests/longevity-tests/run-longevity.bash
@@ -94,6 +94,6 @@ docker run -w /go/vic -i \
     --env-file vic-internal/longevity-${target}-secrets.list \
     -e SYSLOG_VCH_OPTION="${syslogVchOption}" \
     -e DEBUG_VCH_LEVEL="${debugVchLevel}" \
-    -v $(pwd)/vic:/go/vic gcr.io/eminent-nation-87317/vic-integration-test:1.48 \
+    -v $(pwd)/vic:/go/vic gcr.io/eminent-nation-87317/vic-integration-test:1.49 \
     pybot tests/manual-test-cases/Group14-Longevity/14-1-Longevity.robot
 
diff --git a/vendor/github.com/vmware/govmomi/client.go b/vendor/github.com/vmware/govmomi/client.go
index e3dc7976a2..ad49fe6bf7 100644
--- a/vendor/github.com/vmware/govmomi/client.go
+++ b/vendor/github.com/vmware/govmomi/client.go
@@ -58,7 +58,6 @@ package govmomi
 
 import (
 	"context"
-	"crypto/tls"
 	"net/url"
 
 	"github.com/vmware/govmomi/property"
@@ -99,41 +98,11 @@ func NewClient(ctx context.Context, u *url.URL, insecure bool) (*Client, error)
 	return c, nil
 }
 
-// NewClientWithCertificate creates a new client from a URL. The client authenticates with the
-// server with the certificate before returning if the URL contains user information.
-func NewClientWithCertificate(ctx context.Context, u *url.URL, insecure bool, cert tls.Certificate) (*Client, error) {
-	soapClient := soap.NewClient(u, insecure)
-	soapClient.SetCertificate(cert)
-	vimClient, err := vim25.NewClient(ctx, soapClient)
-	if err != nil {
-		return nil, err
-	}
-
-	c := &Client{
-		Client:         vimClient,
-		SessionManager: session.NewManager(vimClient),
-	}
-
-	if u.User != nil {
-		err = c.LoginExtensionByCertificate(ctx, u.User.Username(), "")
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return c, nil
-}
-
 // Login dispatches to the SessionManager.
 func (c *Client) Login(ctx context.Context, u *url.Userinfo) error {
 	return c.SessionManager.Login(ctx, u)
 }
 
-// Login dispatches to the SessionManager.
-func (c *Client) LoginExtensionByCertificate(ctx context.Context, key string, locale string) error {
-	return c.SessionManager.LoginExtensionByCertificate(ctx, key, locale)
-}
-
 // Logout dispatches to the SessionManager.
 func (c *Client) Logout(ctx context.Context) error {
 	// Close any idle connections after logging out.
diff --git a/vendor/github.com/vmware/govmomi/examples/examples.go b/vendor/github.com/vmware/govmomi/examples/examples.go
index 1bd0728f10..ccc949ad6c 100644
--- a/vendor/github.com/vmware/govmomi/examples/examples.go
+++ b/vendor/github.com/vmware/govmomi/examples/examples.go
@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	"github.com/vmware/govmomi"
+	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/soap"
 )
 
@@ -61,7 +62,7 @@ const (
 )
 
 var urlDescription = fmt.Sprintf("ESX or vCenter URL [%s]", envURL)
-var urlFlag = flag.String("url", getEnvString(envURL, "https://username:password@host/sdk"), urlDescription)
+var urlFlag = flag.String("url", getEnvString(envURL, "https://username:password@host"+vim25.Path), urlDescription)
 
 var insecureDescription = fmt.Sprintf("Don't verify the server's certificate chain [%s]", envInsecure)
 var insecureFlag = flag.Bool("insecure", getEnvBool(envInsecure, false), insecureDescription)
diff --git a/vendor/github.com/vmware/govmomi/examples/hosts/main.go b/vendor/github.com/vmware/govmomi/examples/hosts/main.go
index 8356821064..7801d9c017 100644
--- a/vendor/github.com/vmware/govmomi/examples/hosts/main.go
+++ b/vendor/github.com/vmware/govmomi/examples/hosts/main.go
@@ -66,7 +66,7 @@ func main() {
 	// Print summary per host (see also: govc/host/info.go)
 
 	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "Name:\tUsed CPU:\tTotal CPU:\tFree CPU:\tUsed Memory:\tTotal Memory:\tFree Memory\t:\n")
+	fmt.Fprintf(tw, "Name:\tUsed CPU:\tTotal CPU:\tFree CPU:\tUsed Memory:\tTotal Memory:\tFree Memory:\t\n")
 
 	for _, hs := range hss {
 		totalCPU := int64(hs.Summary.Hardware.CpuMhz) * int64(hs.Summary.Hardware.NumCpuCores)
@@ -76,7 +76,7 @@ func main() {
 		fmt.Fprintf(tw, "%d\t", hs.Summary.QuickStats.OverallCpuUsage)
 		fmt.Fprintf(tw, "%d\t", totalCPU)
 		fmt.Fprintf(tw, "%d\t", freeCPU)
-		fmt.Fprintf(tw, "%s\t", units.ByteSize(hs.Summary.QuickStats.OverallMemoryUsage))
+		fmt.Fprintf(tw, "%s\t", (units.ByteSize(hs.Summary.QuickStats.OverallMemoryUsage))*1024*1024)
 		fmt.Fprintf(tw, "%s\t", units.ByteSize(hs.Summary.Hardware.MemorySize))
 		fmt.Fprintf(tw, "%d\t", freeMemory)
 		fmt.Fprintf(tw, "\n")
diff --git a/vendor/github.com/vmware/govmomi/find/finder.go b/vendor/github.com/vmware/govmomi/find/finder.go
index 2e9727e484..70a2b53594 100644
--- a/vendor/github.com/vmware/govmomi/find/finder.go
+++ b/vendor/github.com/vmware/govmomi/find/finder.go
@@ -716,7 +716,7 @@ func (f *Finder) HostSystem(ctx context.Context, path string) (*object.HostSyste
 }
 
 func (f *Finder) DefaultHostSystem(ctx context.Context) (*object.HostSystem, error) {
-	hs, err := f.HostSystem(ctx, "*/*")
+	hs, err := f.HostSystem(ctx, "*")
 	if err != nil {
 		return nil, toDefaultError(err)
 	}
diff --git a/vendor/github.com/vmware/govmomi/govc/cluster/rule/info_flag.go b/vendor/github.com/vmware/govmomi/govc/cluster/rule/info_flag.go
index 74caad0061..03777a20b5 100644
--- a/vendor/github.com/vmware/govmomi/govc/cluster/rule/info_flag.go
+++ b/vendor/github.com/vmware/govmomi/govc/cluster/rule/info_flag.go
@@ -31,6 +31,7 @@ type InfoFlag struct {
 	rules []types.BaseClusterRuleInfo
 
 	name string
+	Long bool
 }
 
 func NewInfoFlag(ctx context.Context) (*InfoFlag, context.Context) {
@@ -43,6 +44,7 @@ func (f *InfoFlag) Register(ctx context.Context, fs *flag.FlagSet) {
 	f.ClusterFlag.Register(ctx, fs)
 
 	fs.StringVar(&f.name, "name", "", "Cluster rule name")
+	fs.BoolVar(&f.Long, "l", false, "Long listing format")
 }
 
 func (f *InfoFlag) Process(ctx context.Context) error {
@@ -72,9 +74,21 @@ func (f *InfoFlag) Rules(ctx context.Context) ([]types.BaseClusterRuleInfo, erro
 type ClusterRuleInfo struct {
 	info types.BaseClusterRuleInfo
 
+	ruleType string
+
+	// only ClusterAffinityRuleSpec and ClusterAntiAffinityRuleSpec
 	refs *[]types.ManagedObjectReference
 
 	kind string
+
+	// only ClusterVmHostRuleInfo
+	vmGroupName             string
+	affineHostGroupName     string
+	antiAffineHostGroupName string
+
+	// only ClusterDependencyRuleInfo
+	VmGroup          string
+	DependsOnVmGroup string
 }
 
 func (f *InfoFlag) Rule(ctx context.Context) (*ClusterRuleInfo, error) {
@@ -88,23 +102,38 @@ func (f *InfoFlag) Rule(ctx context.Context) (*ClusterRuleInfo, error) {
 			continue
 		}
 
-		r := &ClusterRuleInfo{info: rule}
-
-		switch info := rule.(type) {
-		case *types.ClusterAffinityRuleSpec:
-			r.refs = &info.Vm
-			r.kind = "VirtualMachine"
-		case *types.ClusterAntiAffinityRuleSpec:
-			r.refs = &info.Vm
-			r.kind = "VirtualMachine"
-		}
-
-		return r, nil
+		r := GetExtendedClusterRuleInfo(rule)
+		return &r, nil
 	}
 
 	return nil, fmt.Errorf("rule %q not found", f.name)
 }
 
+func GetExtendedClusterRuleInfo(rule types.BaseClusterRuleInfo) ClusterRuleInfo {
+	r := ClusterRuleInfo{info: rule}
+
+	switch info := rule.(type) {
+	case *types.ClusterAffinityRuleSpec:
+		r.ruleType = "ClusterAffinityRuleSpec"
+		r.refs = &info.Vm
+		r.kind = "VirtualMachine"
+	case *types.ClusterAntiAffinityRuleSpec:
+		r.ruleType = "ClusterAntiAffinityRuleSpec"
+		r.refs = &info.Vm
+		r.kind = "VirtualMachine"
+	case *types.ClusterVmHostRuleInfo:
+		r.ruleType = "ClusterVmHostRuleInfo"
+		r.vmGroupName = info.VmGroupName
+		r.affineHostGroupName = info.AffineHostGroupName
+		r.antiAffineHostGroupName = info.AntiAffineHostGroupName
+	case *types.ClusterDependencyRuleInfo:
+		r.ruleType = "ClusterDependencyRuleInfo"
+		r.VmGroup = info.VmGroup
+		r.DependsOnVmGroup = info.DependsOnVmGroup
+	}
+	return r
+}
+
 func (f *InfoFlag) Apply(ctx context.Context, update types.ArrayUpdateSpec, info types.BaseClusterRuleInfo) error {
 	spec := &types.ClusterConfigSpecEx{
 		RulesSpec: []types.ClusterRuleSpec{
diff --git a/vendor/github.com/vmware/govmomi/govc/cluster/rule/ls.go b/vendor/github.com/vmware/govmomi/govc/cluster/rule/ls.go
index 71fafc5a40..0d37a8a454 100644
--- a/vendor/github.com/vmware/govmomi/govc/cluster/rule/ls.go
+++ b/vendor/github.com/vmware/govmomi/govc/cluster/rule/ls.go
@@ -47,7 +47,9 @@ func (cmd *ls) Description() string {
 
 Examples:
   govc cluster.rule.ls -cluster my_cluster
-  govc cluster.rule.ls -cluster my_cluster -name my_rule`
+  govc cluster.rule.ls -cluster my_cluster -name my_rule
+  govc cluster.rule.ls -cluster my_cluster -l
+  govc cluster.rule.ls -cluster my_cluster -name my_rule -l`
 }
 
 type ruleResult []string
@@ -70,7 +72,13 @@ func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
 		}
 
 		for _, g := range rules {
-			res = append(res, g.GetClusterRuleInfo().Name)
+			ruleName := g.GetClusterRuleInfo().Name
+			if cmd.Long {
+				ruleTypeInfo := GetExtendedClusterRuleInfo(g).ruleType
+				res = append(res, fmt.Sprintf("%s (%s)", ruleName, ruleTypeInfo))
+			} else {
+				res = append(res, fmt.Sprintf("%s", ruleName))
+			}
 		}
 	} else {
 		rule, err := cmd.Rule(ctx)
@@ -78,19 +86,40 @@ func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
 			return err
 		}
 
-		if rule.refs == nil {
-			return nil
+		//res = append(res, rule.ruleType+":")
+		switch rule.ruleType {
+		case "ClusterAffinityRuleSpec", "ClusterAntiAffinityRuleSpec":
+			names, err := cmd.Names(ctx, *rule.refs)
+			if err != nil {
+				cmd.WriteResult(res)
+				return err
+			}
+
+			for _, ref := range *rule.refs {
+				res = extendedAppend(res, cmd.Long, names[ref], "VM")
+			}
+		case "ClusterVmHostRuleInfo":
+			res = extendedAppend(res, cmd.Long, rule.vmGroupName, "vmGroupName")
+			res = extendedAppend(res, cmd.Long, rule.affineHostGroupName, "affineHostGroupName")
+			res = extendedAppend(res, cmd.Long, rule.antiAffineHostGroupName, "antiAffineHostGroupName")
+		case "ClusterDependencyRuleInfo":
+			res = extendedAppend(res, cmd.Long, rule.VmGroup, "VmGroup")
+			res = extendedAppend(res, cmd.Long, rule.DependsOnVmGroup, "DependsOnVmGroup")
+		default:
+			res = append(res, "unknown rule type, no further rule details known")
 		}
 
-		names, err := cmd.Names(ctx, *rule.refs)
-		if err != nil {
-			return err
-		}
-
-		for _, ref := range *rule.refs {
-			res = append(res, names[ref])
-		}
 	}
 
 	return cmd.WriteResult(res)
 }
+
+func extendedAppend(res ruleResult, Long bool, entryValue string, entryType string) ruleResult {
+	var newres ruleResult
+	if Long {
+		newres = append(res, fmt.Sprintf("%s (%s)", entryValue, entryType))
+	} else {
+		newres = append(res, entryValue)
+	}
+	return newres
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go b/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
index e886c50f54..e0f7a34c3f 100644
--- a/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
@@ -31,12 +31,14 @@ import (
 type spec struct {
 	types.FileBackedVirtualDiskSpec
 	force bool
+	uuid  string
 }
 
 func (s *spec) Register(ctx context.Context, f *flag.FlagSet) {
 	f.StringVar(&s.AdapterType, "a", string(types.VirtualDiskAdapterTypeLsiLogic), "Disk adapter")
 	f.StringVar(&s.DiskType, "d", string(types.VirtualDiskTypeThin), "Disk format")
 	f.BoolVar(&s.force, "f", false, "Force")
+	f.StringVar(&s.uuid, "uuid", "", "Disk UUID")
 }
 
 type create struct {
@@ -109,6 +111,13 @@ func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
 	logger := cmd.ProgressLogger(fmt.Sprintf("Creating %s...", dst))
 	defer logger.Wait()
 
-	_, err = task.WaitForResult(ctx, logger)
-	return err
+	if _, err = task.WaitForResult(ctx, logger); err != nil {
+		return err
+	}
+
+	if cmd.uuid != "" {
+		return m.SetVirtualDiskUuid(ctx, dst, dc, cmd.uuid)
+	}
+
+	return nil
 }
diff --git a/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go b/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go
index 338c5c8230..d4c5d37324 100644
--- a/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go
+++ b/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go
@@ -35,6 +35,8 @@ type info struct {
 	c bool
 	d bool
 	p bool
+
+	uuid bool
 }
 
 func init() {
@@ -48,6 +50,7 @@ func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
 	f.BoolVar(&cmd.c, "c", false, "Chain format")
 	f.BoolVar(&cmd.d, "d", false, "Include datastore in output")
 	f.BoolVar(&cmd.p, "p", true, "Include parents")
+	f.BoolVar(&cmd.uuid, "uuid", false, "Include disk UUID")
 }
 
 func (cmd *info) Process(ctx context.Context) error {
@@ -84,6 +87,8 @@ func dsPath(s string) string {
 
 var infoPath = dsPath
 
+var queryUUID func(string) string
+
 type infoResult []object.VirtualDiskInfo
 
 func (r infoResult) Write(w io.Writer) error {
@@ -91,6 +96,9 @@ func (r infoResult) Write(w io.Writer) error {
 
 	for _, info := range r {
 		fmt.Fprintf(tw, "Name:\t%s\n", infoPath(info.Name))
+		if queryUUID != nil {
+			fmt.Fprintf(tw, "  UUID:\t%s\n", queryUUID(info.Name))
+		}
 		fmt.Fprintf(tw, "  Type:\t%s\n", info.DiskType)
 		fmt.Fprintf(tw, "  Parent:\t%s\n", infoPath(info.Parent))
 	}
@@ -126,6 +134,13 @@ func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
 
 	m := object.NewVirtualDiskManager(ds.Client())
 
+	if cmd.uuid {
+		queryUUID = func(name string) string {
+			id, _ := m.QueryVirtualDiskUuid(ctx, name, dc)
+			return id
+		}
+	}
+
 	info, err := m.QueryVirtualDiskInfo(ctx, ds.Path(f.Arg(0)), dc, cmd.p)
 	if err != nil {
 		return err
diff --git a/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go
index aefb96a2d5..a8522f4b55 100644
--- a/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go
+++ b/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go
@@ -21,6 +21,9 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"reflect"
+	"sort"
+	"strings"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
@@ -39,6 +42,26 @@ type info struct {
 	uplinkPort bool
 	vlanID     int
 	count      int
+	dvsRules   bool
+}
+
+var protocols = map[int32]string{
+	1:  "icmp",
+	2:  "igmp",
+	6:  "tcp",
+	17: "udp",
+	58: "ipv6-icmp",
+}
+
+type trafficRule struct {
+	Description        string
+	Direction          string
+	Action             string
+	Protocol           string
+	SourceAddress      string
+	SourceIpPort       string
+	DestinationAddress string
+	DestinationIpPort  string
 }
 
 func init() {
@@ -56,6 +79,7 @@ func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
 	f.BoolVar(&cmd.uplinkPort, "uplinkPort", false, "Filter for uplink ports")
 	f.IntVar(&cmd.vlanID, "vlan", 0, "Filter by VLAN ID (0 = unfiltered)")
 	f.IntVar(&cmd.count, "count", 0, "Number of matches to return (0 = unlimited)")
+	f.BoolVar(&cmd.dvsRules, "r", false, "Show DVS rules")
 }
 
 func (cmd *info) Usage() string {
@@ -76,8 +100,95 @@ type infoResult struct {
 	cmd  *info
 }
 
+func printPort(port types.BaseDvsIpPort) string {
+	if port != nil {
+		switch port.(type) {
+		case *types.DvsSingleIpPort:
+			return fmt.Sprintf("%d", port.(*types.DvsSingleIpPort).PortNumber)
+		case *types.DvsIpPortRange:
+			return fmt.Sprintf("%d-%d", port.(*types.DvsIpPortRange).StartPortNumber, port.(*types.DvsIpPortRange).EndPortNumber)
+		}
+	}
+	return "Any"
+}
+
+func printAddress(address types.BaseIpAddress) string {
+	if address != nil {
+		switch (address).(type) {
+		case *types.SingleIp:
+			return fmt.Sprintf("%s", address.(*types.SingleIp).Address)
+		case *types.IpRange:
+			return fmt.Sprintf("%s/%d", address.(*types.IpRange).AddressPrefix, address.(*types.IpRange).PrefixLength)
+		}
+	}
+	return "Any"
+}
+
+func printAction(action types.BaseDvsNetworkRuleAction) string {
+	if action != nil {
+		switch (action).(type) {
+		case *types.DvsAcceptNetworkRuleAction:
+			return fmt.Sprintf("Accept")
+		case *types.DvsDropNetworkRuleAction:
+			return fmt.Sprintf("Drop")
+		}
+	}
+	return "n/a"
+}
+
+func printTable(trafficRuleSet map[int]map[int]trafficRule, portID int) {
+	if len(trafficRuleSet[portID]) == 0 {
+		return
+	}
+
+	keys := []int{}
+	for k := range trafficRuleSet[portID] {
+		keys = append(keys, k)
+	}
+	sort.Ints(keys)
+	tabWidthInt := 22
+	tabWidth := fmt.Sprintf("%d", tabWidthInt)
+	headLen := 9*(tabWidthInt+2) - 1
+	fmt.Printf("+" + strings.Repeat("-", headLen) + "+\n")
+	format := "| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s| %-" + tabWidth +
+		"s|\n"
+	fmt.Printf(format,
+		"Sequence",
+		"Description",
+		"Direction",
+		"Action",
+		"Protocol",
+		"SourceAddress",
+		"SourceIpPort",
+		"DestinationAddress",
+		"DestinationIpPort")
+	fmt.Printf("+" + strings.Repeat("-", headLen) + "+\n")
+	for _, id := range keys {
+		fmt.Printf(format,
+			fmt.Sprintf("%d", id),
+			trafficRuleSet[portID][id].Description,
+			trafficRuleSet[portID][id].Direction,
+			trafficRuleSet[portID][id].Action,
+			trafficRuleSet[portID][id].Protocol,
+			trafficRuleSet[portID][id].SourceAddress,
+			trafficRuleSet[portID][id].SourceIpPort,
+			trafficRuleSet[portID][id].DestinationAddress,
+			trafficRuleSet[portID][id].DestinationIpPort)
+	}
+	fmt.Printf("+" + strings.Repeat("-", headLen) + "+\n")
+}
+
 func (r *infoResult) Write(w io.Writer) error {
-	for _, port := range r.Port {
+	trafficRuleSet := make(map[int]map[int]trafficRule)
+	for portID, port := range r.Port {
 		var vlanID int32
 		setting := port.Config.Setting.(*types.VMwareDVSPortSetting)
 
@@ -95,8 +206,65 @@ func (r *infoResult) Write(w io.Writer) error {
 			fmt.Printf("DvsUuid:      %s\n", port.DvsUuid)
 			fmt.Printf("VlanId:       %d\n", vlanID)
 			fmt.Printf("PortKey:      %s\n\n", port.Key)
+
+			trafficRuleSet[portID] = make(map[int]trafficRule)
+
+			if r.cmd.dvsRules && setting.FilterPolicy != nil &&
+				setting.FilterPolicy.FilterConfig != nil &&
+				len(setting.FilterPolicy.FilterConfig) > 0 {
+
+				rules := setting.FilterPolicy.FilterConfig[0].GetDvsTrafficFilterConfig()
+				if rules != nil && rules.TrafficRuleset != nil && rules.TrafficRuleset.Rules != nil {
+					for _, rule := range rules.TrafficRuleset.Rules {
+						for _, q := range rule.Qualifier {
+							var protocol string
+							if val, ok := protocols[q.GetDvsIpNetworkRuleQualifier().Protocol.Value]; ok {
+								protocol = val
+							} else {
+								protocol = fmt.Sprintf("%d", q.GetDvsIpNetworkRuleQualifier().Protocol.Value)
+							}
+
+							trafficRuleSet[portID][int(rule.Sequence)] = trafficRule{
+								Description:        rule.Description,
+								Direction:          rule.Direction,
+								Action:             printAction(rule.Action),
+								Protocol:           protocol,
+								SourceAddress:      printAddress(q.GetDvsIpNetworkRuleQualifier().SourceAddress),
+								SourceIpPort:       printPort(q.GetDvsIpNetworkRuleQualifier().SourceIpPort),
+								DestinationAddress: printAddress(q.GetDvsIpNetworkRuleQualifier().DestinationAddress),
+								DestinationIpPort:  printPort(q.GetDvsIpNetworkRuleQualifier().DestinationIpPort),
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if r.cmd.dvsRules && len(r.Port) > 0 {
+		eq := 0
+		for i, _ := range r.Port {
+			if i > 0 {
+				reflect.DeepEqual(trafficRuleSet[i-1], trafficRuleSet[i])
+				if reflect.DeepEqual(trafficRuleSet[i-1], trafficRuleSet[i]) {
+					eq++
+				} else {
+					fmt.Printf("%s and %s port rules are unequal\n", r.Port[i-1].Key, r.Port[i].Key)
+					break
+				}
+			}
+		}
+
+		if eq == len(trafficRuleSet)-1 {
+			printTable(trafficRuleSet, 0)
+		} else {
+			for portID, port := range r.Port {
+				fmt.Printf("\nPortKey:      %s\n", port.Key)
+				printTable(trafficRuleSet, portID)
+			}
 		}
 	}
+
 	return nil
 }
 
diff --git a/vendor/github.com/vmware/govmomi/govc/events/command.go b/vendor/github.com/vmware/govmomi/govc/events/command.go
index b6f82828e6..ef25e76273 100644
--- a/vendor/github.com/vmware/govmomi/govc/events/command.go
+++ b/vendor/github.com/vmware/govmomi/govc/events/command.go
@@ -164,24 +164,17 @@ func (cmd *events) Run(ctx context.Context, f *flag.FlagSet) error {
 		return err
 	}
 
-	if len(objs) > 0 {
-		// need an event manager
-		m := event.NewManager(c)
-
-		// get the event stream
-		err = m.Events(ctx, objs, cmd.Max, cmd.Tail, cmd.Force, func(obj types.ManagedObjectReference, ee []types.BaseEvent) error {
-			var o *types.ManagedObjectReference
-			if len(objs) > 1 {
-				o = &obj
-			}
-
-			return cmd.printEvents(ctx, o, ee, m)
-		}, cmd.Kind...)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+	m := event.NewManager(c)
+
+	return cmd.WithCancel(ctx, func(wctx context.Context) error {
+		return m.Events(wctx, objs, cmd.Max, cmd.Tail, cmd.Force,
+			func(obj types.ManagedObjectReference, ee []types.BaseEvent) error {
+				var o *types.ManagedObjectReference
+				if len(objs) > 1 {
+					o = &obj
+				}
+
+				return cmd.printEvents(ctx, o, ee, m)
+			}, cmd.Kind...)
+	})
 }
diff --git a/vendor/github.com/vmware/govmomi/govc/extension/setcert.go b/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
index 6c58f09d87..dc20c55218 100644
--- a/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
+++ b/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
@@ -29,6 +29,7 @@ import (
 	"io/ioutil"
 	"math/big"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/vmware/govmomi/govc/cli"
@@ -74,7 +75,10 @@ func (cmd *setcert) Description() string {
 The '-cert-pem' option can be one of the following:
 '-' : Read the certificate from stdin
 '+' : Generate a new key pair and save locally to ID.crt and ID.key
-... : Any other value is passed as-is to ExtensionManager.SetCertificate`
+... : Any other value is passed as-is to ExtensionManager.SetCertificate
+
+Examples:
+  govc extension.setcert -cert-pem + -org Example com.example.extname`
 }
 
 func (cmd *setcert) create(id string) error {
@@ -139,16 +143,6 @@ func (cmd *setcert) create(id string) error {
 }
 
 func (cmd *setcert) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetExtensionManager(c)
-	if err != nil {
-		return err
-	}
-
 	if f.NArg() != 1 {
 		return flag.ErrHelp
 	}
@@ -161,12 +155,25 @@ func (cmd *setcert) Run(ctx context.Context, f *flag.FlagSet) error {
 			return err
 		}
 		cmd.cert = string(b)
-	} else if cmd.cert == "+" {
+	} else if strings.HasPrefix(cmd.cert, "+") {
 		if err := cmd.create(key); err != nil {
 			return fmt.Errorf("creating certificate: %s", err)
 		}
+		if cmd.cert == "++" {
+			return nil // just generate a cert, useful for testing
+		}
 		cmd.cert = cmd.encodedCert.String()
 	}
 
+	c, err := cmd.Client()
+	if err != nil {
+		return err
+	}
+
+	m, err := object.GetExtensionManager(c)
+	if err != nil {
+		return err
+	}
+
 	return m.SetCertificate(ctx, key, cmd.cert)
 }
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/client.go b/vendor/github.com/vmware/govmomi/govc/flags/client.go
index 703cbb9377..26574024ed 100644
--- a/vendor/github.com/vmware/govmomi/govc/flags/client.go
+++ b/vendor/github.com/vmware/govmomi/govc/flags/client.go
@@ -28,8 +28,10 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/vmware/govmomi/session"
@@ -51,6 +53,8 @@ const (
 	envVimVersion    = "GOVC_VIM_VERSION"
 	envTLSCaCerts    = "GOVC_TLS_CA_CERTS"
 	envTLSKnownHosts = "GOVC_TLS_KNOWN_HOSTS"
+
+	defaultMinVimVersion = "5.5"
 )
 
 const cDescr = "ESX or vCenter URL"
@@ -110,6 +114,10 @@ func (flag *ClientFlag) URLWithoutPassword() *url.URL {
 	return &withoutCredentials
 }
 
+func (flag *ClientFlag) Userinfo() *url.Userinfo {
+	return flag.url.User
+}
+
 func (flag *ClientFlag) IsSecure() bool {
 	return !flag.insecure
 }
@@ -183,7 +191,7 @@ func (flag *ClientFlag) Register(ctx context.Context, f *flag.FlagSet) {
 		{
 			env := os.Getenv(envMinAPIVersion)
 			if env == "" {
-				env = soap.DefaultMinVimVersion
+				env = defaultMinVimVersion
 			}
 
 			flag.minAPIVersion = env
@@ -192,7 +200,7 @@ func (flag *ClientFlag) Register(ctx context.Context, f *flag.FlagSet) {
 		{
 			value := os.Getenv(envVimNamespace)
 			if value == "" {
-				value = soap.DefaultVimNamespace
+				value = vim25.Namespace
 			}
 			usage := fmt.Sprintf("Vim namespace [%s]", envVimNamespace)
 			f.StringVar(&flag.vimNamespace, "vim-namespace", value, usage)
@@ -201,7 +209,7 @@ func (flag *ClientFlag) Register(ctx context.Context, f *flag.FlagSet) {
 		{
 			value := os.Getenv(envVimVersion)
 			if value == "" {
-				value = soap.DefaultVimVersion
+				value = vim25.Version
 			}
 			usage := fmt.Sprintf("Vim version [%s]", envVimVersion)
 			f.StringVar(&flag.vimVersion, "vim-version", value, usage)
@@ -264,8 +272,17 @@ func (flag *ClientFlag) Process(ctx context.Context) error {
 
 // configure TLS and retry settings before making any connections
 func (flag *ClientFlag) configure(sc *soap.Client) (soap.RoundTripper, error) {
+	if flag.cert != "" {
+		cert, err := tls.LoadX509KeyPair(flag.cert, flag.key)
+		if err != nil {
+			return nil, err
+		}
+
+		sc.SetCertificate(cert)
+	}
+
 	// Set namespace and version
-	sc.Namespace = flag.vimNamespace
+	sc.Namespace = "urn:" + flag.vimNamespace
 	sc.Version = flag.vimVersion
 
 	sc.UserAgent = fmt.Sprintf("govc/%s", Version)
@@ -403,29 +420,24 @@ func (flag *ClientFlag) SetRootCAs(c *soap.Client) error {
 func (flag *ClientFlag) login(ctx context.Context, c *vim25.Client) error {
 	m := session.NewManager(c)
 	u := flag.url.User
-
-	if u.Username() == "" {
-		if !c.IsVC() {
-			// If no username is provided, try to acquire a local ticket.
-			// When invoked remotely, ESX returns an InvalidRequestFault.
-			// So, rather than return an error here, fallthrough to Login() with the original User to
-			// to avoid what would be a confusing error message.
-			luser, lerr := flag.localTicket(ctx, m)
-			if lerr == nil {
-				// We are running directly on an ESX or Workstation host and can use the ticket with Login()
-				u = luser
-			} else {
-				flag.persist = true // Not persisting, but this avoids the call to Logout()
-				return nil          // Avoid SaveSession for non-authenticated session
-			}
+	name := u.Username()
+
+	if name == "" && !c.IsVC() {
+		// If no username is provided, try to acquire a local ticket.
+		// When invoked remotely, ESX returns an InvalidRequestFault.
+		// So, rather than return an error here, fallthrough to Login() with the original User to
+		// to avoid what would be a confusing error message.
+		luser, lerr := flag.localTicket(ctx, m)
+		if lerr == nil {
+			// We are running directly on an ESX or Workstation host and can use the ticket with Login()
+			u = luser
+			name = u.Username()
 		}
 	}
-
-	if flag.cert != "" {
-		err := m.LoginExtensionByCertificate(ctx, u.Username(), "")
-		if err != nil {
-			return err
-		}
+	if name == "" {
+		// Skip auto-login if we don't have a username
+		flag.persist = true // Not persisting, but this avoids the call to Logout()
+		return nil          // Avoid SaveSession for non-authenticated session
 	}
 
 	return m.Login(ctx, u)
@@ -435,15 +447,6 @@ func (flag *ClientFlag) newClient() (*vim25.Client, error) {
 	ctx := context.TODO()
 	sc := soap.NewClient(flag.url, flag.insecure)
 
-	if flag.cert != "" {
-		cert, err := tls.LoadX509KeyPair(flag.cert, flag.key)
-		if err != nil {
-			return nil, err
-		}
-
-		sc.SetCertificate(cert)
-	}
-
 	rt, err := flag.configure(sc)
 	if err != nil {
 		return nil, err
@@ -573,7 +576,7 @@ func (flag *ClientFlag) Environ(extra bool) []string {
 		u.User = nil
 	}
 
-	if u.Path == "/sdk" {
+	if u.Path == vim25.Path {
 		u.Path = ""
 	}
 	u.Fragment = ""
@@ -624,3 +627,29 @@ func (flag *ClientFlag) Environ(extra bool) []string {
 
 	return env
 }
+
+// WithCancel calls the given function, returning when complete or canceled via SIGINT.
+func (flag *ClientFlag) WithCancel(ctx context.Context, f func(context.Context) error) error {
+	sig := make(chan os.Signal, 1)
+	signal.Notify(sig, syscall.SIGINT)
+
+	wctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	done := make(chan bool)
+	var werr error
+
+	go func() {
+		defer close(done)
+		werr = f(wctx)
+	}()
+
+	select {
+	case <-sig:
+		cancel()
+		<-done // Wait for f() to complete
+	case <-done:
+	}
+
+	return werr
+}
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go b/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
index 3c1957da09..4c5516d3a8 100644
--- a/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
+++ b/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
@@ -77,7 +77,7 @@ func (flag *DatacenterFlag) Process(ctx context.Context) error {
 	})
 }
 
-func (flag *DatacenterFlag) Finder() (*find.Finder, error) {
+func (flag *DatacenterFlag) Finder(all ...bool) (*find.Finder, error) {
 	if flag.finder != nil {
 		return flag.finder, nil
 	}
@@ -87,7 +87,11 @@ func (flag *DatacenterFlag) Finder() (*find.Finder, error) {
 		return nil, err
 	}
 
-	finder := find.NewFinder(c, flag.JSON || flag.Dump)
+	allFlag := false
+	if len(all) == 1 {
+		allFlag = all[0]
+	}
+	finder := find.NewFinder(c, allFlag)
 
 	// Datacenter is not required (ls command for example).
 	// Set for relative func if dc flag is given or
diff --git a/vendor/github.com/vmware/govmomi/govc/flags/version.go b/vendor/github.com/vmware/govmomi/govc/flags/version.go
index eaa99cc6b3..aa782c5fd9 100644
--- a/vendor/github.com/vmware/govmomi/govc/flags/version.go
+++ b/vendor/github.com/vmware/govmomi/govc/flags/version.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 )
 
-const Version = "0.17.2-dev"
+const Version = "0.19.0"
 
 var GitVersion string
 
diff --git a/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go b/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go
index 740193a25c..a1e26a613c 100644
--- a/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go
+++ b/vendor/github.com/vmware/govmomi/govc/host/esxcli/esxcli.go
@@ -72,7 +72,7 @@ func (cmd *esxcli) Process(ctx context.Context) error {
 func (cmd *esxcli) Run(ctx context.Context, f *flag.FlagSet) error {
 	c, err := cmd.Client()
 	if err != nil {
-		return nil
+		return err
 	}
 
 	host, err := cmd.HostSystem()
diff --git a/vendor/github.com/vmware/govmomi/govc/host/info.go b/vendor/github.com/vmware/govmomi/govc/host/info.go
index 397282c66a..dafee85d47 100644
--- a/vendor/github.com/vmware/govmomi/govc/host/info.go
+++ b/vendor/github.com/vmware/govmomi/govc/host/info.go
@@ -139,7 +139,7 @@ func (r *infoResult) Write(w io.Writer) error {
 		s := host.Summary
 		h := s.Hardware
 		z := s.QuickStats
-		ncpu := int32(h.NumCpuPkgs * h.NumCpuThreads)
+		ncpu := int32(h.NumCpuThreads)
 		cpuUsage := 100 * float64(z.OverallCpuUsage) / float64(ncpu*h.CpuMhz)
 		memUsage := 100 * float64(z.OverallMemoryUsage) / float64(h.MemorySize>>20)
 
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/archive.go b/vendor/github.com/vmware/govmomi/govc/importx/archive.go
index 348bd76b42..6cb84c2b34 100644
--- a/vendor/github.com/vmware/govmomi/govc/importx/archive.go
+++ b/vendor/github.com/vmware/govmomi/govc/importx/archive.go
@@ -53,7 +53,7 @@ func (f *ArchiveFlag) Process(ctx context.Context) error {
 }
 
 func (f *ArchiveFlag) ReadOvf(fpath string) ([]byte, error) {
-	r, _, err := f.Archive.Open(fpath)
+	r, _, err := f.Open(fpath)
 	if err != nil {
 		return nil, err
 	}
@@ -63,11 +63,9 @@ func (f *ArchiveFlag) ReadOvf(fpath string) ([]byte, error) {
 }
 
 func (f *ArchiveFlag) ReadEnvelope(data []byte) (*ovf.Envelope, error) {
-	r := bytes.NewReader(data)
-
-	e, err := ovf.Unmarshal(r)
+	e, err := ovf.Unmarshal(bytes.NewReader(data))
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse ovf: %s", err.Error())
+		return nil, fmt.Errorf("failed to parse ovf: %s", err)
 	}
 
 	return e, nil
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/options.go b/vendor/github.com/vmware/govmomi/govc/importx/options.go
index 231bb8d097..80f6937ef8 100644
--- a/vendor/github.com/vmware/govmomi/govc/importx/options.go
+++ b/vendor/github.com/vmware/govmomi/govc/importx/options.go
@@ -55,10 +55,11 @@ type Options struct {
 
 	Annotation string `json:",omitempty"`
 
-	PowerOn      bool
-	InjectOvfEnv bool
-	WaitForIP    bool
-	Name         *string
+	MarkAsTemplate bool
+	PowerOn        bool
+	InjectOvfEnv   bool
+	WaitForIP      bool
+	Name           *string
 }
 
 type OptionsFlag struct {
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/ovf.go b/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
index 96f3f68dfb..f3e26d59b3 100644
--- a/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
+++ b/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
@@ -147,7 +147,7 @@ func (cmd *ovfx) Prepare(f *flag.FlagSet) (string, error) {
 		return "", err
 	}
 
-	cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool()
+	cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePoolIfSpecified()
 	if err != nil {
 		return "", err
 	}
@@ -160,6 +160,10 @@ func (cmd *ovfx) Deploy(vm *object.VirtualMachine) error {
 		return err
 	}
 
+	if err := cmd.MarkAsTemplate(vm); err != nil {
+		return err
+	}
+
 	if err := cmd.PowerOn(vm); err != nil {
 		return err
 	}
@@ -211,6 +215,7 @@ func (cmd *ovfx) NetworkMap(e *ovf.Envelope) (p []types.OvfNetworkMapping) {
 
 func (cmd *ovfx) Import(fpath string) (*types.ManagedObjectReference, error) {
 	ctx := context.TODO()
+
 	o, err := cmd.ReadOvf(fpath)
 	if err != nil {
 		return nil, err
@@ -218,7 +223,7 @@ func (cmd *ovfx) Import(fpath string) (*types.ManagedObjectReference, error) {
 
 	e, err := cmd.ReadEnvelope(o)
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse ovf: %s", err.Error())
+		return nil, fmt.Errorf("failed to parse ovf: %s", err)
 	}
 
 	name := "Govc Virtual Appliance"
@@ -251,6 +256,22 @@ func (cmd *ovfx) Import(fpath string) (*types.ManagedObjectReference, error) {
 		NetworkMapping:  cmd.NetworkMap(e),
 	}
 
+	host, err := cmd.HostSystemIfSpecified()
+	if err != nil {
+		return nil, err
+	}
+
+	if cmd.ResourcePool == nil {
+		if host == nil {
+			cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool()
+		} else {
+			cmd.ResourcePool, err = host.ResourcePool(ctx)
+		}
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	m := ovf.NewManager(cmd.Client)
 	spec, err := m.CreateImportSpec(ctx, string(o), cmd.ResourcePool, cmd.Datastore, cisp)
 	if err != nil {
@@ -274,13 +295,6 @@ func (cmd *ovfx) Import(fpath string) (*types.ManagedObjectReference, error) {
 		}
 	}
 
-	var host *object.HostSystem
-	if cmd.SearchFlag.IsSet() {
-		if host, err = cmd.HostSystem(); err != nil {
-			return nil, err
-		}
-	}
-
 	folder, err := cmd.FolderOrDefault("vm")
 	if err != nil {
 		return nil, err
@@ -331,7 +345,7 @@ func (cmd *ovfx) Upload(ctx context.Context, lease *nfc.Lease, item nfc.FileItem
 
 func (cmd *ovfx) PowerOn(vm *object.VirtualMachine) error {
 	ctx := context.TODO()
-	if !cmd.Options.PowerOn {
+	if !cmd.Options.PowerOn || cmd.Options.MarkAsTemplate {
 		return nil
 	}
 
@@ -349,6 +363,22 @@ func (cmd *ovfx) PowerOn(vm *object.VirtualMachine) error {
 	return nil
 }
 
+func (cmd *ovfx) MarkAsTemplate(vm *object.VirtualMachine) error {
+	ctx := context.TODO()
+	if !cmd.Options.MarkAsTemplate {
+		return nil
+	}
+
+	cmd.Log("Marking VM as template...\n")
+
+	err := vm.MarkAsTemplate(ctx)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (cmd *ovfx) InjectOvfEnv(vm *object.VirtualMachine) error {
 	if !cmd.Options.InjectOvfEnv {
 		return nil
@@ -402,7 +432,7 @@ func (cmd *ovfx) InjectOvfEnv(vm *object.VirtualMachine) error {
 
 func (cmd *ovfx) WaitForIP(vm *object.VirtualMachine) error {
 	ctx := context.TODO()
-	if !cmd.Options.PowerOn || !cmd.Options.WaitForIP {
+	if !cmd.Options.PowerOn || !cmd.Options.WaitForIP || cmd.Options.MarkAsTemplate {
 		return nil
 	}
 
diff --git a/vendor/github.com/vmware/govmomi/govc/importx/spec.go b/vendor/github.com/vmware/govmomi/govc/importx/spec.go
index eecfeae907..b2a84a139f 100644
--- a/vendor/github.com/vmware/govmomi/govc/importx/spec.go
+++ b/vendor/github.com/vmware/govmomi/govc/importx/spec.go
@@ -129,14 +129,16 @@ func (cmd *spec) Map(e *ovf.Envelope) (res []Property) {
 }
 
 func (cmd *spec) Spec(fpath string) error {
-	d, err := cmd.ReadOvf(fpath)
-	if err != nil {
-		return err
-	}
+	e := &ovf.Envelope{}
+	if fpath != "" {
+		d, err := cmd.ReadOvf(fpath)
+		if err != nil {
+			return err
+		}
 
-	e, err := cmd.ReadEnvelope(d)
-	if err != nil {
-		return err
+		if e, err = cmd.ReadEnvelope(d); err != nil {
+			return err
+		}
 	}
 
 	var deploymentOptions []string
@@ -159,6 +161,7 @@ func (cmd *spec) Spec(fpath string) error {
 		DiskProvisioning:   allDiskProvisioningOptions[0],
 		IPAllocationPolicy: allIPAllocationPolicyOptions[0],
 		IPProtocol:         allIPProtocolOptions[0],
+		MarkAsTemplate:     false,
 		PowerOn:            false,
 		WaitForIP:          false,
 		InjectOvfEnv:       false,
diff --git a/vendor/github.com/vmware/govmomi/govc/ls/command.go b/vendor/github.com/vmware/govmomi/govc/ls/command.go
index bade70a239..7efb636044 100644
--- a/vendor/github.com/vmware/govmomi/govc/ls/command.go
+++ b/vendor/github.com/vmware/govmomi/govc/ls/command.go
@@ -82,7 +82,7 @@ func (cmd *ls) typeMatch(ref types.ManagedObjectReference) bool {
 }
 
 func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	finder, err := cmd.Finder()
+	finder, err := cmd.Finder(cmd.All())
 	if err != nil {
 		return err
 	}
diff --git a/vendor/github.com/vmware/govmomi/govc/main.go b/vendor/github.com/vmware/govmomi/govc/main.go
index 512479a1a7..03296c3cb1 100644
--- a/vendor/github.com/vmware/govmomi/govc/main.go
+++ b/vendor/github.com/vmware/govmomi/govc/main.go
@@ -70,6 +70,11 @@ import (
 	_ "github.com/vmware/govmomi/govc/pool"
 	_ "github.com/vmware/govmomi/govc/role"
 	_ "github.com/vmware/govmomi/govc/session"
+	_ "github.com/vmware/govmomi/govc/sso/service"
+	_ "github.com/vmware/govmomi/govc/sso/user"
+	_ "github.com/vmware/govmomi/govc/tags"
+	_ "github.com/vmware/govmomi/govc/tags/association"
+	_ "github.com/vmware/govmomi/govc/tags/category"
 	_ "github.com/vmware/govmomi/govc/task"
 	_ "github.com/vmware/govmomi/govc/vapp"
 	_ "github.com/vmware/govmomi/govc/version"
diff --git a/vendor/github.com/vmware/govmomi/govc/object/collect.go b/vendor/github.com/vmware/govmomi/govc/object/collect.go
index 34a9055495..64e9d41b9a 100644
--- a/vendor/github.com/vmware/govmomi/govc/object/collect.go
+++ b/vendor/github.com/vmware/govmomi/govc/object/collect.go
@@ -26,11 +26,13 @@ import (
 	"reflect"
 	"strings"
 	"text/tabwriter"
+	"time"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/view"
+	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
@@ -46,6 +48,7 @@ type collect struct {
 	dump   bool
 	n      int
 	kind   kinds
+	wait   time.Duration
 
 	filter property.Filter
 	obj    string
@@ -64,6 +67,7 @@ func (cmd *collect) Register(ctx context.Context, f *flag.FlagSet) {
 	f.StringVar(&cmd.raw, "R", "", "Raw XML encoded CreateFilter request")
 	f.IntVar(&cmd.n, "n", 0, "Wait for N property updates")
 	f.Var(&cmd.kind, "type", "Resource type.  If specified, MOID is used for a container view root")
+	f.DurationVar(&cmd.wait, "wait", 0, "Max wait time for updates")
 }
 
 func (cmd *collect) Usage() string {
@@ -317,7 +321,7 @@ func (cmd *collect) Run(ctx context.Context, f *flag.FlagSet) error {
 	filter := new(property.WaitFilter)
 
 	if cmd.raw == "" {
-		ref := methods.ServiceInstance
+		ref := vim25.ServiceInstance
 		arg := f.Arg(0)
 
 		if len(cmd.kind) != 0 {
@@ -387,41 +391,48 @@ func (cmd *collect) Run(ctx context.Context, f *flag.FlagSet) error {
 	entered := false
 	hasFilter := len(cmd.filter) != 0
 
-	return property.WaitForUpdates(ctx, p, filter, func(updates []types.ObjectUpdate) bool {
-		matches := 0
+	if cmd.wait != 0 {
+		filter.Options = &types.WaitOptions{
+			MaxWaitSeconds: types.NewInt32(int32(cmd.wait.Seconds())),
+		}
+	}
 
-		for _, update := range updates {
-			if entered && update.Kind == types.ObjectUpdateKindEnter {
-				// on the first update we only get kind "enter"
-				// if a new object is added, the next update with have both "enter" and "modify".
-				continue
-			}
+	return cmd.WithCancel(ctx, func(wctx context.Context) error {
+		return property.WaitForUpdates(wctx, p, filter, func(updates []types.ObjectUpdate) bool {
+			matches := 0
+			for _, update := range updates {
+				if entered && update.Kind == types.ObjectUpdateKindEnter {
+					// on the first update we only get kind "enter"
+					// if a new object is added, the next update with have both "enter" and "modify".
+					continue
+				}
 
-			c := &change{cmd, update}
+				c := &change{cmd, update}
 
-			if hasFilter {
-				if cmd.match(update) {
-					matches++
-				} else {
-					continue
+				if hasFilter {
+					if cmd.match(update) {
+						matches++
+					} else {
+						continue
+					}
 				}
+
+				_ = cmd.WriteResult(c)
 			}
 
-			_ = cmd.WriteResult(c)
-		}
+			entered = true
 
-		entered = true
+			if hasFilter {
+				if matches > 0 {
+					return true
+				}
 
-		if hasFilter {
-			if matches > 0 {
-				return true
+				return false
 			}
 
-			return false
-		}
-
-		cmd.n--
+			cmd.n--
 
-		return cmd.n == -1
+			return cmd.n == -1 && cmd.wait == 0
+		})
 	})
 }
diff --git a/vendor/github.com/vmware/govmomi/govc/object/find.go b/vendor/github.com/vmware/govmomi/govc/object/find.go
index 517b9badb3..876dd945eb 100644
--- a/vendor/github.com/vmware/govmomi/govc/object/find.go
+++ b/vendor/github.com/vmware/govmomi/govc/object/find.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"io"
 	"strings"
 
 	"github.com/vmware/govmomi/govc/cli"
@@ -172,6 +173,19 @@ func (cmd *find) rootMatch(ctx context.Context, root object.Reference, client *v
 	return content != nil
 }
 
+type findResult []string
+
+func (r findResult) Write(w io.Writer) error {
+	for i := range r {
+		fmt.Fprintln(w, r[i])
+	}
+	return nil
+}
+
+func (r findResult) Dump() interface{} {
+	return []string(r)
+}
+
 func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 	client, err := cmd.Client()
 	if err != nil {
@@ -201,10 +215,14 @@ func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 		return flag.ErrHelp
 	}
 
+	dc, err := cmd.DatacenterIfSpecified()
+	if err != nil {
+		return err
+	}
+
 	switch arg {
 	case rootPath:
 	case "", ".":
-		dc, _ := cmd.DatacenterIfSpecified()
 		if dc == nil {
 			arg = rootPath
 		} else {
@@ -213,7 +231,17 @@ func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 			rootPath = dc.InventoryPath
 		}
 	default:
-		l, ferr := finder.ManagedObjectList(ctx, arg)
+		path := arg
+		if !strings.Contains(arg, "/") {
+			// Force list mode
+			p := "."
+			if dc != nil {
+				p = dc.InventoryPath
+			}
+			path = strings.Join([]string{p, arg}, "/")
+		}
+
+		l, ferr := finder.ManagedObjectList(ctx, path)
 		if ferr != nil {
 			return err
 		}
@@ -225,7 +253,7 @@ func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 			root = l[0].Object.Reference()
 			rootPath = l[0].Path
 		default:
-			return flag.ErrHelp
+			return fmt.Errorf("%q matches %d objects", arg, len(l))
 		}
 	}
 
@@ -256,15 +284,16 @@ func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 	}
 
 	filter["name"] = cmd.name
+	var paths findResult
 
 	printPath := func(o types.ManagedObjectReference, p string) {
 		if cmd.ref {
-			fmt.Fprintln(cmd.Out, o)
+			paths = append(paths, o.String())
 			return
 		}
 
 		path := strings.Replace(p, rootPath, arg, 1)
-		fmt.Fprintln(cmd.Out, path)
+		paths = append(paths, path)
 	}
 
 	recurse := false
@@ -283,7 +312,7 @@ func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 	}
 
 	if cmd.maxdepth == 0 {
-		return nil
+		return cmd.WriteResult(paths)
 	}
 
 	m := view.NewManager(client)
@@ -314,5 +343,5 @@ func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
 		printPath(o, path)
 	}
 
-	return nil
+	return cmd.WriteResult(paths)
 }
diff --git a/vendor/github.com/vmware/govmomi/govc/session/login.go b/vendor/github.com/vmware/govmomi/govc/session/login.go
index 214c8a6ad0..6906da7d2f 100644
--- a/vendor/github.com/vmware/govmomi/govc/session/login.go
+++ b/vendor/github.com/vmware/govmomi/govc/session/login.go
@@ -23,10 +23,12 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/session"
+	"github.com/vmware/govmomi/sts"
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/soap"
@@ -37,9 +39,14 @@ type login struct {
 	*flags.OutputFlag
 
 	clone  bool
+	issue  bool
+	renew  bool
 	long   bool
 	ticket string
+	life   time.Duration
 	cookie string
+	token  string
+	ext    string
 }
 
 func init() {
@@ -53,9 +60,14 @@ func (cmd *login) Register(ctx context.Context, f *flag.FlagSet) {
 	cmd.OutputFlag.Register(ctx, f)
 
 	f.BoolVar(&cmd.clone, "clone", false, "Acquire clone ticket")
+	f.BoolVar(&cmd.issue, "issue", false, "Issue SAML token")
+	f.BoolVar(&cmd.renew, "renew", false, "Renew SAML token")
+	f.DurationVar(&cmd.life, "lifetime", time.Minute*10, "SAML token lifetime")
 	f.BoolVar(&cmd.long, "l", false, "Output session cookie")
-	f.StringVar(&cmd.ticket, "ticket", "", "Clone ticket")
+	f.StringVar(&cmd.ticket, "ticket", "", "Use clone ticket for login")
 	f.StringVar(&cmd.cookie, "cookie", "", "Set HTTP cookie for an existing session")
+	f.StringVar(&cmd.token, "token", "", "Use SAML token for login or as issue identity")
+	f.StringVar(&cmd.ext, "extension", "", "Extension name")
 }
 
 func (cmd *login) Process(ctx context.Context) error {
@@ -73,24 +85,35 @@ The session.login command can be used to:
 - Persist a session without writing to disk via the '-cookie' flag
 - Acquire a clone ticket
 - Login using a clone ticket
+- Login using a vCenter Extension certificate
+- Issue a SAML token
+- Renew a SAML token
+- Login using a SAML token
 - Avoid passing credentials to other govc commands
 
 Examples:
   govc session.login -u root:password@host
   ticket=$(govc session.login -u root@host -clone)
-  govc session.login -u root@host -ticket $ticket`
+  govc session.login -u root@host -ticket $ticket
+  govc session.login -u host -extension com.vmware.vsan.health -cert rui.crt -key rui.key
+  token=$(govc session.login -u host -cert user.crt -key user.key -issue) # HoK token
+  bearer=$(govc session.login -u user:pass@host -issue) # Bearer token
+  token=$(govc session.login -u host -cert user.crt -key user.key -issue -token "$bearer")
+  govc session.login -u host -cert user.crt -key user.key -token "$token"
+  token=$(govc session.login -u host -cert user.crt -key user.key -renew -lifetime 24h -token "$token")`
 }
 
 type ticketResult struct {
 	cmd    *login
 	Ticket string `json:",omitempty"`
+	Token  string `json:",omitempty"`
 	Cookie string `json:",omitempty"`
 }
 
 func (r *ticketResult) Write(w io.Writer) error {
 	var output []string
 
-	for _, val := range []string{r.Ticket, r.Cookie} {
+	for _, val := range []string{r.Ticket, r.Token, r.Cookie} {
 		if val != "" {
 			output = append(output, val)
 		}
@@ -109,7 +132,7 @@ func (r *ticketResult) Write(w io.Writer) error {
 // We override ClientFlag's Logout impl to avoid ending a session when -persist-session=false,
 // otherwise Logout would invalidate the cookie and/or ticket.
 func (cmd *login) Logout(ctx context.Context) error {
-	if cmd.long || cmd.clone {
+	if cmd.long || cmd.clone || cmd.issue {
 		return nil
 	}
 	return cmd.ClientFlag.Logout(ctx)
@@ -119,6 +142,65 @@ func (cmd *login) cloneSession(ctx context.Context, c *vim25.Client) error {
 	return session.NewManager(c).CloneSession(ctx, cmd.ticket)
 }
 
+func (cmd *login) issueToken(ctx context.Context, vc *vim25.Client) (string, error) {
+	c, err := sts.NewClient(ctx, vc)
+	if err != nil {
+		return "", err
+	}
+
+	req := sts.TokenRequest{
+		Certificate: c.Certificate(),
+		Userinfo:    cmd.Userinfo(),
+		Renewable:   true,
+		ActAs:       true,
+		Token:       cmd.token,
+		Lifetime:    cmd.life,
+	}
+
+	if req.Certificate == nil {
+		req.Delegatable = true // Bearer token request
+	}
+
+	issue := c.Issue
+	if cmd.renew {
+		issue = c.Renew
+	}
+
+	s, err := issue(ctx, req)
+	if err != nil {
+		return "", err
+	}
+
+	if req.Token != "" {
+		duration := s.Lifetime.Expires.Sub(s.Lifetime.Created)
+		if duration < req.Lifetime {
+			// The granted lifetime is that of the bearer token, which is 5min max.
+			// Extend the lifetime via Renew.
+			req.Token = s.Token
+			if s, err = c.Renew(ctx, req); err != nil {
+				return "", err
+			}
+		}
+	}
+
+	return s.Token, nil
+}
+
+func (cmd *login) loginByToken(ctx context.Context, c *vim25.Client) error {
+	header := soap.Header{
+		Security: &sts.Signer{
+			Certificate: c.Certificate(),
+			Token:       cmd.token,
+		},
+	}
+
+	return session.NewManager(c).LoginByToken(c.WithHeader(ctx, header))
+}
+
+func (cmd *login) loginByExtension(ctx context.Context, c *vim25.Client) error {
+	return session.NewManager(c).LoginExtensionByCertificate(ctx, cmd.ext)
+}
+
 func (cmd *login) setCookie(ctx context.Context, c *vim25.Client) error {
 	url := c.URL()
 	jar := c.Client.Jar
@@ -159,10 +241,22 @@ func (cmd *login) setCookie(ctx context.Context, c *vim25.Client) error {
 }
 
 func (cmd *login) Run(ctx context.Context, f *flag.FlagSet) error {
-	if cmd.ticket != "" {
+	if cmd.renew {
+		cmd.issue = true
+	}
+	switch {
+	case cmd.ticket != "":
 		cmd.Login = cmd.cloneSession
-	} else if cmd.cookie != "" {
+	case cmd.cookie != "":
 		cmd.Login = cmd.setCookie
+	case cmd.token != "":
+		cmd.Login = cmd.loginByToken
+	case cmd.ext != "":
+		cmd.Login = cmd.loginByExtension
+	case cmd.issue:
+		cmd.Login = func(_ context.Context, _ *vim25.Client) error {
+			return nil
+		}
 	}
 
 	c, err := cmd.Client()
@@ -173,11 +267,18 @@ func (cmd *login) Run(ctx context.Context, f *flag.FlagSet) error {
 	m := session.NewManager(c)
 	r := &ticketResult{cmd: cmd}
 
-	if cmd.clone {
+	switch {
+	case cmd.clone:
 		r.Ticket, err = m.AcquireCloneTicket(ctx)
 		if err != nil {
 			return err
 		}
+	case cmd.issue:
+		r.Token, err = cmd.issueToken(ctx, c)
+		if err != nil {
+			return err
+		}
+		return cmd.WriteResult(r)
 	}
 
 	if cmd.cookie == "" {
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/change.go b/vendor/github.com/vmware/govmomi/govc/vm/change.go
index 6b4bea2dff..4482edb1f9 100644
--- a/vendor/github.com/vmware/govmomi/govc/vm/change.go
+++ b/vendor/github.com/vmware/govmomi/govc/vm/change.go
@@ -91,6 +91,7 @@ func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
 	f.Var(flags.NewInt32(&cmd.NumCPUs), "c", "Number of CPUs")
 	f.StringVar(&cmd.GuestId, "g", "", "Guest OS")
 	f.StringVar(&cmd.Name, "name", "", "Display name")
+	f.StringVar(&cmd.Annotation, "annotation", "", "VM description")
 	f.Var(&cmd.extraConfig, "e", "ExtraConfig. <key>=<value>")
 
 	f.Var(flags.NewOptionalBool(&cmd.NestedHVEnabled), "nested-hv-enabled", "Enable nested hardware-assisted virtualization")
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/clone.go b/vendor/github.com/vmware/govmomi/govc/vm/clone.go
index da851fbbbb..bddfdac0ed 100644
--- a/vendor/github.com/vmware/govmomi/govc/vm/clone.go
+++ b/vendor/github.com/vmware/govmomi/govc/vm/clone.go
@@ -221,7 +221,7 @@ func (cmd *clone) Run(ctx context.Context, f *flag.FlagSet) error {
 		return err
 	}
 
-	if cmd.cpus > 0 || cmd.memory > 0 {
+	if cmd.cpus > 0 || cmd.memory > 0 || cmd.annotation != "" {
 		vmConfigSpec := types.VirtualMachineConfigSpec{}
 		if cmd.cpus > 0 {
 			vmConfigSpec.NumCPUs = int32(cmd.cpus)
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/create.go b/vendor/github.com/vmware/govmomi/govc/vm/create.go
index eceefa53b7..2acc738d8e 100644
--- a/vendor/github.com/vmware/govmomi/govc/vm/create.go
+++ b/vendor/github.com/vmware/govmomi/govc/vm/create.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"strings"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
@@ -50,6 +51,7 @@ type create struct {
 	force      bool
 	controller string
 	annotation string
+	firmware   string
 
 	iso              string
 	isoDatastoreFlag *flags.DatastoreFlag
@@ -110,6 +112,14 @@ func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
 	f.StringVar(&cmd.controller, "disk.controller", "scsi", "Disk controller type")
 	f.StringVar(&cmd.annotation, "annotation", "", "VM description")
 
+	firmwareTypes := []string{
+		string(types.GuestOsDescriptorFirmwareTypeBios),
+		string(types.GuestOsDescriptorFirmwareTypeEfi),
+	}
+
+	f.StringVar(&cmd.firmware, "firmware", firmwareTypes[0],
+		fmt.Sprintf("Firmware type [%s]", strings.Join(firmwareTypes, "|")))
+
 	f.StringVar(&cmd.iso, "iso", "", "ISO path")
 	cmd.isoDatastoreFlag, ctx = flags.NewCustomDatastoreFlag(ctx)
 	f.StringVar(&cmd.isoDatastoreFlag.Name, "iso-datastore", "", "Datastore for ISO file")
@@ -296,6 +306,7 @@ func (cmd *create) createVM(ctx context.Context) (*object.Task, error) {
 		NumCPUs:    int32(cmd.cpus),
 		MemoryMB:   int64(cmd.memory),
 		Annotation: cmd.annotation,
+		Firmware:   cmd.firmware,
 	}
 
 	devices, err = cmd.addStorage(nil)
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go b/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go
index 883ba60061..16e28636d8 100644
--- a/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go
+++ b/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go
@@ -19,6 +19,8 @@ package disk
 import (
 	"context"
 	"flag"
+	"fmt"
+	"strings"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
@@ -33,6 +35,7 @@ type attach struct {
 	link       bool
 	disk       string
 	controller string
+	sharing    string
 }
 
 func init() {
@@ -49,6 +52,7 @@ func (cmd *attach) Register(ctx context.Context, f *flag.FlagSet) {
 	f.BoolVar(&cmd.link, "link", true, "Link specified disk")
 	f.StringVar(&cmd.controller, "controller", "", "Disk controller")
 	f.StringVar(&cmd.disk, "disk", "", "Disk path name")
+	f.StringVar(&cmd.sharing, "sharing", "", fmt.Sprintf("Sharing (%s)", strings.Join(sharing, "|")))
 }
 
 func (cmd *attach) Process(ctx context.Context) error {
@@ -61,6 +65,14 @@ func (cmd *attach) Process(ctx context.Context) error {
 	return nil
 }
 
+func (cmd *attach) Description() string {
+	return `Attach existing disk to VM.
+
+Examples:
+  govc vm.disk.attach -vm $name -disk $name/disk1.vmdk
+  govc vm.disk.attach -vm $name -disk $name/shared.vmdk -link=false -sharing sharingMultiWriter`
+}
+
 func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error {
 	vm, err := cmd.VirtualMachine()
 	if err != nil {
@@ -88,6 +100,7 @@ func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error {
 
 	disk := devices.CreateDisk(controller, ds.Reference(), ds.Path(cmd.disk))
 	backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+	backing.Sharing = cmd.sharing
 
 	if cmd.link {
 		if cmd.persist {
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go b/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
index 2157f0aa53..c173dd962e 100644
--- a/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
+++ b/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
@@ -37,6 +37,7 @@ type change struct {
 	key      int
 	label    string
 	filePath string
+	sharing  string
 
 	bytes units.ByteSize
 	mode  string
@@ -71,6 +72,7 @@ func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
 	f.StringVar(&cmd.filePath, "disk.filePath", "", "Disk file name")
 	f.IntVar(&cmd.key, "disk.key", 0, "Disk unique key")
 	f.StringVar(&cmd.mode, "mode", "", fmt.Sprintf("Disk mode (%s)", strings.Join(vdmTypes, "|")))
+	f.StringVar(&cmd.sharing, "sharing", "", fmt.Sprintf("Sharing (%s)", strings.Join(sharing, "|")))
 }
 
 func (cmd *change) Process(ctx context.Context) error {
@@ -145,6 +147,7 @@ func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
 	}
 
 	backing := editdisk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
+	backing.Sharing = cmd.sharing
 
 	if len(cmd.mode) != 0 {
 		backing.DiskMode = cmd.mode
diff --git a/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go b/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
index 4c0aac4eb2..1676e0879e 100644
--- a/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
+++ b/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
@@ -40,6 +40,7 @@ type create struct {
 	Thick      bool
 	Eager      bool
 	DiskMode   string
+	Sharing    string
 }
 
 var vdmTypes = []string{
@@ -51,6 +52,11 @@ var vdmTypes = []string{
 	string(types.VirtualDiskModeAppend),
 }
 
+var sharing = []string{
+	string(types.VirtualDiskSharingSharingNone),
+	string(types.VirtualDiskSharingSharingMultiWriter),
+}
+
 func init() {
 	cli.Register("vm.disk.create", &create{})
 }
@@ -73,7 +79,8 @@ func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
 	f.Var(&cmd.Bytes, "size", "Size of new disk")
 	f.BoolVar(&cmd.Thick, "thick", false, "Thick provision new disk")
 	f.BoolVar(&cmd.Eager, "eager", false, "Eagerly scrub new disk")
-	f.StringVar(&cmd.DiskMode, "mode", "persistent", fmt.Sprintf("Disk mode (%s)", strings.Join(vdmTypes, "|")))
+	f.StringVar(&cmd.DiskMode, "mode", vdmTypes[0], fmt.Sprintf("Disk mode (%s)", strings.Join(vdmTypes, "|")))
+	f.StringVar(&cmd.Sharing, "sharing", "", fmt.Sprintf("Sharing (%s)", strings.Join(sharing, "|")))
 }
 
 func (cmd *create) Process(ctx context.Context) error {
@@ -93,7 +100,8 @@ func (cmd *create) Description() string {
 	return `Create disk and attach to VM.
 
 Examples:
-  govc vm.disk.create -vm $name -name $name/disk1 -size 10G`
+  govc vm.disk.create -vm $name -name $name/disk1 -size 10G
+  govc vm.disk.create -vm $name -name $name/disk2 -size 10G -eager -thick -sharing sharingMultiWriter`
 }
 
 func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
@@ -152,6 +160,7 @@ func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
 	}
 
 	backing.DiskMode = cmd.DiskMode
+	backing.Sharing = cmd.Sharing
 
 	cmd.Log("Creating disk\n")
 	disk.CapacityInKB = int64(cmd.Bytes) / 1024
diff --git a/vendor/github.com/vmware/govmomi/guest/operations_manager.go b/vendor/github.com/vmware/govmomi/guest/operations_manager.go
index d02fb4eae0..fdfbc4ff54 100644
--- a/vendor/github.com/vmware/govmomi/guest/operations_manager.go
+++ b/vendor/github.com/vmware/govmomi/guest/operations_manager.go
@@ -61,10 +61,10 @@ func (m OperationsManager) FileManager(ctx context.Context) (*FileManager, error
 
 	return &FileManager{
 		ManagedObjectReference: *g.FileManager,
-		vm:    m.vm,
-		c:     m.c,
-		mu:    new(sync.Mutex),
-		hosts: make(map[string]string),
+		vm:                     m.vm,
+		c:                      m.c,
+		mu:                     new(sync.Mutex),
+		hosts:                  make(map[string]string),
 	}, nil
 }
 
diff --git a/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go b/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
index c9fe3aa035..24c346825a 100644
--- a/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
+++ b/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
@@ -68,3 +68,22 @@ func (c ClusterComputeResource) AddHost(ctx context.Context, spec types.HostConn
 
 	return NewTask(c.c, res.Returnval), nil
 }
+
+func (c ClusterComputeResource) MoveInto(ctx context.Context, hosts ...*HostSystem) (*Task, error) {
+	req := types.MoveInto_Task{
+		This: c.Reference(),
+	}
+
+	hostReferences := make([]types.ManagedObjectReference, len(hosts))
+	for i, host := range hosts {
+		hostReferences[i] = host.Reference()
+	}
+	req.Host = hostReferences
+
+	res, err := methods.MoveInto_Task(ctx, c.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(c.c, res.Returnval), nil
+}
diff --git a/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup.go b/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup.go
index 86c9fc1c7a..f8ac5512c1 100644
--- a/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup.go
+++ b/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup.go
@@ -18,6 +18,7 @@ package object
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
@@ -39,11 +40,17 @@ func NewDistributedVirtualPortgroup(c *vim25.Client, ref types.ManagedObjectRefe
 func (p DistributedVirtualPortgroup) EthernetCardBackingInfo(ctx context.Context) (types.BaseVirtualDeviceBackingInfo, error) {
 	var dvp mo.DistributedVirtualPortgroup
 	var dvs mo.DistributedVirtualSwitch
+	prop := "config.distributedVirtualSwitch"
 
-	if err := p.Properties(ctx, p.Reference(), []string{"key", "config.distributedVirtualSwitch"}, &dvp); err != nil {
+	if err := p.Properties(ctx, p.Reference(), []string{"key", prop}, &dvp); err != nil {
 		return nil, err
 	}
 
+	// "This property should always be set unless the user's setting does not have System.Read privilege on the object referred to by this property."
+	if dvp.Config.DistributedVirtualSwitch == nil {
+		return nil, fmt.Errorf("no System.Read privilege on: %s.%s", p.Reference(), prop)
+	}
+
 	if err := p.Properties(ctx, *dvp.Config.DistributedVirtualSwitch, []string{"uuid"}, &dvs); err != nil {
 		return nil, err
 	}
diff --git a/vendor/github.com/vmware/govmomi/object/file_manager.go b/vendor/github.com/vmware/govmomi/object/file_manager.go
index ba947be20d..8e8f5d3b0c 100644
--- a/vendor/github.com/vmware/govmomi/object/file_manager.go
+++ b/vendor/github.com/vmware/govmomi/object/file_manager.go
@@ -85,8 +85,8 @@ func (f FileManager) DeleteDatastoreFile(ctx context.Context, name string, dc *D
 // MakeDirectory creates a folder using the specified name.
 func (f FileManager) MakeDirectory(ctx context.Context, name string, dc *Datacenter, createParentDirectories bool) error {
 	req := types.MakeDirectory{
-		This: f.Reference(),
-		Name: name,
+		This:                    f.Reference(),
+		Name:                    name,
 		CreateParentDirectories: types.NewBool(createParentDirectories),
 	}
 
diff --git a/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go b/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go
index 2875a9fc1a..ddf1d8c592 100644
--- a/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go
+++ b/vendor/github.com/vmware/govmomi/object/host_certificate_manager.go
@@ -66,7 +66,7 @@ func (m HostCertificateManager) CertificateInfo(ctx context.Context) (*HostCerti
 // Use InstallServerCertificate to import this certificate.
 func (m HostCertificateManager) GenerateCertificateSigningRequest(ctx context.Context, useIPAddressAsCommonName bool) (string, error) {
 	req := types.GenerateCertificateSigningRequest{
-		This: m.Reference(),
+		This:                     m.Reference(),
 		UseIpAddressAsCommonName: useIPAddressAsCommonName,
 	}
 
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_device_list.go b/vendor/github.com/vmware/govmomi/object/virtual_device_list.go
index 6fe0835615..e1c35eff88 100644
--- a/vendor/github.com/vmware/govmomi/object/virtual_device_list.go
+++ b/vendor/github.com/vmware/govmomi/object/virtual_device_list.go
@@ -61,7 +61,10 @@ func EthernetCardTypes() VirtualDeviceList {
 	return VirtualDeviceList([]types.BaseVirtualDevice{
 		&types.VirtualE1000{},
 		&types.VirtualE1000e{},
+		&types.VirtualVmxnet2{},
 		&types.VirtualVmxnet3{},
+		&types.VirtualPCNet32{},
+		&types.VirtualSriovEthernetCard{},
 	}).Select(func(device types.BaseVirtualDevice) bool {
 		c := device.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
 		c.GetVirtualDevice().Key = -1
@@ -834,7 +837,7 @@ func (l VirtualDeviceList) TypeName(device types.BaseVirtualDevice) string {
 	return dtype.Elem().Name()
 }
 
-var deviceNameRegexp = regexp.MustCompile(`(?:Virtual)?(?:Machine)?(\w+?)(?:Card|Device|Controller)?$`)
+var deviceNameRegexp = regexp.MustCompile(`(?:Virtual)?(?:Machine)?(\w+?)(?:Card|EthernetCard|Device|Controller)?$`)
 
 func (l VirtualDeviceList) deviceName(device types.BaseVirtualDevice) string {
 	name := "device"
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go b/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
index 7bea49d51e..72439caf9c 100644
--- a/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
+++ b/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
@@ -209,3 +209,19 @@ func (m VirtualDiskManager) QueryVirtualDiskUuid(ctx context.Context, name strin
 
 	return res.Returnval, nil
 }
+
+func (m VirtualDiskManager) SetVirtualDiskUuid(ctx context.Context, name string, dc *Datacenter, uuid string) error {
+	req := types.SetVirtualDiskUuid{
+		This: m.Reference(),
+		Name: name,
+		Uuid: uuid,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	_, err := methods.SetVirtualDiskUuid(ctx, m.c, &req)
+	return err
+}
diff --git a/vendor/github.com/vmware/govmomi/object/virtual_machine.go b/vendor/github.com/vmware/govmomi/object/virtual_machine.go
index 511f557235..3cd1b40b65 100644
--- a/vendor/github.com/vmware/govmomi/object/virtual_machine.go
+++ b/vendor/github.com/vmware/govmomi/object/virtual_machine.go
@@ -799,3 +799,16 @@ func (v VirtualMachine) UpgradeVM(ctx context.Context, version string) (*Task, e
 
 	return NewTask(v.c, res.Returnval), nil
 }
+
+// UUID is a helper to get the UUID of the VirtualMachine managed object.
+// This method returns an empty string if an error occurs when retrieving UUID from the VirtualMachine object.
+func (v VirtualMachine) UUID(ctx context.Context) string {
+	var o mo.VirtualMachine
+
+	err := v.Properties(ctx, v.Reference(), []string{"config.uuid"}, &o)
+	if err != nil {
+		return ""
+	}
+
+	return o.Config.Uuid
+}
diff --git a/vendor/github.com/vmware/govmomi/ovf/env.go b/vendor/github.com/vmware/govmomi/ovf/env.go
index 5a5fc2f622..584564ab77 100644
--- a/vendor/github.com/vmware/govmomi/ovf/env.go
+++ b/vendor/github.com/vmware/govmomi/ovf/env.go
@@ -18,8 +18,9 @@ package ovf
 
 import (
 	"bytes"
-	"encoding/xml"
 	"fmt"
+
+	"github.com/vmware/govmomi/vim25/xml"
 )
 
 const (
diff --git a/vendor/github.com/vmware/govmomi/ovf/ovf.go b/vendor/github.com/vmware/govmomi/ovf/ovf.go
index eea02d6770..bd279e757d 100644
--- a/vendor/github.com/vmware/govmomi/ovf/ovf.go
+++ b/vendor/github.com/vmware/govmomi/ovf/ovf.go
@@ -17,8 +17,9 @@ limitations under the License.
 package ovf
 
 import (
-	"encoding/xml"
 	"io"
+
+	"github.com/vmware/govmomi/vim25/xml"
 )
 
 func Unmarshal(r io.Reader) (*Envelope, error) {
diff --git a/vendor/github.com/vmware/govmomi/pbm/client.go b/vendor/github.com/vmware/govmomi/pbm/client.go
index a0f07fc9e2..b52563e889 100644
--- a/vendor/github.com/vmware/govmomi/pbm/client.go
+++ b/vendor/github.com/vmware/govmomi/pbm/client.go
@@ -27,6 +27,18 @@ import (
 	vim "github.com/vmware/govmomi/vim25/types"
 )
 
+const (
+	Namespace = "pbm"
+	Path      = "/pbm" + vim25.Path
+)
+
+var (
+	ServiceInstance = vim.ManagedObjectReference{
+		Type:  "PbmServiceInstance",
+		Value: "ServiceInstance",
+	}
+)
+
 type Client struct {
 	*soap.Client
 
@@ -34,13 +46,10 @@ type Client struct {
 }
 
 func NewClient(ctx context.Context, c *vim25.Client) (*Client, error) {
-	sc := c.Client.NewServiceClient("/pbm/sdk", "urn:pbm")
+	sc := c.Client.NewServiceClient(Path, Namespace)
 
 	req := types.PbmRetrieveServiceContent{
-		This: vim.ManagedObjectReference{
-			Type:  "PbmServiceInstance",
-			Value: "ServiceInstance",
-		},
+		This: ServiceInstance,
 	}
 
 	res, err := methods.PbmRetrieveServiceContent(ctx, sc, &req)
diff --git a/vendor/github.com/vmware/govmomi/pbm/methods/methods.go b/vendor/github.com/vmware/govmomi/pbm/methods/methods.go
index 08ee48e990..1776773061 100644
--- a/vendor/github.com/vmware/govmomi/pbm/methods/methods.go
+++ b/vendor/github.com/vmware/govmomi/pbm/methods/methods.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/github.com/vmware/govmomi/pbm/types/enum.go b/vendor/github.com/vmware/govmomi/pbm/types/enum.go
index 7cee751417..ddd1a5f786 100644
--- a/vendor/github.com/vmware/govmomi/pbm/types/enum.go
+++ b/vendor/github.com/vmware/govmomi/pbm/types/enum.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -152,6 +152,20 @@ func init() {
 	types.Add("pbm:PbmObjectType", reflect.TypeOf((*PbmObjectType)(nil)).Elem())
 }
 
+type PbmOperation string
+
+const (
+	PbmOperationCREATE      = PbmOperation("CREATE")
+	PbmOperationREGISTER    = PbmOperation("REGISTER")
+	PbmOperationRECONFIGURE = PbmOperation("RECONFIGURE")
+	PbmOperationMIGRATE     = PbmOperation("MIGRATE")
+	PbmOperationCLONE       = PbmOperation("CLONE")
+)
+
+func init() {
+	types.Add("pbm:PbmOperation", reflect.TypeOf((*PbmOperation)(nil)).Elem())
+}
+
 type PbmProfileCategoryEnum string
 
 const (
@@ -179,6 +193,7 @@ type PbmSystemCreatedProfileType string
 const (
 	PbmSystemCreatedProfileTypeVsanDefaultProfile = PbmSystemCreatedProfileType("VsanDefaultProfile")
 	PbmSystemCreatedProfileTypeVVolDefaultProfile = PbmSystemCreatedProfileType("VVolDefaultProfile")
+	PbmSystemCreatedProfileTypePmemDefaultProfile = PbmSystemCreatedProfileType("PmemDefaultProfile")
 )
 
 func init() {
diff --git a/vendor/github.com/vmware/govmomi/pbm/types/if.go b/vendor/github.com/vmware/govmomi/pbm/types/if.go
index 2a3ac5acc0..832df5e1d5 100644
--- a/vendor/github.com/vmware/govmomi/pbm/types/if.go
+++ b/vendor/github.com/vmware/govmomi/pbm/types/if.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vendor/github.com/vmware/govmomi/pbm/types/types.go b/vendor/github.com/vmware/govmomi/pbm/types/types.go
index 47bd73c17b..015482d085 100644
--- a/vendor/github.com/vmware/govmomi/pbm/types/types.go
+++ b/vendor/github.com/vmware/govmomi/pbm/types/types.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -269,6 +269,12 @@ func init() {
 	types.Add("pbm:PbmAlreadyExists", reflect.TypeOf((*PbmAlreadyExists)(nil)).Elem())
 }
 
+type PbmAlreadyExistsFault PbmAlreadyExists
+
+func init() {
+	types.Add("pbm:PbmAlreadyExistsFault", reflect.TypeOf((*PbmAlreadyExistsFault)(nil)).Elem())
+}
+
 type PbmAssignDefaultRequirementProfile PbmAssignDefaultRequirementProfileRequestType
 
 func init() {
@@ -1710,3 +1716,9 @@ type PbmVaioDataServiceInfo struct {
 func init() {
 	types.Add("pbm:PbmVaioDataServiceInfo", reflect.TypeOf((*PbmVaioDataServiceInfo)(nil)).Elem())
 }
+
+type VersionURI string
+
+func init() {
+	types.Add("pbm:versionURI", reflect.TypeOf((*VersionURI)(nil)).Elem())
+}
diff --git a/vendor/github.com/vmware/govmomi/performance/manager.go b/vendor/github.com/vmware/govmomi/performance/manager.go
index 736c9e1975..eabd0f417b 100644
--- a/vendor/github.com/vmware/govmomi/performance/manager.go
+++ b/vendor/github.com/vmware/govmomi/performance/manager.go
@@ -43,11 +43,6 @@ type Manager struct {
 		*mo.PerformanceManager
 	}
 
-	providerSummary struct {
-		sync.Mutex
-		m map[string]*types.PerfProviderSummary
-	}
-
 	infoByName struct {
 		sync.Mutex
 		m map[string]*types.PerfCounterInfo
@@ -174,18 +169,6 @@ func (m *Manager) CounterInfoByKey(ctx context.Context) (map[int32]*types.PerfCo
 
 // ProviderSummary wraps the QueryPerfProviderSummary method, caching the value based on entity.Type.
 func (m *Manager) ProviderSummary(ctx context.Context, entity types.ManagedObjectReference) (*types.PerfProviderSummary, error) {
-	m.providerSummary.Lock()
-	defer m.providerSummary.Unlock()
-
-	if m.providerSummary.m == nil {
-		m.providerSummary.m = make(map[string]*types.PerfProviderSummary)
-	}
-
-	s, ok := m.providerSummary.m[entity.Type]
-	if ok {
-		return s, nil
-	}
-
 	req := types.QueryPerfProviderSummary{
 		This:   m.Reference(),
 		Entity: entity,
@@ -196,11 +179,7 @@ func (m *Manager) ProviderSummary(ctx context.Context, entity types.ManagedObjec
 		return nil, err
 	}
 
-	s = &res.Returnval
-
-	m.providerSummary.m[entity.Type] = s
-
-	return s, nil
+	return &res.Returnval, nil
 }
 
 type groupPerfCounterInfo struct {
diff --git a/vendor/github.com/vmware/govmomi/property/collector.go b/vendor/github.com/vmware/govmomi/property/collector.go
index ccf712cf9d..80e5dfbe3f 100644
--- a/vendor/github.com/vmware/govmomi/property/collector.go
+++ b/vendor/github.com/vmware/govmomi/property/collector.go
@@ -111,6 +111,12 @@ func (p *Collector) WaitForUpdates(ctx context.Context, v string) (*types.Update
 	return res.Returnval, nil
 }
 
+func (p *Collector) CancelWaitForUpdates(ctx context.Context) error {
+	req := &types.CancelWaitForUpdates{This: p.Reference()}
+	_, err := methods.CancelWaitForUpdates(ctx, p.roundTripper, req)
+	return err
+}
+
 func (p *Collector) RetrieveProperties(ctx context.Context, req types.RetrieveProperties) (*types.RetrievePropertiesResponse, error) {
 	req.This = p.Reference()
 	return methods.RetrieveProperties(ctx, p.roundTripper, &req)
diff --git a/vendor/github.com/vmware/govmomi/property/filter.go b/vendor/github.com/vmware/govmomi/property/filter.go
index 8284b0c7d8..a4bf16d055 100644
--- a/vendor/github.com/vmware/govmomi/property/filter.go
+++ b/vendor/github.com/vmware/govmomi/property/filter.go
@@ -122,7 +122,7 @@ func (f Filter) MatchPropertyList(props []types.DynamicProperty) bool {
 		}
 	}
 
-	return true
+	return len(f) == len(props) // false if a property such as VM "guest" is unset
 }
 
 // MatchObjectContent returns a list of ObjectContent.Obj where the ObjectContent.PropSet matches the Filter.
diff --git a/vendor/github.com/vmware/govmomi/property/wait.go b/vendor/github.com/vmware/govmomi/property/wait.go
index fe847926ce..f730525ca7 100644
--- a/vendor/github.com/vmware/govmomi/property/wait.go
+++ b/vendor/github.com/vmware/govmomi/property/wait.go
@@ -19,12 +19,14 @@ package property
 import (
 	"context"
 
+	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/types"
 )
 
 // WaitFilter provides helpers to construct a types.CreateFilter for use with property.Wait
 type WaitFilter struct {
 	types.CreateFilter
+	Options *types.WaitOptions
 }
 
 // Add a new ObjectSpec and PropertySpec to the WaitFilter
@@ -75,6 +77,7 @@ func Wait(ctx context.Context, c *Collector, obj types.ManagedObjectReference, p
 // creates a new property collector and calls CreateFilter. A new property
 // collector is required because filters can only be added, not removed.
 //
+// If the Context is canceled, a call to CancelWaitForUpdates() is made and its error value is returned.
 // The newly created collector is destroyed before this function returns (both
 // in case of success or error).
 //
@@ -85,7 +88,7 @@ func WaitForUpdates(ctx context.Context, c *Collector, filter *WaitFilter, f fun
 	}
 
 	// Attempt to destroy the collector using the background context, as the
-	// specified context may have timed out or have been cancelled.
+	// specified context may have timed out or have been canceled.
 	defer p.Destroy(context.Background())
 
 	err = p.CreateFilter(ctx, filter.CreateFilter)
@@ -93,20 +96,33 @@ func WaitForUpdates(ctx context.Context, c *Collector, filter *WaitFilter, f fun
 		return err
 	}
 
-	for version := ""; ; {
-		res, err := p.WaitForUpdates(ctx, version)
+	req := types.WaitForUpdatesEx{
+		This:    p.Reference(),
+		Options: filter.Options,
+	}
+
+	for {
+		res, err := methods.WaitForUpdatesEx(ctx, p.roundTripper, &req)
 		if err != nil {
+			if ctx.Err() == context.Canceled {
+				werr := p.CancelWaitForUpdates(context.Background())
+				return werr
+			}
 			return err
 		}
 
-		// Retry if the result came back empty
-		if res == nil {
+		set := res.Returnval
+		if set == nil {
+			if req.Options != nil && req.Options.MaxWaitSeconds != nil {
+				return nil // WaitOptions.MaxWaitSeconds exceeded
+			}
+			// Retry if the result came back empty
 			continue
 		}
 
-		version = res.Version
+		req.Version = set.Version
 
-		for _, fs := range res.FilterSet {
+		for _, fs := range set.FilterSet {
 			if f(fs.ObjectSet) {
 				return nil
 			}
diff --git a/vendor/github.com/vmware/govmomi/session/manager.go b/vendor/github.com/vmware/govmomi/session/manager.go
index 3cbfa93841..ad3219716a 100644
--- a/vendor/github.com/vmware/govmomi/session/manager.go
+++ b/vendor/github.com/vmware/govmomi/session/manager.go
@@ -18,6 +18,7 @@ package session
 
 import (
 	"context"
+	"net/http"
 	"net/url"
 	"os"
 
@@ -89,14 +90,51 @@ func (sm *Manager) Login(ctx context.Context, u *url.Userinfo) error {
 	return nil
 }
 
-func (sm *Manager) LoginExtensionByCertificate(ctx context.Context, key string, locale string) error {
+// LoginExtensionByCertificate uses the vCenter SDK tunnel to login using a client certificate.
+// The client certificate can be set using the soap.Client.SetCertificate method.
+// See: https://kb.vmware.com/s/article/2004305
+func (sm *Manager) LoginExtensionByCertificate(ctx context.Context, key string) error {
+	c := sm.client
+	u := c.URL()
+	if u.Hostname() != "sdkTunnel" {
+		sc := c.Tunnel()
+		c = &vim25.Client{
+			Client:         sc,
+			RoundTripper:   sc,
+			ServiceContent: c.ServiceContent,
+		}
+		// When http.Transport.Proxy is used, our thumbprint checker is bypassed, resulting in:
+		// "Post https://sdkTunnel:8089/sdk: x509: certificate is valid for $vcenter_hostname, not sdkTunnel"
+		// The only easy way around this is to disable verification for the call to LoginExtensionByCertificate().
+		// TODO: find a way to avoid disabling InsecureSkipVerify.
+		c.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify = true
+	}
+
 	req := types.LoginExtensionByCertificate{
 		This:         sm.Reference(),
 		ExtensionKey: key,
-		Locale:       locale,
+		Locale:       Locale,
+	}
+
+	login, err := methods.LoginExtensionByCertificate(ctx, c, &req)
+	if err != nil {
+		return err
+	}
+
+	// Copy the session cookie
+	sm.client.Jar.SetCookies(u, c.Jar.Cookies(c.URL()))
+
+	sm.userSession = &login.Returnval
+	return nil
+}
+
+func (sm *Manager) LoginByToken(ctx context.Context) error {
+	req := types.LoginByToken{
+		This:   sm.Reference(),
+		Locale: Locale,
 	}
 
-	login, err := methods.LoginExtensionByCertificate(ctx, sm.client, &req)
+	login, err := methods.LoginByToken(ctx, sm.client, &req)
 	if err != nil {
 		return err
 	}
diff --git a/vendor/github.com/vmware/govmomi/simulator/dvs.go b/vendor/github.com/vmware/govmomi/simulator/dvs.go
index 8c9b6d63a8..474d7b8f89 100644
--- a/vendor/github.com/vmware/govmomi/simulator/dvs.go
+++ b/vendor/github.com/vmware/govmomi/simulator/dvs.go
@@ -106,17 +106,18 @@ func (s *DistributedVirtualSwitch) ReconfigureDvsTask(req *types.ReconfigureDvs_
 
 			switch types.ConfigSpecOperation(member.Operation) {
 			case types.ConfigSpecOperationAdd:
-				if FindReference(host.Network, s.Self) != nil {
+				if FindReference(s.Summary.HostMember, member.Host) != nil {
 					return nil, &types.AlreadyExists{Name: host.Name}
 				}
 
-				Map.AppendReference(host, &host.Network, s.Self)
 				Map.AppendReference(host, &host.Network, s.Portgroup...)
 				s.Summary.HostMember = append(s.Summary.HostMember, member.Host)
+				parent := hostParent(&host.HostSystem)
 
 				for _, ref := range s.Portgroup {
 					pg := Map.Get(ref).(*DistributedVirtualPortgroup)
 					Map.AddReference(pg, &pg.Host, member.Host)
+					Map.AddReference(parent, &parent.Network, ref)
 				}
 			case types.ConfigSpecOperationRemove:
 				for _, ref := range host.Vm {
@@ -129,8 +130,7 @@ func (s *DistributedVirtualSwitch) ReconfigureDvsTask(req *types.ReconfigureDvs_
 					}
 				}
 
-				Map.RemoveReference(host, &host.Network, s.Self)
-				RemoveReference(&s.Summary.HostMember, s.Self)
+				RemoveReference(&s.Summary.HostMember, member.Host)
 			case types.ConfigSpecOperationEdit:
 				return nil, &types.NotSupported{}
 			}
diff --git a/vendor/github.com/vmware/govmomi/simulator/esx/event_manager.go b/vendor/github.com/vmware/govmomi/simulator/esx/event_manager.go
index 81995c4d00..bacd83b150 100644
--- a/vendor/github.com/vmware/govmomi/simulator/esx/event_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/esx/event_manager.go
@@ -161,6 +161,12 @@ var EventInfo = []types.EventDescriptionEventDetail{
 		Category:    "info",
 		FullFormat:  "{{.Vm.Name}} on host {{.Host.Name}} in {{.Datacenter.Name}} is starting",
 	},
+	{
+		Key:         "VmStoppingEvent",
+		Description: "VM stopping",
+		Category:    "info",
+		FullFormat:  "{{.Vm.Name}} on host {{.Host.Name}} in {{.Datacenter.Name}} is stopping",
+	},
 	{
 		Key:         "VmSuspendingEvent",
 		Description: "VM being suspended",
diff --git a/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go b/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go
index 3c8295a6c4..a55e87162b 100644
--- a/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go
+++ b/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go
@@ -355,7 +355,7 @@ var HostConfigInfo = types.HostConfigInfo{
 						SubnetMask: "255.0.0.0",
 						IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 					},
-					Mac: "00:0c:29:81:d8:a0",
+					Mac:                    "00:0c:29:81:d8:a0",
 					DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 					Portgroup:              "Management Network",
 					Mtu:                    1500,
@@ -489,7 +489,7 @@ var HostConfigInfo = types.HostConfigInfo{
 							SubnetMask: "255.0.0.0",
 							IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 						},
-						Mac: "00:0c:29:81:d8:a0",
+						Mac:                    "00:0c:29:81:d8:a0",
 						DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 						Portgroup:              "Management Network",
 						Mtu:                    1500,
@@ -524,7 +524,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -555,7 +555,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -586,7 +586,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -617,7 +617,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -648,7 +648,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -679,7 +679,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -710,7 +710,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
@@ -741,7 +741,7 @@ var HostConfigInfo = types.HostConfigInfo{
 								SubnetMask: "255.0.0.0",
 								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
 							},
-							Mac: "00:0c:29:81:d8:a0",
+							Mac:                    "00:0c:29:81:d8:a0",
 							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
 							Portgroup:              "Management Network",
 							Mtu:                    1500,
diff --git a/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go b/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go
index 13aa8b17a3..445ac815b2 100644
--- a/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go
+++ b/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go
@@ -1730,7 +1730,7 @@ var HostSystem = mo.HostSystem{
 			OverallMemoryUsage:        1404,
 			DistributedCpuFairness:    0,
 			DistributedMemoryFairness: 0,
-			Uptime: 77229,
+			Uptime:                    77229,
 		},
 		OverallStatus:      "gray",
 		RebootRequired:     false,
diff --git a/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go b/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go
index 584e3cad37..532f0ad5b9 100644
--- a/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go
@@ -9883,3 +9883,5175 @@ var PerfCounter = []types.PerfCounterInfo{
 		AssociatedCounterId: nil,
 	},
 }
+
+// *********************************** VM Metrics ************************************
+var VmMetrics = []types.PerfMetricId{
+	{
+		CounterId: 11,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 1,
+		Instance:  "",
+	},
+	{
+		CounterId: 12,
+		Instance:  "",
+	},
+	{
+		CounterId: 9,
+		Instance:  "",
+	},
+	{
+		CounterId: 29,
+		Instance:  "",
+	},
+	{
+		CounterId: 30,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 24,
+		Instance:  "",
+	},
+	{
+		CounterId: 13,
+		Instance:  "",
+	},
+	{
+		CounterId: 10,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 14,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 27,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 25,
+		Instance:  "",
+	},
+	{
+		CounterId: 5,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 32,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 14,
+		Instance:  "",
+	},
+	{
+		CounterId: 12,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 10,
+		Instance:  "",
+	},
+	{
+		CounterId: 28,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 5,
+		Instance:  "",
+	},
+	{
+		CounterId: 27,
+		Instance:  "",
+	},
+	{
+		CounterId: 31,
+		Instance:  "",
+	},
+	{
+		CounterId: 32,
+		Instance:  "",
+	},
+	{
+		CounterId: 26,
+		Instance:  "",
+	},
+	{
+		CounterId: 13,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 28,
+		Instance:  "",
+	},
+	{
+		CounterId: 30,
+		Instance:  "",
+	},
+	{
+		CounterId: 11,
+		Instance:  "",
+	},
+	{
+		CounterId: 655379,
+		Instance:  "",
+	},
+
+	{
+		CounterId: 655362,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655363,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655360,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655364,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655361,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655365,
+		Instance:  "$physDisk",
+	},
+
+	{
+		CounterId: 131095,
+		Instance:  "",
+	},
+	{
+		CounterId: 65549,
+		Instance:  "",
+	},
+	{
+		CounterId: 65595,
+		Instance:  "",
+	},
+	{
+		CounterId: 65632,
+		Instance:  "",
+	},
+	{
+		CounterId: 65591,
+		Instance:  "",
+	},
+	{
+		CounterId: 65623,
+		Instance:  "",
+	},
+	{
+		CounterId: 65628,
+		Instance:  "",
+	},
+	{
+		CounterId: 65621,
+		Instance:  "",
+	},
+	{
+		CounterId: 65618,
+		Instance:  "",
+	},
+	{
+		CounterId: 65634,
+		Instance:  "",
+	},
+	{
+		CounterId: 65624,
+		Instance:  "",
+	},
+	{
+		CounterId: 65586,
+		Instance:  "",
+	},
+	{
+		CounterId: 65545,
+		Instance:  "",
+	},
+	{
+		CounterId: 65633,
+		Instance:  "",
+	},
+	{
+		CounterId: 65607,
+		Instance:  "",
+	},
+	{
+		CounterId: 65541,
+		Instance:  "",
+	},
+	{
+		CounterId: 65626,
+		Instance:  "",
+	},
+	{
+		CounterId: 65620,
+		Instance:  "",
+	},
+	{
+		CounterId: 65611,
+		Instance:  "",
+	},
+	{
+		CounterId: 65629,
+		Instance:  "",
+	},
+	{
+		CounterId: 65622,
+		Instance:  "",
+	},
+	{
+		CounterId: 65619,
+		Instance:  "",
+	},
+	{
+		CounterId: 65553,
+		Instance:  "",
+	},
+	{
+		CounterId: 65627,
+		Instance:  "",
+	},
+	{
+		CounterId: 65635,
+		Instance:  "",
+	},
+	{
+		CounterId: 65599,
+		Instance:  "",
+	},
+	{
+		CounterId: 65582,
+		Instance:  "",
+	},
+	{
+		CounterId: 65537,
+		Instance:  "",
+	},
+	{
+		CounterId: 65603,
+		Instance:  "",
+	},
+	{
+		CounterId: 196622,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196612,
+		Instance:  "",
+	},
+	{
+		CounterId: 196617,
+		Instance:  "",
+	},
+	{
+		CounterId: 196613,
+		Instance:  "",
+	},
+	{
+		CounterId: 196619,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196618,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196617,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196621,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196616,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196615,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196614,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196618,
+		Instance:  "",
+	},
+	{
+		CounterId: 196609,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196619,
+		Instance:  "",
+	},
+	{
+		CounterId: 196622,
+		Instance:  "",
+	},
+	{
+		CounterId: 196628,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196609,
+		Instance:  "",
+	},
+	{
+		CounterId: 196612,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196628,
+		Instance:  "",
+	},
+	{
+		CounterId: 196627,
+		Instance:  "",
+	},
+	{
+		CounterId: 196616,
+		Instance:  "",
+	},
+	{
+		CounterId: 196613,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196627,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196614,
+		Instance:  "",
+	},
+	{
+		CounterId: 196621,
+		Instance:  "",
+	},
+	{
+		CounterId: 196620,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 196620,
+		Instance:  "",
+	},
+	{
+		CounterId: 196623,
+		Instance:  "",
+	},
+	{
+		CounterId: 196615,
+		Instance:  "",
+	},
+	{
+		CounterId: 196623,
+		Instance:  "4000",
+	},
+	{
+		CounterId: 720898,
+		Instance:  "",
+	},
+	{
+		CounterId: 720896,
+		Instance:  "",
+	},
+	{
+		CounterId: 327684,
+		Instance:  "",
+	},
+	{
+		CounterId: 327687,
+		Instance:  "",
+	},
+	{
+		CounterId: 327693,
+		Instance:  "",
+	},
+	{
+		CounterId: 327680,
+		Instance:  "",
+	},
+	{
+		CounterId: 327685,
+		Instance:  "",
+	},
+	{
+		CounterId: 327694,
+		Instance:  "",
+	},
+	{
+		CounterId: 327686,
+		Instance:  "",
+	},
+	{
+		CounterId: 327692,
+		Instance:  "",
+	},
+	{
+		CounterId: 327688,
+		Instance:  "",
+	},
+	{
+		CounterId: 327695,
+		Instance:  "",
+	},
+	{
+		CounterId: 327689,
+		Instance:  "",
+	},
+	{
+		CounterId: 327681,
+		Instance:  "",
+	},
+	{
+		CounterId: 327696,
+		Instance:  "",
+	},
+	{
+		CounterId: 327683,
+		Instance:  "",
+	},
+	{
+		CounterId: 327691,
+		Instance:  "",
+	},
+	{
+		CounterId: 327690,
+		Instance:  "",
+	},
+	{
+		CounterId: 327682,
+		Instance:  "",
+	},
+	{
+		CounterId: 262144,
+		Instance:  "",
+	},
+	{
+		CounterId: 262145,
+		Instance:  "",
+	},
+	{
+		CounterId: 262170,
+		Instance:  "",
+	},
+	{
+		CounterId: 589827,
+		Instance:  "",
+	},
+	{
+		CounterId: 589826,
+		Instance:  "",
+	},
+}
+
+// **************************** Host metrics *********************************
+
+var HostMetrics = []types.PerfMetricId{
+	{
+		CounterId: 23,
+		Instance:  "",
+	},
+	{
+		CounterId: 14,
+		Instance:  "",
+	},
+	{
+		CounterId: 1,
+		Instance:  "",
+	},
+	{
+		CounterId: 11,
+		Instance:  "",
+	},
+	{
+		CounterId: 20,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 13,
+		Instance:  "",
+	},
+	{
+		CounterId: 5,
+		Instance:  "",
+	},
+	{
+		CounterId: 32,
+		Instance:  "",
+	},
+	{
+		CounterId: 26,
+		Instance:  "",
+	},
+	{
+		CounterId: 24,
+		Instance:  "",
+	},
+	{
+		CounterId: 16,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 27,
+		Instance:  "",
+	},
+	{
+		CounterId: 16,
+		Instance:  "",
+	},
+
+	{
+		CounterId: 10,
+		Instance:  "",
+	},
+	{
+		CounterId: 12,
+		Instance:  "",
+	},
+	{
+		CounterId: 1,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 12,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 13,
+		Instance:  "$cpu",
+	},
+	{
+		CounterId: 8,
+		Instance:  "",
+	},
+	{
+		CounterId: 655380,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655370,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655377,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655379,
+		Instance:  "",
+	},
+	{
+		CounterId: 655375,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655378,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655372,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655369,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655373,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655362,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655374,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655368,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655365,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655366,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655367,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655371,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655361,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655376,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655363,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655360,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 655381,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131073,
+		Instance:  "",
+	},
+	{
+		CounterId: 131090,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131079,
+		Instance:  "",
+	},
+	{
+		CounterId: 131086,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131098,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131081,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131082,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131090,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131081,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131086,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131088,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131098,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131078,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131079,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131099,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131087,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131089,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131078,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131096,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131091,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131080,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131078,
+		Instance:  "",
+	},
+	{
+		CounterId: 131076,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131092,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131080,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131095,
+		Instance:  "",
+	},
+	{
+		CounterId: 131097,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131093,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131092,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131084,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131099,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131079,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131085,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131083,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131076,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131096,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131094,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131088,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131089,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131077,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131077,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131093,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131087,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131085,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131091,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131097,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131082,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131094,
+		Instance:  "mpx.vmhba32:C0:T0:L0",
+	},
+	{
+		CounterId: 131084,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 131083,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 786433,
+		Instance:  "",
+	},
+	{
+		CounterId: 786434,
+		Instance:  "",
+	},
+	{
+		CounterId: 786432,
+		Instance:  "",
+	},
+	{
+		CounterId: 65573,
+		Instance:  "",
+	},
+	{
+		CounterId: 65618,
+		Instance:  "",
+	},
+	{
+		CounterId: 65632,
+		Instance:  "",
+	},
+	{
+		CounterId: 65623,
+		Instance:  "",
+	},
+	{
+		CounterId: 65582,
+		Instance:  "",
+	},
+	{
+		CounterId: 65611,
+		Instance:  "",
+	},
+	{
+		CounterId: 65541,
+		Instance:  "",
+	},
+	{
+		CounterId: 65586,
+		Instance:  "",
+	},
+	{
+		CounterId: 65621,
+		Instance:  "",
+	},
+	{
+		CounterId: 65561,
+		Instance:  "",
+	},
+	{
+		CounterId: 65569,
+		Instance:  "",
+	},
+	{
+		CounterId: 65580,
+		Instance:  "",
+	},
+	{
+		CounterId: 65553,
+		Instance:  "",
+	},
+	{
+		CounterId: 65646,
+		Instance:  "",
+	},
+	{
+		CounterId: 65603,
+		Instance:  "",
+	},
+	{
+		CounterId: 65647,
+		Instance:  "",
+	},
+	{
+		CounterId: 65628,
+		Instance:  "",
+	},
+	{
+		CounterId: 65557,
+		Instance:  "",
+	},
+	{
+		CounterId: 65635,
+		Instance:  "",
+	},
+	{
+		CounterId: 65589,
+		Instance:  "",
+	},
+	{
+		CounterId: 65643,
+		Instance:  "",
+	},
+	{
+		CounterId: 65545,
+		Instance:  "",
+	},
+	{
+		CounterId: 65537,
+		Instance:  "",
+	},
+	{
+		CounterId: 65622,
+		Instance:  "",
+	},
+	{
+		CounterId: 65639,
+		Instance:  "",
+	},
+	{
+		CounterId: 65599,
+		Instance:  "",
+	},
+	{
+		CounterId: 65633,
+		Instance:  "",
+	},
+	{
+		CounterId: 65650,
+		Instance:  "",
+	},
+	{
+		CounterId: 65649,
+		Instance:  "",
+	},
+	{
+		CounterId: 65615,
+		Instance:  "",
+	},
+	{
+		CounterId: 65577,
+		Instance:  "",
+	},
+	{
+		CounterId: 65648,
+		Instance:  "",
+	},
+	{
+		CounterId: 65619,
+		Instance:  "",
+	},
+	{
+		CounterId: 65630,
+		Instance:  "",
+	},
+	{
+		CounterId: 65651,
+		Instance:  "",
+	},
+	{
+		CounterId: 65620,
+		Instance:  "",
+	},
+	{
+		CounterId: 65625,
+		Instance:  "",
+	},
+	{
+		CounterId: 65549,
+		Instance:  "",
+	},
+	{
+		CounterId: 196616,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196612,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196621,
+		Instance:  "",
+	},
+	{
+		CounterId: 196618,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196609,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196622,
+		Instance:  "",
+	},
+	{
+		CounterId: 196623,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196626,
+		Instance:  "",
+	},
+	{
+		CounterId: 196614,
+		Instance:  "",
+	},
+	{
+		CounterId: 196616,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196615,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196621,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196622,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196614,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196620,
+		Instance:  "",
+	},
+	{
+		CounterId: 196622,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196617,
+		Instance:  "",
+	},
+	{
+		CounterId: 196616,
+		Instance:  "",
+	},
+	{
+		CounterId: 196613,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196614,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196625,
+		Instance:  "",
+	},
+	{
+		CounterId: 196609,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196624,
+		Instance:  "",
+	},
+	{
+		CounterId: 196619,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196625,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196617,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196619,
+		Instance:  "",
+	},
+	{
+		CounterId: 196618,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196626,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196612,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196613,
+		Instance:  "",
+	},
+	{
+		CounterId: 196621,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196615,
+		Instance:  "",
+	},
+	{
+		CounterId: 196620,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196612,
+		Instance:  "",
+	},
+	{
+		CounterId: 196624,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196617,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196625,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196618,
+		Instance:  "",
+	},
+	{
+		CounterId: 196623,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196623,
+		Instance:  "",
+	},
+	{
+		CounterId: 196609,
+		Instance:  "",
+	},
+	{
+		CounterId: 196613,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196620,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196619,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196624,
+		Instance:  "vmnic0",
+	},
+	{
+		CounterId: 196615,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 196626,
+		Instance:  "vmnic1",
+	},
+	{
+		CounterId: 720898,
+		Instance:  "",
+	},
+	{
+		CounterId: 720897,
+		Instance:  "",
+	},
+	{
+		CounterId: 720896,
+		Instance:  "",
+	},
+	{
+		CounterId: 327681,
+		Instance:  "",
+	},
+	{
+		CounterId: 327694,
+		Instance:  "",
+	},
+	{
+		CounterId: 327689,
+		Instance:  "",
+	},
+	{
+		CounterId: 327696,
+		Instance:  "",
+	},
+	{
+		CounterId: 327685,
+		Instance:  "",
+	},
+	{
+		CounterId: 327680,
+		Instance:  "",
+	},
+	{
+		CounterId: 327690,
+		Instance:  "",
+	},
+	{
+		CounterId: 327693,
+		Instance:  "",
+	},
+	{
+		CounterId: 327683,
+		Instance:  "",
+	},
+	{
+		CounterId: 327688,
+		Instance:  "",
+	},
+	{
+		CounterId: 327687,
+		Instance:  "",
+	},
+	{
+		CounterId: 327684,
+		Instance:  "",
+	},
+	{
+		CounterId: 327691,
+		Instance:  "",
+	},
+	{
+		CounterId: 327682,
+		Instance:  "",
+	},
+	{
+		CounterId: 327695,
+		Instance:  "",
+	},
+	{
+		CounterId: 327686,
+		Instance:  "",
+	},
+	{
+		CounterId: 327692,
+		Instance:  "",
+	},
+	{
+		CounterId: 458755,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458755,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458756,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458757,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 458753,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458754,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458752,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458755,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 458757,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458753,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458754,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458752,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458759,
+		Instance:  "",
+	},
+	{
+		CounterId: 458758,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458753,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 458758,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458756,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458754,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 458753,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458757,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458754,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458756,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458752,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458752,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 458756,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 458755,
+		Instance:  "vmhba0",
+	},
+	{
+		CounterId: 458758,
+		Instance:  "vmhba64",
+	},
+	{
+		CounterId: 458757,
+		Instance:  "vmhba1",
+	},
+	{
+		CounterId: 458758,
+		Instance:  "vmhba32",
+	},
+	{
+		CounterId: 524290,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 524288,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 524291,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 524292,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 524295,
+		Instance:  "",
+	},
+	{
+		CounterId: 524289,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 524293,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 524294,
+		Instance:  "$physDisk",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262168,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262166,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262163,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262161,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262165,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262162,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262161,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262158,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262158,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262144,
+		Instance:  "",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262164,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262163,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262160,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262160,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/sensord",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262167,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262165,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262159,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/snmpd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262163,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/hostdstats",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vobd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/var",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vvold",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262168,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/slp",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/wsman",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vsanperfsvc",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262162,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262159,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262164,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262167,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262167,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262169,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262166,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262165,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vsfwd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262169,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262158,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262159,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262160,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262161,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262164,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262166,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262168,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262169,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vmkeventd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vimuser",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmci",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/upitd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vimuser/terminal",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/smartd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/svmotion",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262162,
+		Instance:  "host/system/vmotion",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vmkiscsid",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/sioc",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vmkdevmgr",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/dhclientrelease",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/helper",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/rabbitmqproxy",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/awk",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/dhclient",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/plugins",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/system/kernel/tmp",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/head",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/vpxa",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/sfcb_aux",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/iofilters",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/logger",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/usbArbitrator",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/ls",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vsanmgmtdWatchdog",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/pgrep",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/probe",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/iofilters/iofiltervpd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/pktcap-agent",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/system/kernel",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/tmp",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/vmfstraced",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vmkbacktrace",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/vdpi",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vimuser/terminal/ssh",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/hostdCgiServer",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/hbrca",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/init",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/uwdaemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/drivers",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/lacpd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/system/kernel/opt",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/lbt",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/aam",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/vsish",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/logging",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/hostd-probe",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/memScrubber",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/likewise",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/iofilters/vmwarevmcrypt",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/system/kernel/root",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/net-daemons",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/iofilters/spm",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vimuser/terminal/shell",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/sfcb",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/system/ft",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/osfsd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/netcpa",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/swapobjd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/hostd-probe/stats/sh",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/vvoltraced",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/system/kernel/etc",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/vim/vmvisor/dcui",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/nfcd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/upittraced",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262154,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/nfsgssd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262156,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262172,
+		Instance:  "host/system/kernel/iofilters",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/user",
+	},
+	{
+		CounterId: 262157,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/nscd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262151,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262152,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262153,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262171,
+		Instance:  "host/vim/vmvisor/boot",
+	},
+	{
+		CounterId: 262155,
+		Instance:  "host/vim/vmvisor/ntpd",
+	},
+	{
+		CounterId: 262148,
+		Instance:  "host/vim/vmvisor/pcscd",
+	},
+	{
+		CounterId: 851968,
+		Instance:  "vfc",
+	},
+}
+
+// ********************************* Resource pool metrics **********************************
+var ResourcePoolMetrics = []types.PerfMetricId{
+	{
+		CounterId: 5,
+		Instance:  "",
+	},
+	{
+		CounterId: 65586,
+		Instance:  "",
+	},
+	{
+		CounterId: 65591,
+		Instance:  "",
+	},
+	{
+		CounterId: 65545,
+		Instance:  "",
+	},
+	{
+		CounterId: 65553,
+		Instance:  "",
+	},
+	{
+		CounterId: 65541,
+		Instance:  "",
+	},
+	{
+		CounterId: 65549,
+		Instance:  "",
+	},
+	{
+		CounterId: 65582,
+		Instance:  "",
+	},
+}
diff --git a/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go b/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go
index b8cb91d8d4..90382dd326 100644
--- a/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go
+++ b/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go
@@ -60,7 +60,7 @@ var ResourcePool = mo.ResourcePool{
 				DynamicData:           types.DynamicData{},
 				Reservation:           types.NewInt64(4121),
 				ExpandableReservation: types.NewBool(false),
-				Limit: types.NewInt64(4121),
+				Limit:                 types.NewInt64(4121),
 				Shares: &types.SharesInfo{
 					DynamicData: types.DynamicData{},
 					Shares:      9000,
@@ -72,7 +72,7 @@ var ResourcePool = mo.ResourcePool{
 				DynamicData:           types.DynamicData{},
 				Reservation:           types.NewInt64(961),
 				ExpandableReservation: types.NewBool(false),
-				Limit: types.NewInt64(961),
+				Limit:                 types.NewInt64(961),
 				Shares: &types.SharesInfo{
 					DynamicData: types.DynamicData{},
 					Shares:      9000,
@@ -140,7 +140,7 @@ var ResourcePool = mo.ResourcePool{
 			DynamicData:           types.DynamicData{},
 			Reservation:           types.NewInt64(4121),
 			ExpandableReservation: types.NewBool(false),
-			Limit: types.NewInt64(4121),
+			Limit:                 types.NewInt64(4121),
 			Shares: &types.SharesInfo{
 				DynamicData: types.DynamicData{},
 				Shares:      9000,
@@ -152,7 +152,7 @@ var ResourcePool = mo.ResourcePool{
 			DynamicData:           types.DynamicData{},
 			Reservation:           types.NewInt64(961),
 			ExpandableReservation: types.NewBool(false),
-			Limit: types.NewInt64(961),
+			Limit:                 types.NewInt64(961),
 			Shares: &types.SharesInfo{
 				DynamicData: types.DynamicData{},
 				Shares:      9000,
diff --git a/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go b/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go
index 234113b453..628d7e053d 100644
--- a/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go
+++ b/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go
@@ -199,7 +199,7 @@ var VirtualDevice = []types.BaseVirtualDevice{
 			ControllerKey: 100,
 			UnitNumber:    types.NewInt32(17),
 		},
-		Id: -1,
+		Id:                             -1,
 		AllowUnrestrictedCommunication: types.NewBool(false),
 		FilterEnable:                   types.NewBool(true),
 		FilterInfo:                     (*types.VirtualMachineVMCIDeviceFilterInfo)(nil),
diff --git a/vendor/github.com/vmware/govmomi/simulator/event_manager.go b/vendor/github.com/vmware/govmomi/simulator/event_manager.go
index d68f763108..75316d617d 100644
--- a/vendor/github.com/vmware/govmomi/simulator/event_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/event_manager.go
@@ -157,15 +157,18 @@ func (m *EventManager) PostEvent(ctx *Context, req *types.PostEvent) soap.HasFau
 	event.CreatedTime = time.Now()
 	event.UserName = ctx.Session.UserName
 
-	m.page = m.page.Next()
+	m.page = m.page.Prev()
 	m.page.Value = req.EventToPost
 	m.formatMessage(req.EventToPost)
 
 	for _, c := range m.collectors {
-		if c.eventMatches(req.EventToPost) {
-			c.page = c.page.Next()
-			c.page.Value = event
-		}
+		ctx.WithLock(c, func() {
+			if c.eventMatches(req.EventToPost) {
+				c.page = c.page.Prev()
+				c.page.Value = req.EventToPost
+				Map.Update(c, []types.PropertyChange{{Name: "latestPage", Val: c.GetLatestPage()}})
+			}
+		})
 	}
 
 	return &methods.PostEventBody{
diff --git a/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go b/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go
index af8104a659..8c98de5ba2 100644
--- a/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go
@@ -30,8 +30,8 @@ import (
 )
 
 var ipPool = MustNewIpPool(&types.IpPool{
-	Id:   1,
-	Name: "ip-pool",
+	Id:                     1,
+	Name:                   "ip-pool",
 	AvailableIpv4Addresses: 250,
 	AvailableIpv6Addresses: 250,
 	AllocatedIpv6Addresses: 0,
diff --git a/vendor/github.com/vmware/govmomi/simulator/os_unix.go b/vendor/github.com/vmware/govmomi/simulator/os_unix.go
index 589ae1b57a..30ea88e921 100644
--- a/vendor/github.com/vmware/govmomi/simulator/os_unix.go
+++ b/vendor/github.com/vmware/govmomi/simulator/os_unix.go
@@ -29,12 +29,10 @@ func (ds *Datastore) stat() error {
 		return err
 	}
 
-	bsize := uint64(stat.Bsize) / 512
-
-	info.FreeSpace = int64(stat.Bfree*bsize) >> 1
+	info.FreeSpace = int64(stat.Bfree * uint64(stat.Bsize))
 
 	ds.Summary.FreeSpace = info.FreeSpace
-	ds.Summary.Capacity = int64(stat.Blocks*bsize) >> 1
+	ds.Summary.Capacity = int64(stat.Blocks * uint64(stat.Bsize))
 
 	return nil
 }
diff --git a/vendor/github.com/vmware/govmomi/simulator/performance_manager.go b/vendor/github.com/vmware/govmomi/simulator/performance_manager.go
index e6a70efc0a..994b8498c3 100644
--- a/vendor/github.com/vmware/govmomi/simulator/performance_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/performance_manager.go
@@ -17,19 +17,243 @@ limitations under the License.
 package simulator
 
 import (
+	"math/rand"
+	"strconv"
+	"time"
+
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/simulator/esx"
+	"github.com/vmware/govmomi/simulator/vpx"
+	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
 )
 
+var realtimeProviderSummary = types.PerfProviderSummary{
+	CurrentSupported: true,
+	SummarySupported: true,
+	RefreshRate:      20,
+}
+
+var historicProviderSummary = types.PerfProviderSummary{
+	CurrentSupported: false,
+	SummarySupported: true,
+	RefreshRate:      -1,
+}
+
 type PerformanceManager struct {
 	mo.PerformanceManager
+	vmMetrics         []types.PerfMetricId
+	hostMetrics       []types.PerfMetricId
+	rpMetrics         []types.PerfMetricId
+	clusterMetrics    []types.PerfMetricId
+	datastoreMetrics  []types.PerfMetricId
+	datacenterMetrics []types.PerfMetricId
+	perfCounterIndex  map[int32]types.PerfCounterInfo
+	metricData        map[string]map[int32][]int64
 }
 
 func NewPerformanceManager(ref types.ManagedObjectReference) object.Reference {
 	m := &PerformanceManager{}
 	m.Self = ref
-	m.PerfCounter = esx.PerfCounter
+	if Map.IsESX() {
+		m.PerfCounter = esx.PerfCounter[:]
+		m.hostMetrics = esx.HostMetrics[:]
+		m.vmMetrics = esx.VmMetrics[:]
+		m.rpMetrics = esx.ResourcePoolMetrics[:]
+		m.metricData = esx.MetricData
+	} else {
+		m.PerfCounter = vpx.PerfCounter[:]
+		m.hostMetrics = vpx.HostMetrics[:]
+		m.vmMetrics = vpx.VmMetrics[:]
+		m.rpMetrics = vpx.ResourcePoolMetrics[:]
+		m.clusterMetrics = vpx.ClusterMetrics[:]
+		m.datastoreMetrics = vpx.DatastoreMetrics[:]
+		m.datacenterMetrics = vpx.DatacenterMetrics[:]
+		m.metricData = vpx.MetricData
+	}
+	m.perfCounterIndex = make(map[int32]types.PerfCounterInfo, len(m.PerfCounter))
+	for _, p := range m.PerfCounter {
+		m.perfCounterIndex[p.Key] = p
+	}
 	return m
 }
+
+func (p *PerformanceManager) QueryPerfCounter(ctx *Context, req *types.QueryPerfCounter) soap.HasFault {
+	body := new(methods.QueryPerfCounterBody)
+	body.Req = req
+	body.Res.Returnval = make([]types.PerfCounterInfo, len(req.CounterId))
+	for i, id := range req.CounterId {
+		if info, ok := p.perfCounterIndex[id]; !ok {
+			body.Fault_ = Fault("", &types.InvalidArgument{
+				InvalidProperty: "CounterId",
+			})
+			return body
+		} else {
+			body.Res.Returnval[i] = info
+		}
+	}
+	return body
+}
+
+func (p *PerformanceManager) QueryPerfProviderSummary(ctx *Context, req *types.QueryPerfProviderSummary) soap.HasFault {
+	body := new(methods.QueryPerfProviderSummaryBody)
+	body.Req = req
+	body.Res = new(types.QueryPerfProviderSummaryResponse)
+
+	// The entity must exist
+	if Map.Get(req.Entity) == nil {
+		body.Fault_ = Fault("", &types.InvalidArgument{
+			InvalidProperty: "Entity",
+		})
+		return body
+	}
+
+	switch req.Entity.Type {
+	case "VirtualMachine", "HostSystem", "ResourcePool":
+		body.Res.Returnval = realtimeProviderSummary
+	default:
+		body.Res.Returnval = historicProviderSummary
+	}
+	body.Res.Returnval.Entity = req.Entity
+	return body
+}
+
+func (p *PerformanceManager) buildAvailablePerfMetricsQueryResponse(ids []types.PerfMetricId, numCPU int, datastoreURL string) *types.QueryAvailablePerfMetricResponse {
+	r := new(types.QueryAvailablePerfMetricResponse)
+	r.Returnval = make([]types.PerfMetricId, 0, len(ids))
+	for _, id := range ids {
+		switch id.Instance {
+		case "$cpu":
+			for i := 0; i < numCPU; i++ {
+				r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: strconv.Itoa(i)})
+			}
+		case "$physDisk":
+			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: datastoreURL})
+		case "$file":
+			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: "DISKFILE"})
+			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: "DELTAFILE"})
+			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: "SWAPFILE"})
+			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: "OTHERFILE"})
+		default:
+			r.Returnval = append(r.Returnval, types.PerfMetricId{CounterId: id.CounterId, Instance: id.Instance})
+		}
+	}
+	return r
+}
+
+func (p *PerformanceManager) queryAvailablePerfMetric(entity types.ManagedObjectReference, interval int32) *types.QueryAvailablePerfMetricResponse {
+	switch entity.Type {
+	case "VirtualMachine":
+		vm := Map.Get(entity).(*VirtualMachine)
+		return p.buildAvailablePerfMetricsQueryResponse(p.vmMetrics, int(vm.Summary.Config.NumCpu), vm.Datastore[0].Value)
+	case "HostSystem":
+		host := Map.Get(entity).(*HostSystem)
+		return p.buildAvailablePerfMetricsQueryResponse(p.hostMetrics, int(host.Hardware.CpuInfo.NumCpuThreads), host.Datastore[0].Value)
+	case "ResourcePool":
+		return p.buildAvailablePerfMetricsQueryResponse(p.rpMetrics, 0, "")
+	case "ClusterComputeResource":
+		if interval != 20 {
+			return p.buildAvailablePerfMetricsQueryResponse(p.clusterMetrics, 0, "")
+		}
+	case "Datastore":
+		if interval != 20 {
+			return p.buildAvailablePerfMetricsQueryResponse(p.datastoreMetrics, 0, "")
+		}
+	case "Datacenter":
+		if interval != 20 {
+			return p.buildAvailablePerfMetricsQueryResponse(p.datacenterMetrics, 0, "")
+		}
+	}
+
+	// Don't know how to handle this. Return empty response.
+	return new(types.QueryAvailablePerfMetricResponse)
+}
+
+func (p *PerformanceManager) QueryAvailablePerfMetric(ctx *Context, req *types.QueryAvailablePerfMetric) soap.HasFault {
+	body := new(methods.QueryAvailablePerfMetricBody)
+	body.Req = req
+	body.Res = p.queryAvailablePerfMetric(req.Entity, req.IntervalId)
+
+	return body
+}
+
+func (p *PerformanceManager) QueryPerf(ctx *Context, req *types.QueryPerf) soap.HasFault {
+	body := new(methods.QueryPerfBody)
+	body.Req = req
+	body.Res = new(types.QueryPerfResponse)
+	body.Res.Returnval = make([]types.BasePerfEntityMetricBase, len(req.QuerySpec))
+
+	for i, qs := range req.QuerySpec {
+		metrics := new(types.PerfEntityMetric)
+		metrics.Entity = qs.Entity
+
+		// Get metric data for this entity type
+		metricData, ok := p.metricData[qs.Entity.Type]
+		if !ok {
+			body.Fault_ = Fault("", &types.InvalidArgument{
+				InvalidProperty: "Entity",
+			})
+		}
+		var start, end time.Time
+		if qs.StartTime == nil {
+			start = time.Now().Add(time.Duration(-365*24) * time.Hour) // Assume we have data for a year
+		} else {
+			start = *qs.StartTime
+		}
+		if qs.EndTime == nil {
+			end = time.Now()
+		} else {
+			end = *qs.EndTime
+		}
+
+		// Generate metric series. Divide into n buckets of interval seconds
+		interval := qs.IntervalId
+		if interval == -1 || interval == 0 {
+			interval = 20 // TODO: Determine from entity type
+		}
+		n := 1 + int32(end.Sub(start).Seconds())/interval
+		if n > qs.MaxSample {
+			n = qs.MaxSample
+		}
+
+		// Loop through each interval "tick"
+		metrics.SampleInfo = make([]types.PerfSampleInfo, n)
+		metrics.Value = make([]types.BasePerfMetricSeries, len(qs.MetricId))
+		for tick := int32(0); tick < n; tick++ {
+			metrics.SampleInfo[tick] = types.PerfSampleInfo{Timestamp: end.Add(time.Duration(-interval*tick) * time.Second), Interval: interval}
+		}
+
+		for j, mid := range qs.MetricId {
+			// Create list of metrics for this tick
+			series := &types.PerfMetricIntSeries{Value: make([]int64, n)}
+			series.Id = mid
+			points := metricData[mid.CounterId]
+			offset := int64(start.Unix()) / int64(interval)
+
+			for tick := int32(0); tick < n; tick++ {
+				var p int64
+
+				// Use sample data if we have it. Otherwise, just send 0.
+				if len(points) > 0 {
+					p = points[(offset+int64(tick))%int64(len(points))]
+					scale := p / 5
+					if scale > 0 {
+						// Add some gaussian noise to make the data look more "real"
+						p += int64(rand.NormFloat64() * float64(scale))
+						if p < 0 {
+							p = 0
+						}
+					}
+				} else {
+					p = 0
+				}
+				series.Value[tick] = p
+			}
+			metrics.Value[j] = series
+		}
+		body.Res.Returnval[i] = metrics
+	}
+	return body
+}
diff --git a/vendor/github.com/vmware/govmomi/simulator/property_collector.go b/vendor/github.com/vmware/govmomi/simulator/property_collector.go
index 8dc3174468..38c48fdcb5 100644
--- a/vendor/github.com/vmware/govmomi/simulator/property_collector.go
+++ b/vendor/github.com/vmware/govmomi/simulator/property_collector.go
@@ -17,11 +17,14 @@ limitations under the License.
 package simulator
 
 import (
+	"context"
 	"errors"
 	"log"
 	"path"
 	"reflect"
 	"strings"
+	"sync"
+	"time"
 
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/methods"
@@ -32,6 +35,11 @@ import (
 
 type PropertyCollector struct {
 	mo.PropertyCollector
+
+	nopLocker
+	updates []types.ObjectUpdate
+	mu      sync.Mutex
+	cancel  context.CancelFunc
 }
 
 func NewPropertyCollector(ref types.ManagedObjectReference) object.Reference {
@@ -72,6 +80,10 @@ func getObject(ctx *Context, ref types.ManagedObjectReference) (reflect.Value, b
 		obj = o.Get()
 	}
 
+	return getManagedObject(obj), true
+}
+
+func getManagedObject(obj mo.Reference) reflect.Value {
 	rval := reflect.ValueOf(obj).Elem()
 	rtype := rval.Type()
 
@@ -82,26 +94,21 @@ func getObject(ctx *Context, ref types.ManagedObjectReference) (reflect.Value, b
 	// for the case where the type has a field of the same name, for example:
 	// mo.ResourcePool.ResourcePool
 	for {
-		if path.Base(rtype.PkgPath()) != "mo" {
-			if rtype.Kind() != reflect.Struct || rtype.NumField() == 0 {
-				log.Printf("%#v does not have an embedded mo type", ref)
-				return reflect.Value{}, false
-			}
-			rval = rval.Field(0)
-			rtype = rval.Type()
-		} else {
+		if path.Base(rtype.PkgPath()) == "mo" {
 			break
 		}
+		if rtype.Kind() != reflect.Struct || rtype.NumField() == 0 {
+			log.Panicf("%#v does not have an embedded mo type", obj.Reference())
+		}
+		rval = rval.Field(0)
+		rtype = rval.Type()
 	}
 
-	return rval, true
+	return rval
 }
 
-func fieldValueInterface(f reflect.StructField, rval reflect.Value) interface{} {
-	if rval.Kind() == reflect.Ptr {
-		rval = rval.Elem()
-	}
-
+// wrapValue converts slice types to the appropriate ArrayOf type used in property collector responses.
+func wrapValue(rval reflect.Value, rtype reflect.Type) interface{} {
 	pval := rval.Interface()
 
 	if rval.Kind() == reflect.Slice {
@@ -111,17 +118,29 @@ func fieldValueInterface(f reflect.StructField, rval reflect.Value) interface{}
 			pval = &types.ArrayOfString{
 				String: v,
 			}
+		case []uint8:
+			pval = &types.ArrayOfByte{
+				Byte: v,
+			}
+		case []int16:
+			pval = &types.ArrayOfShort{
+				Short: v,
+			}
 		case []int32:
 			pval = &types.ArrayOfInt{
 				Int: v,
 			}
+		case []int64:
+			pval = &types.ArrayOfLong{
+				Long: v,
+			}
 		default:
-			kind := f.Type.Elem().Name()
+			kind := rtype.Elem().Name()
 			// Remove govmomi interface prefix name
 			if strings.HasPrefix(kind, "Base") {
 				kind = kind[4:]
 			}
-			akind, _ := typeFunc("ArrayOf" + kind)
+			akind, _ := defaultMapType("ArrayOf" + kind)
 			a := reflect.New(akind)
 			a.Elem().FieldByName(kind).Set(rval)
 			pval = a.Interface()
@@ -131,6 +150,14 @@ func fieldValueInterface(f reflect.StructField, rval reflect.Value) interface{}
 	return pval
 }
 
+func fieldValueInterface(f reflect.StructField, rval reflect.Value) interface{} {
+	if rval.Kind() == reflect.Ptr {
+		rval = rval.Elem()
+	}
+
+	return wrapValue(rval, f.Type)
+}
+
 func fieldValue(rval reflect.Value, p string) (interface{}, error) {
 	var value interface{}
 	fields := strings.Split(p, ".")
@@ -278,14 +305,10 @@ func (rr *retrieveResult) collectFields(ctx *Context, rval reflect.Value, fields
 		seen[name] = true
 
 		val, err := fieldValue(rval, name)
-		if err == nil {
-			rr.add(ctx, name, val, content)
-			continue
-		}
 
 		switch err {
-		case errEmptyField:
-			// ok
+		case nil, errEmptyField:
+			rr.add(ctx, name, val, content)
 		case errMissingField:
 			content.MissingSet = append(content.MissingSet, types.MissingProperty{
 				Path: name,
@@ -393,7 +416,9 @@ func (pc *PropertyCollector) collect(ctx *Context, r *types.RetrievePropertiesEx
 	// Select object references
 	for _, spec := range r.SpecSet {
 		for _, o := range spec.ObjectSet {
-			rval, ok := getObject(ctx, o.Obj)
+			var rval reflect.Value
+			ok := false
+			ctx.WithLock(o.Obj, func() { rval, ok = getObject(ctx, o.Obj) })
 			if !ok {
 				if isFalse(spec.ReportMissingObjectsInResults) {
 					return nil, &types.ManagedObjectNotFound{Obj: o.Obj}
@@ -412,7 +437,7 @@ func (pc *PropertyCollector) collect(ctx *Context, r *types.RetrievePropertiesEx
 	}
 
 	for _, ref := range refs {
-		rr.collect(ctx, ref)
+		ctx.WithLock(ref, func() { rr.collect(ctx, ref) })
 	}
 
 	return rr.RetrieveResult, nil
@@ -421,7 +446,10 @@ func (pc *PropertyCollector) collect(ctx *Context, r *types.RetrievePropertiesEx
 func (pc *PropertyCollector) CreateFilter(ctx *Context, c *types.CreateFilter) soap.HasFault {
 	body := &methods.CreateFilterBody{}
 
-	filter := &PropertyFilter{pc: pc}
+	filter := &PropertyFilter{
+		pc:   pc,
+		refs: make(map[types.ManagedObjectReference]struct{}),
+	}
 	filter.PartialUpdates = c.PartialUpdates
 	filter.Spec = c.Spec
 
@@ -447,14 +475,17 @@ func (pc *PropertyCollector) CreatePropertyCollector(ctx *Context, c *types.Crea
 }
 
 func (pc *PropertyCollector) DestroyPropertyCollector(ctx *Context, c *types.DestroyPropertyCollector) soap.HasFault {
+	pc.CancelWaitForUpdates(&types.CancelWaitForUpdates{This: c.This})
+
 	body := &methods.DestroyPropertyCollectorBody{}
 
 	for _, ref := range pc.Filter {
 		filter := ctx.Session.Get(ref).(*PropertyFilter)
-		filter.DestroyPropertyFilter(&types.DestroyPropertyFilter{This: ref})
+		filter.DestroyPropertyFilter(ctx, &types.DestroyPropertyFilter{This: ref})
 	}
 
 	ctx.Session.Remove(c.This)
+	ctx.Map.Remove(c.This)
 
 	body.Res = &types.DestroyPropertyCollectorResponse{}
 
@@ -469,6 +500,19 @@ func (pc *PropertyCollector) RetrievePropertiesEx(ctx *Context, r *types.Retriev
 	if fault != nil {
 		body.Fault_ = Fault("", fault)
 	} else {
+		objects := res.Objects[:0]
+		for _, o := range res.Objects {
+			propSet := o.PropSet[:0]
+			for _, p := range o.PropSet {
+				if p.Val != nil {
+					propSet = append(propSet, p)
+				}
+			}
+			o.PropSet = propSet
+
+			objects = append(objects, o)
+		}
+		res.Objects = objects
 		body.Res = &types.RetrievePropertiesExResponse{
 			Returnval: res,
 		}
@@ -498,24 +542,46 @@ func (pc *PropertyCollector) RetrieveProperties(ctx *Context, r *types.RetrieveP
 }
 
 func (pc *PropertyCollector) CancelWaitForUpdates(r *types.CancelWaitForUpdates) soap.HasFault {
+	pc.mu.Lock()
+	if pc.cancel != nil {
+		pc.cancel()
+	}
+	pc.mu.Unlock()
+
 	return &methods.CancelWaitForUpdatesBody{Res: new(types.CancelWaitForUpdatesResponse)}
 }
 
-func (pc *PropertyCollector) WaitForUpdatesEx(ctx *Context, r *types.WaitForUpdatesEx) soap.HasFault {
-	body := &methods.WaitForUpdatesExBody{}
+func (pc *PropertyCollector) update(u types.ObjectUpdate) {
+	pc.mu.Lock()
+	pc.updates = append(pc.updates, u)
+	pc.mu.Unlock()
+}
 
-	// At the moment we need to support Task completion.  Handlers can simply set the Task
-	// state before returning and the non-incremental update is enough for the client.
-	// We can wait for incremental updates to simulate timeouts, etc.
-	if r.Version != "" {
-		body.Fault_ = Fault("incremental updates not supported yet", &types.NotSupported{})
-		return body
-	}
+func (pc *PropertyCollector) PutObject(o mo.Reference) {
+	pc.update(types.ObjectUpdate{
+		Obj:       o.Reference(),
+		Kind:      types.ObjectUpdateKindEnter,
+		ChangeSet: nil,
+	})
+}
 
-	update := &types.UpdateSet{
-		Version: "-",
-	}
+func (pc *PropertyCollector) UpdateObject(o mo.Reference, changes []types.PropertyChange) {
+	pc.update(types.ObjectUpdate{
+		Obj:       o.Reference(),
+		Kind:      types.ObjectUpdateKindModify,
+		ChangeSet: changes,
+	})
+}
 
+func (pc *PropertyCollector) RemoveObject(ref types.ManagedObjectReference) {
+	pc.update(types.ObjectUpdate{
+		Obj:       ref,
+		Kind:      types.ObjectUpdateKindLeave,
+		ChangeSet: nil,
+	})
+}
+
+func (pc *PropertyCollector) apply(ctx *Context, update *types.UpdateSet) types.BaseMethodFault {
 	for _, ref := range pc.Filter {
 		filter := ctx.Session.Get(ref).(*PropertyFilter)
 
@@ -524,8 +590,7 @@ func (pc *PropertyCollector) WaitForUpdatesEx(ctx *Context, r *types.WaitForUpda
 
 		res, fault := pc.collect(ctx, r)
 		if fault != nil {
-			body.Fault_ = Fault("", fault)
-			return body
+			return fault
 		}
 
 		fu := types.PropertyFilterUpdate{
@@ -533,6 +598,10 @@ func (pc *PropertyCollector) WaitForUpdatesEx(ctx *Context, r *types.WaitForUpda
 		}
 
 		for _, o := range res.Objects {
+			if _, ok := filter.refs[o.Obj]; ok {
+				continue
+			}
+			filter.refs[o.Obj] = struct{}{}
 			ou := types.ObjectUpdate{
 				Obj:  o.Obj,
 				Kind: types.ObjectUpdateKindEnter,
@@ -549,14 +618,135 @@ func (pc *PropertyCollector) WaitForUpdatesEx(ctx *Context, r *types.WaitForUpda
 			fu.ObjectSet = append(fu.ObjectSet, ou)
 		}
 
-		update.FilterSet = append(update.FilterSet, fu)
+		if len(fu.ObjectSet) != 0 {
+			update.FilterSet = append(update.FilterSet, fu)
+		}
+	}
+	return nil
+}
+
+func (pc *PropertyCollector) WaitForUpdatesEx(ctx *Context, r *types.WaitForUpdatesEx) soap.HasFault {
+	wait, cancel := context.WithCancel(context.Background())
+	oneUpdate := false
+	if r.Options != nil {
+		if max := r.Options.MaxWaitSeconds; max != nil {
+			// A value of 0 causes WaitForUpdatesEx to do one update calculation and return any results.
+			oneUpdate = (*max == 0)
+			if *max > 0 {
+				wait, cancel = context.WithTimeout(context.Background(), time.Second*time.Duration(*max))
+			}
+		}
+	}
+	pc.mu.Lock()
+	pc.cancel = cancel
+	pc.mu.Unlock()
+
+	body := &methods.WaitForUpdatesExBody{}
+
+	set := &types.UpdateSet{
+		Version: r.Version,
 	}
 
 	body.Res = &types.WaitForUpdatesExResponse{
-		Returnval: update,
+		Returnval: set,
 	}
 
-	return body
+	apply := func() bool {
+		if fault := pc.apply(ctx, set); fault != nil {
+			body.Fault_ = Fault("", fault)
+			body.Res = nil
+			return false
+		}
+		return true
+	}
+
+	if r.Version == "" {
+		apply()                // Collect current state
+		set.Version = "-"      // Next request with Version set will wait via loop below
+		ctx.Map.AddHandler(pc) // Listen for create, update, delete of managed objects
+		return body
+	}
+
+	ticker := time.NewTicker(250 * time.Millisecond) // allow for updates to accumulate
+	defer ticker.Stop()
+	// Start the wait loop, returning on one of:
+	// - Client calls CancelWaitForUpdates
+	// - MaxWaitSeconds was specified and has been exceeded
+	// - We have updates to send to the client
+	for {
+		select {
+		case <-wait.Done():
+			body.Res.Returnval = nil
+			switch wait.Err() {
+			case context.Canceled:
+				log.Printf("%s: WaitForUpdates canceled", pc.Self)
+				body.Fault_ = Fault("", new(types.RequestCanceled)) // CancelWaitForUpdates was called
+				body.Res = nil
+			case context.DeadlineExceeded:
+				log.Printf("%s: WaitForUpdates MaxWaitSeconds exceeded", pc.Self)
+			}
+
+			return body
+		case <-ticker.C:
+			pc.mu.Lock()
+			updates := pc.updates
+			pc.updates = nil // clear updates collected by the managed object CRUD listeners
+			pc.mu.Unlock()
+			if len(updates) == 0 {
+				if oneUpdate == true {
+					body.Res.Returnval = nil
+					return body
+				}
+				continue
+			}
+
+			log.Printf("%s: applying %d updates to %d filters", pc.Self, len(updates), len(pc.Filter))
+
+			for _, f := range pc.Filter {
+				filter := ctx.Session.Get(f).(*PropertyFilter)
+				fu := types.PropertyFilterUpdate{Filter: f}
+
+				for _, update := range updates {
+					switch update.Kind {
+					case types.ObjectUpdateKindEnter: // Create
+						if !apply() {
+							return body
+						}
+					case types.ObjectUpdateKindModify: // Update
+						log.Printf("%s has %d changes", update.Obj, len(update.ChangeSet))
+						if !apply() { // An update may apply to collector traversal specs
+							return body
+						}
+						if _, ok := filter.refs[update.Obj]; ok {
+							// This object has already been applied by the filter,
+							// now check if the property spec applies for this update.
+							update = filter.apply(ctx, update)
+							if len(update.ChangeSet) != 0 {
+								fu.ObjectSet = append(fu.ObjectSet, update)
+							}
+						}
+					case types.ObjectUpdateKindLeave: // Delete
+						if _, ok := filter.refs[update.Obj]; !ok {
+							continue
+						}
+						delete(filter.refs, update.Obj)
+						fu.ObjectSet = append(fu.ObjectSet, update)
+					}
+				}
+
+				if len(fu.ObjectSet) != 0 {
+					set.FilterSet = append(set.FilterSet, fu)
+				}
+			}
+			if len(set.FilterSet) != 0 {
+				return body
+			}
+			if oneUpdate == true {
+				body.Res.Returnval = nil
+				return body
+			}
+		}
+	}
 }
 
 // WaitForUpdates is deprecated, but pyvmomi is still using it at the moment.
diff --git a/vendor/github.com/vmware/govmomi/simulator/property_filter.go b/vendor/github.com/vmware/govmomi/simulator/property_filter.go
index 99a74fb1c1..c24663548d 100644
--- a/vendor/github.com/vmware/govmomi/simulator/property_filter.go
+++ b/vendor/github.com/vmware/govmomi/simulator/property_filter.go
@@ -17,6 +17,9 @@ limitations under the License.
 package simulator
 
 import (
+	"reflect"
+	"strings"
+
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
@@ -26,17 +29,71 @@ import (
 type PropertyFilter struct {
 	mo.PropertyFilter
 
-	pc *PropertyCollector
+	pc   *PropertyCollector
+	refs map[types.ManagedObjectReference]struct{}
 }
 
-func (f *PropertyFilter) DestroyPropertyFilter(c *types.DestroyPropertyFilter) soap.HasFault {
+func (f *PropertyFilter) DestroyPropertyFilter(ctx *Context, c *types.DestroyPropertyFilter) soap.HasFault {
 	body := &methods.DestroyPropertyFilterBody{}
 
 	RemoveReference(&f.pc.Filter, c.This)
 
-	Map.Remove(c.This)
+	ctx.Session.Remove(c.This)
 
 	body.Res = &types.DestroyPropertyFilterResponse{}
 
 	return body
 }
+
+// matches returns true if the change matches one of the filter Spec.PropSet
+func (f *PropertyFilter) matches(ctx *Context, ref types.ManagedObjectReference, change *types.PropertyChange) bool {
+	for _, p := range f.Spec.PropSet {
+		if p.Type != ref.Type {
+			continue
+		}
+
+		if isTrue(p.All) {
+			return true
+		}
+
+		for _, name := range p.PathSet {
+			if name == change.Name {
+				return true
+			}
+
+			// strings.HasPrefix("runtime.powerState", "runtime") == parent field matches
+			if strings.HasPrefix(change.Name, name) {
+				if obj := ctx.Map.Get(ref); obj != nil { // object may have since been deleted
+					change.Name = name
+					change.Val, _ = fieldValue(reflect.ValueOf(obj), name)
+				}
+
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+// apply the PropertyFilter.Spec to the given ObjectUpdate
+func (f *PropertyFilter) apply(ctx *Context, change types.ObjectUpdate) types.ObjectUpdate {
+	parents := make(map[string]bool)
+	set := change.ChangeSet
+	change.ChangeSet = nil
+
+	for i, p := range set {
+		if f.matches(ctx, change.Obj, &p) {
+			if p.Name != set[i].Name {
+				// update matches a parent field from the spec.
+				if parents[p.Name] {
+					continue // only return 1 instance of the parent
+				}
+				parents[p.Name] = true
+			}
+			change.ChangeSet = append(change.ChangeSet, p)
+		}
+	}
+
+	return change
+}
diff --git a/vendor/github.com/vmware/govmomi/simulator/registry.go b/vendor/github.com/vmware/govmomi/simulator/registry.go
index 95a5fccf51..f9c760025f 100644
--- a/vendor/github.com/vmware/govmomi/simulator/registry.go
+++ b/vendor/github.com/vmware/govmomi/simulator/registry.go
@@ -23,8 +23,9 @@ import (
 	"reflect"
 	"strings"
 	"sync"
+	"sync/atomic"
 
-	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 )
@@ -46,10 +47,11 @@ var refValueMap = map[string]string{
 // Map is the default Registry instance.
 var Map = NewRegistry()
 
-// RegisterObject interface supports callbacks when objects are added and removed from the Registry
+// RegisterObject interface supports callbacks when objects are created, updated and deleted from the Registry
 type RegisterObject interface {
 	mo.Reference
 	PutObject(mo.Reference)
+	UpdateObject(mo.Reference, []types.PropertyChange)
 	RemoveObject(types.ManagedObjectReference)
 }
 
@@ -59,7 +61,10 @@ type Registry struct {
 	objects  map[types.ManagedObjectReference]mo.Reference
 	handlers map[types.ManagedObjectReference]RegisterObject
 	locks    map[types.ManagedObjectReference]sync.Locker
-	counter  int
+	counter  int64
+
+	Namespace string
+	Path      string
 }
 
 // NewRegistry creates a new instances of Registry
@@ -68,11 +73,23 @@ func NewRegistry() *Registry {
 		objects:  make(map[types.ManagedObjectReference]mo.Reference),
 		handlers: make(map[types.ManagedObjectReference]RegisterObject),
 		locks:    make(map[types.ManagedObjectReference]sync.Locker),
+
+		Namespace: vim25.Namespace,
+		Path:      vim25.Path,
 	}
 
 	return r
 }
 
+func (r *Registry) typeFunc(name string) (reflect.Type, bool) {
+	if r.Namespace != "" && r.Namespace != vim25.Namespace {
+		if kind, ok := defaultMapType(r.Namespace + ":" + name); ok {
+			return kind, ok
+		}
+	}
+	return defaultMapType(name)
+}
+
 // typeName returns the type of the given object.
 func typeName(item mo.Reference) string {
 	return reflect.TypeOf(item).Elem().Name()
@@ -97,8 +114,8 @@ func (r *Registry) newReference(item mo.Reference) types.ManagedObjectReference
 	}
 
 	if ref.Value == "" {
-		r.counter++
-		ref.Value = fmt.Sprintf("%s-%d", valuePrefix(ref.Type), r.counter)
+		n := atomic.AddInt64(&r.counter, 1)
+		ref.Value = fmt.Sprintf("%s-%d", valuePrefix(ref.Type), n)
 	}
 
 	return ref
@@ -111,7 +128,9 @@ func (r *Registry) setReference(item mo.Reference, ref types.ManagedObjectRefere
 
 // AddHandler adds a RegisterObject handler to the Registry.
 func (r *Registry) AddHandler(h RegisterObject) {
+	r.m.Lock()
 	r.handlers[h.Reference()] = h
+	r.m.Unlock()
 }
 
 // NewEntity sets Entity().Self with a new, unique Value.
@@ -158,10 +177,23 @@ func (r *Registry) Any(kind string) mo.Entity {
 	return nil
 }
 
+// applyHandlers calls the given func for each r.handlers
+func (r *Registry) applyHandlers(f func(o RegisterObject)) {
+	r.m.Lock()
+	handlers := make([]RegisterObject, 0, len(r.handlers))
+	for _, handler := range r.handlers {
+		handlers = append(handlers, handler)
+	}
+	r.m.Unlock()
+
+	for i := range handlers {
+		f(handlers[i])
+	}
+}
+
 // Put adds a new object to Registry, generating a ManagedObjectReference if not already set.
 func (r *Registry) Put(item mo.Reference) mo.Reference {
 	r.m.Lock()
-	defer r.m.Unlock()
 
 	ref := item.Reference()
 	if ref.Type == "" || ref.Value == "" {
@@ -177,25 +209,50 @@ func (r *Registry) Put(item mo.Reference) mo.Reference {
 
 	r.objects[ref] = item
 
-	for _, h := range r.handlers {
-		h.PutObject(item)
-	}
+	r.m.Unlock()
+
+	r.applyHandlers(func(o RegisterObject) {
+		o.PutObject(item)
+	})
 
 	return item
 }
 
 // Remove removes an object from the Registry.
 func (r *Registry) Remove(item types.ManagedObjectReference) {
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	for _, h := range r.handlers {
-		h.RemoveObject(item)
-	}
+	r.applyHandlers(func(o RegisterObject) {
+		o.RemoveObject(item)
+	})
 
+	r.m.Lock()
 	delete(r.objects, item)
 	delete(r.handlers, item)
 	delete(r.locks, item)
+	r.m.Unlock()
+}
+
+// Update dispatches object property changes to RegisterObject handlers,
+// such as any PropertyCollector instances with in-progress WaitForUpdates calls.
+// The changes are also applied to the given object via mo.ApplyPropertyChange,
+// so there is no need to set object fields directly.
+func (r *Registry) Update(obj mo.Reference, changes []types.PropertyChange) {
+	for i := range changes {
+		if changes[i].Op == "" {
+			changes[i].Op = types.PropertyChangeOpAssign
+		}
+		if changes[i].Val != nil {
+			rval := reflect.ValueOf(changes[i].Val)
+			changes[i].Val = wrapValue(rval, rval.Type())
+		}
+	}
+
+	val := getManagedObject(obj).Addr().Interface().(mo.Reference)
+
+	mo.ApplyPropertyChange(val, changes)
+
+	r.applyHandlers(func(o RegisterObject) {
+		o.UpdateObject(val, changes)
+	})
 }
 
 // getEntityParent traverses up the inventory and returns the first object of type kind.
@@ -333,7 +390,7 @@ func (r *Registry) removeString(obj mo.Reference, field *[]string, val string) {
 }
 
 func (r *Registry) content() types.ServiceContent {
-	return r.Get(methods.ServiceInstance).(*ServiceInstance).Content
+	return r.Get(vim25.ServiceInstance).(*ServiceInstance).Content
 }
 
 // IsESX returns true if this Registry maps an ESX model
@@ -381,6 +438,11 @@ func (r *Registry) SessionManager() *SessionManager {
 	return r.Get(r.content().SessionManager.Reference()).(*SessionManager)
 }
 
+// OptionManager returns the OptionManager singleton
+func (r *Registry) OptionManager() *OptionManager {
+	return r.Get(r.content().Setting.Reference()).(*OptionManager)
+}
+
 func (r *Registry) MarshalJSON() ([]byte, error) {
 	r.m.Lock()
 	defer r.m.Unlock()
@@ -397,11 +459,23 @@ func (r *Registry) MarshalJSON() ([]byte, error) {
 }
 
 func (r *Registry) locker(obj mo.Reference) sync.Locker {
+	var ref types.ManagedObjectReference
+
+	switch x := obj.(type) {
+	case types.ManagedObjectReference:
+		ref = x
+		obj = r.Get(ref) // to check for sync.Locker
+	case *types.ManagedObjectReference:
+		ref = *x
+		obj = r.Get(ref) // to check for sync.Locker
+	default:
+		ref = obj.Reference()
+	}
+
 	if mu, ok := obj.(sync.Locker); ok {
 		return mu
 	}
 
-	ref := obj.Reference()
 	r.m.Lock()
 	mu, ok := r.locks[ref]
 	if !ok {
@@ -424,3 +498,9 @@ func (r *Registry) WithLock(obj mo.Reference, f func()) {
 	}
 	f()
 }
+
+// nopLocker can be embedded to opt-out of auto-locking (see Registry.WithLock)
+type nopLocker struct{}
+
+func (*nopLocker) Lock()   {}
+func (*nopLocker) Unlock() {}
diff --git a/vendor/github.com/vmware/govmomi/simulator/search_index.go b/vendor/github.com/vmware/govmomi/simulator/search_index.go
index f4786f02d2..6940171adf 100644
--- a/vendor/github.com/vmware/govmomi/simulator/search_index.go
+++ b/vendor/github.com/vmware/govmomi/simulator/search_index.go
@@ -57,15 +57,18 @@ func (s *SearchIndex) FindByDatastorePath(r *types.FindByDatastorePath) soap.Has
 func (s *SearchIndex) FindByInventoryPath(req *types.FindByInventoryPath) soap.HasFault {
 	body := &methods.FindByInventoryPathBody{Res: new(types.FindByInventoryPathResponse)}
 
-	path := strings.Split(req.InventoryPath, "/")
-	if len(path) <= 1 {
+	split := func(c rune) bool {
+		return c == '/'
+	}
+	path := strings.FieldsFunc(req.InventoryPath, split)
+	if len(path) < 1 {
 		return body
 	}
 
 	root := Map.content().RootFolder
 	o := &root
 
-	for _, name := range path[1:] {
+	for _, name := range path {
 		f := s.FindChild(&types.FindChild{Entity: *o, Name: name})
 
 		o = f.(*methods.FindChildBody).Res.Returnval
@@ -132,9 +135,16 @@ func (s *SearchIndex) FindByUuid(req *types.FindByUuid) soap.HasFault {
 			if !ok {
 				continue
 			}
-			if vm.Config.Uuid == req.Uuid {
-				body.Res.Returnval = &ref
-				break
+			if req.InstanceUuid != nil && *req.InstanceUuid {
+				if vm.Config.InstanceUuid == req.Uuid {
+					body.Res.Returnval = &ref
+					break
+				}
+			} else {
+				if vm.Config.Uuid == req.Uuid {
+					body.Res.Returnval = &ref
+					break
+				}
 			}
 		}
 	} else {
diff --git a/vendor/github.com/vmware/govmomi/simulator/service_instance.go b/vendor/github.com/vmware/govmomi/simulator/service_instance.go
index 465b4ccdc1..30307760ef 100644
--- a/vendor/github.com/vmware/govmomi/simulator/service_instance.go
+++ b/vendor/github.com/vmware/govmomi/simulator/service_instance.go
@@ -19,8 +19,10 @@ package simulator
 import (
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/simulator/vpx"
+	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
@@ -36,7 +38,7 @@ func NewServiceInstance(content types.ServiceContent, folder mo.Folder) *Service
 
 	s := &ServiceInstance{}
 
-	s.Self = methods.ServiceInstance
+	s.Self = vim25.ServiceInstance
 	s.Content = content
 
 	Map.Put(s)
@@ -49,6 +51,7 @@ func NewServiceInstance(content types.ServiceContent, folder mo.Folder) *Service
 	if content.About.ApiType == "HostAgent" {
 		CreateDefaultESX(f)
 	} else {
+		content.About.InstanceUuid = uuid.New().String()
 		setting = vpx.Setting
 	}
 
diff --git a/vendor/github.com/vmware/govmomi/simulator/session_manager.go b/vendor/github.com/vmware/govmomi/simulator/session_manager.go
index d6c47c468b..743b14dd3f 100644
--- a/vendor/github.com/vmware/govmomi/simulator/session_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/session_manager.go
@@ -49,33 +49,85 @@ func NewSessionManager(ref types.ManagedObjectReference) object.Reference {
 	return s
 }
 
-func (s *SessionManager) Login(ctx *Context, login *types.Login) soap.HasFault {
-	body := &methods.LoginBody{}
+func createSession(ctx *Context, name string, locale string) types.UserSession {
+	now := time.Now().UTC()
 
-	if login.Locale == "" {
-		login.Locale = session.Locale
+	if locale == "" {
+		locale = session.Locale
 	}
 
-	if login.UserName == "" || login.Password == "" || ctx.Session != nil {
+	session := Session{
+		UserSession: types.UserSession{
+			Key:            uuid.New().String(),
+			UserName:       name,
+			FullName:       name,
+			LoginTime:      now,
+			LastActiveTime: now,
+			Locale:         locale,
+			MessageLocale:  locale,
+		},
+		Registry: NewRegistry(),
+	}
+
+	ctx.SetSession(session, true)
+
+	return session.UserSession
+}
+
+func (s *SessionManager) Login(ctx *Context, req *types.Login) soap.HasFault {
+	body := new(methods.LoginBody)
+
+	if req.UserName == "" || req.Password == "" || ctx.Session != nil {
 		body.Fault_ = invalidLogin
 	} else {
-		session := Session{
-			UserSession: types.UserSession{
-				Key:            uuid.New().String(),
-				UserName:       login.UserName,
-				FullName:       login.UserName,
-				LoginTime:      time.Now(),
-				LastActiveTime: time.Now(),
-				Locale:         login.Locale,
-				MessageLocale:  login.Locale,
-			},
-			Registry: NewRegistry(),
+		body.Res = &types.LoginResponse{
+			Returnval: createSession(ctx, req.UserName, req.Locale),
 		}
+	}
 
-		ctx.SetSession(session, true)
+	return body
+}
 
-		body.Res = &types.LoginResponse{
-			Returnval: session.UserSession,
+func (s *SessionManager) LoginExtensionByCertificate(ctx *Context, req *types.LoginExtensionByCertificate) soap.HasFault {
+	body := new(methods.LoginExtensionByCertificateBody)
+
+	if ctx.req.TLS == nil || len(ctx.req.TLS.PeerCertificates) == 0 {
+		body.Fault_ = Fault("", new(types.NoClientCertificate))
+		return body
+	}
+
+	if req.ExtensionKey == "" || ctx.Session != nil {
+		body.Fault_ = invalidLogin
+	} else {
+		body.Res = &types.LoginExtensionByCertificateResponse{
+			Returnval: createSession(ctx, req.ExtensionKey, req.Locale),
+		}
+	}
+
+	return body
+}
+
+func (s *SessionManager) LoginByToken(ctx *Context, req *types.LoginByToken) soap.HasFault {
+	body := new(methods.LoginByTokenBody)
+
+	if ctx.Session != nil {
+		body.Fault_ = invalidLogin
+	} else {
+		var subject struct {
+			ID string `xml:"Assertion>Subject>NameID"`
+		}
+
+		if s, ok := ctx.Header.Security.(*Element); ok {
+			_ = s.Decode(&subject)
+		}
+
+		if subject.ID == "" {
+			body.Fault_ = invalidLogin
+			return body
+		}
+
+		body.Res = &types.LoginByTokenResponse{
+			Returnval: createSession(ctx, subject.ID, req.Locale),
 		}
 	}
 
@@ -85,6 +137,16 @@ func (s *SessionManager) Login(ctx *Context, login *types.Login) soap.HasFault {
 func (s *SessionManager) Logout(ctx *Context, _ *types.Logout) soap.HasFault {
 	session := ctx.Session
 	delete(s.sessions, session.Key)
+	pc := Map.content().PropertyCollector
+
+	for ref, obj := range ctx.Session.Registry.objects {
+		if ref == pc {
+			continue // don't unregister the PropertyCollector singleton
+		}
+		if _, ok := obj.(RegisterObject); ok {
+			ctx.Map.Remove(ref) // Remove RegisterObject handlers
+		}
+	}
 
 	ctx.postEvent(&types.UserLogoutSessionEvent{
 		IpAddress: session.IpAddress,
@@ -163,6 +225,7 @@ var internalContext = &Context{
 		},
 		Registry: NewRegistry(),
 	},
+	Map: Map,
 }
 
 var invalidLogin = Fault("Login failure", new(types.InvalidLogin))
@@ -175,7 +238,9 @@ type Context struct {
 
 	context.Context
 	Session *Session
+	Header  soap.Header
 	Caller  *types.ManagedObjectReference
+	Map     *Registry
 }
 
 // mapSession maps an HTTP cookie to a Session.
diff --git a/vendor/github.com/vmware/govmomi/simulator/simulator.go b/vendor/github.com/vmware/govmomi/simulator/simulator.go
index f6a656f109..4b884283fb 100644
--- a/vendor/github.com/vmware/govmomi/simulator/simulator.go
+++ b/vendor/github.com/vmware/govmomi/simulator/simulator.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"encoding/base64"
 	"encoding/json"
 	"encoding/pem"
 	"flag"
@@ -28,6 +29,7 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -35,6 +37,7 @@ import (
 	"path"
 	"reflect"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/vmware/govmomi/find"
@@ -51,15 +54,17 @@ var Trace = false
 
 // Method encapsulates a decoded SOAP client request
 type Method struct {
-	Name string
-	This types.ManagedObjectReference
-	Body types.AnyType
+	Name   string
+	This   types.ManagedObjectReference
+	Header soap.Header
+	Body   types.AnyType
 }
 
 // Service decodes incoming requests and dispatches to a Handler
 type Service struct {
 	client *vim25.Client
 	sm     *SessionManager
+	sdk    map[string]*Registry
 
 	readAll func(io.Reader) ([]byte, error)
 
@@ -70,7 +75,8 @@ type Service struct {
 // Server provides a simulator Service over HTTP
 type Server struct {
 	*httptest.Server
-	URL *url.URL
+	URL    *url.URL
+	Tunnel int
 
 	caFile string
 }
@@ -80,6 +86,7 @@ func New(instance *ServiceInstance) *Service {
 	s := &Service{
 		readAll: ioutil.ReadAll,
 		sm:      Map.SessionManager(),
+		sdk:     make(map[string]*Registry),
 	}
 
 	s.client, _ = vim25.NewClient(context.Background(), s)
@@ -110,12 +117,12 @@ func Fault(msg string, fault types.BaseMethodFault) *soap.Fault {
 }
 
 func (s *Service) call(ctx *Context, method *Method) soap.HasFault {
-	handler := Map.Get(method.This)
+	handler := ctx.Map.Get(method.This)
 	session := ctx.Session
 
 	if session == nil {
 		switch method.Name {
-		case "RetrieveServiceContent", "Login", "RetrieveProperties", "RetrievePropertiesEx", "CloneSession":
+		case "RetrieveServiceContent", "List", "Login", "LoginByToken", "LoginExtensionByCertificate", "RetrieveProperties", "RetrievePropertiesEx", "CloneSession":
 			// ok for now, TODO: authz
 		default:
 			fault := &types.NotAuthenticated{
@@ -170,7 +177,7 @@ func (s *Service) call(ctx *Context, method *Method) soap.HasFault {
 		args = append(args, reflect.ValueOf(ctx))
 	}
 	args = append(args, reflect.ValueOf(method.Body))
-	Map.WithLock(handler, func() {
+	ctx.Map.WithLock(handler, func() {
 		res = m.Call(args)
 	})
 
@@ -197,6 +204,7 @@ func (s *Service) RoundTrip(ctx context.Context, request, response soap.HasFault
 	}
 
 	res := s.call(&Context{
+		Map:     Map,
 		Context: ctx,
 		Session: internalContext.Session,
 	}, method)
@@ -281,6 +289,16 @@ func (s *Service) About(w http.ResponseWriter, r *http.Request) {
 	_ = enc.Encode(&about)
 }
 
+// RegisterSDK adds an HTTP handler for the Registry's Path and Namespace.
+func (s *Service) RegisterSDK(r *Registry) {
+	if s.ServeMux == nil {
+		s.ServeMux = http.NewServeMux()
+	}
+
+	s.sdk[r.Path] = r
+	s.ServeMux.HandleFunc(r.Path, s.ServeSDK)
+}
+
 // ServeSDK implements the http.Handler interface
 func (s *Service) ServeSDK(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "POST" {
@@ -305,17 +323,19 @@ func (s *Service) ServeSDK(w http.ResponseWriter, r *http.Request) {
 		res: w,
 		m:   s.sm,
 
+		Map:     s.sdk[r.URL.Path],
 		Context: context.Background(),
 	}
-	Map.WithLock(s.sm, ctx.mapSession)
+	ctx.Map.WithLock(s.sm, ctx.mapSession)
 
 	var res soap.HasFault
 	var soapBody interface{}
 
-	method, err := UnmarshalBody(body)
+	method, err := UnmarshalBody(ctx.Map.typeFunc, body)
 	if err != nil {
 		res = serverFault(err.Error())
 	} else {
+		ctx.Header = method.Header
 		res = s.call(ctx, method)
 	}
 
@@ -370,7 +390,7 @@ func (s *Service) findDatastore(query url.Values) (*Datastore, error) {
 	ctx := context.Background()
 
 	finder := find.NewFinder(s.client, false)
-	dc, err := finder.DatacenterOrDefault(ctx, query.Get("dcName"))
+	dc, err := finder.DatacenterOrDefault(ctx, query.Get("dcPath"))
 	if err != nil {
 		return nil, err
 	}
@@ -447,15 +467,10 @@ func (*Service) ServiceVersions(w http.ResponseWriter, r *http.Request) {
 
 // NewServer returns an http Server instance for the given service
 func (s *Service) NewServer() *Server {
-	mux := s.ServeMux
-	if mux == nil {
-		mux = http.NewServeMux()
-	}
-
-	path := "/sdk"
+	s.RegisterSDK(Map)
 
-	mux.HandleFunc(path, s.ServeSDK)
-	mux.HandleFunc(path+"/vimServiceVersions.xml", s.ServiceVersions)
+	mux := s.ServeMux
+	mux.HandleFunc(Map.Path+"/vimServiceVersions.xml", s.ServiceVersions)
 	mux.HandleFunc(folderPrefix, s.ServeDatastore)
 	mux.HandleFunc("/about", s.About)
 
@@ -466,7 +481,7 @@ func (s *Service) NewServer() *Server {
 	u := &url.URL{
 		Scheme: "http",
 		Host:   ts.Listener.Addr().String(),
-		Path:   path,
+		Path:   Map.Path,
 		User:   url.UserPassword("user", "pass"),
 	}
 
@@ -478,14 +493,31 @@ func (s *Service) NewServer() *Server {
 		_ = f.Value.Set("")
 	}
 
+	cert := ""
 	if s.TLS == nil {
 		ts.Start()
 	} else {
 		ts.TLS = s.TLS
+		ts.TLS.ClientAuth = tls.RequestClientCert // Used by SessionManager.LoginExtensionByCertificate
 		ts.StartTLS()
 		u.Scheme += "s"
+
+		cert = base64.StdEncoding.EncodeToString(ts.TLS.Certificates[0].Certificate[0])
 	}
 
+	// Add vcsim config to OptionManager for use by SDK handlers (see lookup/simulator for example)
+	m := Map.OptionManager()
+	m.Setting = append(m.Setting,
+		&types.OptionValue{
+			Key:   "vcsim.server.url",
+			Value: ts.URL,
+		},
+		&types.OptionValue{
+			Key:   "vcsim.server.cert",
+			Value: cert,
+		},
+	)
+
 	return &Server{
 		Server: ts,
 		URL:    u,
@@ -525,6 +557,60 @@ func (s *Server) CertificateFile() (string, error) {
 	return s.caFile, pem.Encode(f, &pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw})
 }
 
+// proxy tunnels SDK requests
+func (s *Server) proxy(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodConnect {
+		http.Error(w, "", http.StatusMethodNotAllowed)
+		return
+	}
+
+	dst, err := net.Dial("tcp", s.URL.Host)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadGateway)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+
+	src, _, err := w.(http.Hijacker).Hijack()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	go io.Copy(src, dst)
+	go func() {
+		_, _ = io.Copy(dst, src)
+		_ = dst.Close()
+		_ = src.Close()
+	}()
+}
+
+// StartTunnel runs an HTTP proxy for tunneling SDK requests that require TLS client certificate authentication.
+func (s *Server) StartTunnel() error {
+	tunnel := &http.Server{
+		Addr:    fmt.Sprintf("%s:%d", s.URL.Hostname(), s.Tunnel),
+		Handler: http.HandlerFunc(s.proxy),
+	}
+
+	l, err := net.Listen("tcp", tunnel.Addr)
+	if err != nil {
+		return err
+	}
+
+	if s.Tunnel == 0 {
+		s.Tunnel = l.Addr().(*net.TCPAddr).Port
+	}
+
+	// Set client proxy port (defaults to vCenter host port 80 in real life)
+	q := s.URL.Query()
+	q.Set("GOVMOMI_TUNNEL_PROXY_PORT", strconv.Itoa(s.Tunnel))
+	s.URL.RawQuery = q.Encode()
+
+	go tunnel.Serve(l)
+
+	return nil
+}
+
 // Close shuts down the server and blocks until all outstanding
 // requests on this server have completed.
 func (s *Server) Close() {
@@ -536,7 +622,6 @@ func (s *Server) Close() {
 
 var (
 	vim25MapType = types.TypeFunc()
-	typeFunc     = defaultMapType
 )
 
 func defaultMapType(name string) (reflect.Type, bool) {
@@ -552,14 +637,39 @@ func defaultMapType(name string) (reflect.Type, bool) {
 	return typ, ok
 }
 
-// UnmarshalBody extracts the Body from a soap.Envelope and unmarshals to the corresponding govmomi type
-func UnmarshalBody(data []byte) (*Method, error) {
-	body := struct {
+// Element can be used to defer decoding of an XML node.
+type Element struct {
+	start xml.StartElement
+	inner struct {
 		Content string `xml:",innerxml"`
-	}{}
+	}
+	typeFunc func(string) (reflect.Type, bool)
+}
+
+func (e *Element) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	e.start = start
 
+	return d.DecodeElement(&e.inner, &start)
+}
+
+func (e *Element) decoder() *xml.Decoder {
+	decoder := xml.NewDecoder(strings.NewReader(e.inner.Content))
+	decoder.TypeFunc = e.typeFunc // required to decode interface types
+	return decoder
+}
+
+func (e *Element) Decode(val interface{}) error {
+	return e.decoder().DecodeElement(val, &e.start)
+}
+
+// UnmarshalBody extracts the Body from a soap.Envelope and unmarshals to the corresponding govmomi type
+func UnmarshalBody(typeFunc func(string) (reflect.Type, bool), data []byte) (*Method, error) {
+	body := &Element{typeFunc: typeFunc}
 	req := soap.Envelope{
-		Body: &body,
+		Header: &soap.Header{
+			Security: new(Element),
+		},
+		Body: body,
 	}
 
 	err := xml.Unmarshal(data, &req)
@@ -567,40 +677,38 @@ func UnmarshalBody(data []byte) (*Method, error) {
 		return nil, fmt.Errorf("xml.Unmarshal: %s", err)
 	}
 
-	decoder := xml.NewDecoder(bytes.NewReader([]byte(body.Content)))
-	decoder.TypeFunc = typeFunc // required to decode interface types
-
-	var start *xml.StartElement
+	var start xml.StartElement
+	var ok bool
+	decoder := body.decoder()
 
 	for {
 		tok, derr := decoder.Token()
 		if derr != nil {
-			return nil, fmt.Errorf("decoding body: %s", err)
+			return nil, fmt.Errorf("decoding: %s", derr)
 		}
-		if t, ok := tok.(xml.StartElement); ok {
-			start = &t
+		if start, ok = tok.(xml.StartElement); ok {
 			break
 		}
 	}
 
-	kind := start.Name.Local
+	if !ok {
+		return nil, fmt.Errorf("decoding: method token not found")
+	}
 
+	kind := start.Name.Local
 	rtype, ok := typeFunc(kind)
 	if !ok {
 		return nil, fmt.Errorf("no vmomi type defined for '%s'", kind)
 	}
 
-	var val interface{}
-	if rtype != nil {
-		val = reflect.New(rtype).Interface()
-	}
+	val := reflect.New(rtype).Interface()
 
-	err = decoder.DecodeElement(val, start)
+	err = decoder.DecodeElement(val, &start)
 	if err != nil {
 		return nil, fmt.Errorf("decoding %s: %s", kind, err)
 	}
 
-	method := &Method{Name: kind, Body: val}
+	method := &Method{Name: kind, Header: *req.Header, Body: val}
 
 	field := reflect.ValueOf(val).Elem().FieldByName("This")
 
diff --git a/vendor/github.com/vmware/govmomi/simulator/snapshot.go b/vendor/github.com/vmware/govmomi/simulator/snapshot.go
index d3b40b25df..beb364234a 100644
--- a/vendor/github.com/vmware/govmomi/simulator/snapshot.go
+++ b/vendor/github.com/vmware/govmomi/simulator/snapshot.go
@@ -39,6 +39,10 @@ func (v *VirtualMachineSnapshot) RemoveSnapshotTask(req *types.RemoveSnapshot_Ta
 			}
 
 			vm.Snapshot.RootSnapshotList = removeSnapshotInTree(vm.Snapshot.RootSnapshotList, req.This, req.RemoveChildren)
+
+			if len(vm.Snapshot.RootSnapshotList) == 0 {
+				vm.Snapshot = nil
+			}
 		})
 
 		return nil, nil
diff --git a/vendor/github.com/vmware/govmomi/simulator/task.go b/vendor/github.com/vmware/govmomi/simulator/task.go
index d6dd5bc415..3b5939c55b 100644
--- a/vendor/github.com/vmware/govmomi/simulator/task.go
+++ b/vendor/github.com/vmware/govmomi/simulator/task.go
@@ -55,18 +55,19 @@ func CreateTask(e mo.Reference, name string, run func(*Task) (types.AnyType, typ
 		Execute: run,
 	}
 
-	Map.Put(task)
-
+	task.Self = Map.newReference(task)
 	task.Info.Key = task.Self.Value
 	task.Info.Task = task.Self
 	task.Info.Name = ucFirst(name)
 	task.Info.DescriptionId = fmt.Sprintf("%s.%s", ref.Type, id)
 	task.Info.Entity = &ref
 	task.Info.EntityName = ref.Value
-
+	task.Info.Reason = &types.TaskReasonUser{UserName: "vcsim"} // TODO: Context.Session.User
 	task.Info.QueueTime = time.Now()
 	task.Info.State = types.TaskInfoStateQueued
 
+	Map.Put(task)
+
 	return task
 }
 
@@ -78,25 +79,31 @@ type TaskRunner interface {
 
 func (t *Task) Run() types.ManagedObjectReference {
 	now := time.Now()
-	t.Info.StartTime = &now
 
-	t.Info.State = types.TaskInfoStateRunning
+	Map.Update(t, []types.PropertyChange{
+		{Name: "info.startTime", Val: now},
+		{Name: "info.state", Val: types.TaskInfoStateRunning},
+	})
 
 	res, err := t.Execute(t)
-
-	now = time.Now()
-	t.Info.CompleteTime = &now
-
+	state := types.TaskInfoStateSuccess
+	var fault interface{}
 	if err != nil {
-		t.Info.State = types.TaskInfoStateError
-		t.Info.Error = &types.LocalizedMethodFault{
+		state = types.TaskInfoStateError
+		fault = types.LocalizedMethodFault{
 			Fault:            err,
 			LocalizedMessage: fmt.Sprintf("%T", err),
 		}
-	} else {
-		t.Info.Result = res
-		t.Info.State = types.TaskInfoStateSuccess
 	}
 
+	now = time.Now()
+
+	Map.Update(t, []types.PropertyChange{
+		{Name: "info.completeTime", Val: now},
+		{Name: "info.state", Val: state},
+		{Name: "info.result", Val: res},
+		{Name: "info.error", Val: fault},
+	})
+
 	return t.Self
 }
diff --git a/vendor/github.com/vmware/govmomi/simulator/task_manager.go b/vendor/github.com/vmware/govmomi/simulator/task_manager.go
index df27108259..c4f3412bc0 100644
--- a/vendor/github.com/vmware/govmomi/simulator/task_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/task_manager.go
@@ -17,6 +17,8 @@ limitations under the License.
 package simulator
 
 import (
+	"sync"
+
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
@@ -26,6 +28,7 @@ var recentTaskMax = 200 // the VC limit
 
 type TaskManager struct {
 	mo.TaskManager
+	sync.Mutex
 }
 
 func NewTaskManager(ref types.ManagedObjectReference) object.Reference {
@@ -41,12 +44,16 @@ func (m *TaskManager) PutObject(obj mo.Reference) {
 		return
 	}
 
-	m.RecentTask = append(m.RecentTask, ref)
-
-	if len(m.RecentTask) > recentTaskMax {
-		m.RecentTask = m.RecentTask[1:]
+	m.Lock()
+	recent := append(m.RecentTask, ref)
+	if len(recent) > recentTaskMax {
+		recent = recent[1:]
 	}
-}
 
-func (m *TaskManager) RemoveObject(_ types.ManagedObjectReference) {
+	Map.Update(m, []types.PropertyChange{{Name: "recentTask", Val: recent}})
+	m.Unlock()
 }
+
+func (*TaskManager) RemoveObject(types.ManagedObjectReference) {}
+
+func (*TaskManager) UpdateObject(mo.Reference, []types.PropertyChange) {}
diff --git a/vendor/github.com/vmware/govmomi/simulator/view_manager.go b/vendor/github.com/vmware/govmomi/simulator/view_manager.go
index 78a5dadb17..133d9ff565 100644
--- a/vendor/github.com/vmware/govmomi/simulator/view_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/view_manager.go
@@ -137,7 +137,8 @@ type ContainerView struct {
 	types map[string]bool
 }
 
-func (v *ContainerView) DestroyView(c *types.DestroyView) soap.HasFault {
+func (v *ContainerView) DestroyView(ctx *Context, c *types.DestroyView) soap.HasFault {
+	ctx.Session.Remove(c.This)
 	return destroyView(c.This)
 }
 
@@ -192,3 +193,83 @@ func (v *ContainerView) add(root mo.Reference, seen map[types.ManagedObjectRefer
 		}
 	})
 }
+
+func (m *ViewManager) CreateListView(ctx *Context, req *types.CreateListView) soap.HasFault {
+	body := new(methods.CreateListViewBody)
+	list := new(ListView)
+
+	if err := list.add(req.Obj); err != nil {
+		body.Fault_ = Fault("", err)
+		return body
+	}
+
+	ctx.Session.Put(list)
+
+	body.Res = &types.CreateListViewResponse{
+		Returnval: list.Self,
+	}
+
+	return body
+}
+
+type ListView struct {
+	mo.ListView
+}
+
+func (v *ListView) update() {
+	Map.Update(v, []types.PropertyChange{{Name: "view", Val: v.View}})
+}
+
+func (v *ListView) add(refs []types.ManagedObjectReference) *types.ManagedObjectNotFound {
+	for _, ref := range refs {
+		obj := Map.Get(ref)
+		if obj == nil {
+			return &types.ManagedObjectNotFound{Obj: ref}
+		}
+		v.View = append(v.View, ref)
+	}
+	return nil
+}
+
+func (v *ListView) DestroyView(ctx *Context, c *types.DestroyView) soap.HasFault {
+	ctx.Session.Remove(c.This)
+	return destroyView(c.This)
+}
+
+func (v *ListView) ModifyListView(req *types.ModifyListView) soap.HasFault {
+	body := new(methods.ModifyListViewBody)
+
+	for _, ref := range req.Remove {
+		RemoveReference(&v.View, ref)
+	}
+
+	if err := v.add(req.Add); err != nil {
+		body.Fault_ = Fault("", err)
+		return body
+	}
+
+	body.Res = new(types.ModifyListViewResponse)
+
+	if len(req.Remove) != 0 || len(req.Add) != 0 {
+		v.update()
+	}
+
+	return body
+}
+
+func (v *ListView) ResetListView(req *types.ResetListView) soap.HasFault {
+	body := new(methods.ResetListViewBody)
+
+	v.View = nil
+
+	if err := v.add(req.Obj); err != nil {
+		body.Fault_ = Fault("", err)
+		return body
+	}
+
+	body.Res = new(types.ResetListViewResponse)
+
+	v.update()
+
+	return body
+}
diff --git a/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go b/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go
index ffe5a3e70e..63364f5b9a 100644
--- a/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go
+++ b/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go
@@ -132,7 +132,7 @@ func (m *VirtualDiskManager) MoveVirtualDiskTask(req *types.MoveVirtualDisk_Task
 				SourceDatacenter:      req.SourceDatacenter,
 				DestinationName:       dest[i],
 				DestinationDatacenter: req.DestDatacenter,
-				Force: req.Force,
+				Force:                 req.Force,
 			})
 
 			if err != nil {
@@ -168,7 +168,7 @@ func (m *VirtualDiskManager) CopyVirtualDiskTask(req *types.CopyVirtualDisk_Task
 				SourceDatacenter:      req.SourceDatacenter,
 				DestinationName:       dest[i],
 				DestinationDatacenter: req.DestDatacenter,
-				Force: req.Force,
+				Force:                 req.Force,
 			})
 
 			if err != nil {
@@ -210,3 +210,10 @@ func (m *VirtualDiskManager) QueryVirtualDiskUuid(req *types.QueryVirtualDiskUui
 
 	return body
 }
+
+func (m *VirtualDiskManager) SetVirtualDiskUuid(req *types.SetVirtualDiskUuid) soap.HasFault {
+	body := new(methods.SetVirtualDiskUuidBody)
+	// TODO: validate uuid format and persist
+	body.Res = new(types.SetVirtualDiskUuidResponse)
+	return body
+}
diff --git a/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go b/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go
index a27ac595ec..d6e51f39a5 100644
--- a/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go
+++ b/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go
@@ -17,11 +17,13 @@ limitations under the License.
 package simulator
 
 import (
+	"bytes"
 	"fmt"
 	"log"
 	"net"
 	"os"
 	"path"
+	"strconv"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -63,7 +65,7 @@ func NewVirtualMachine(parent types.ManagedObjectReference, spec *types.VirtualM
 		MemoryAllocation: &rspec.MemoryAllocation,
 		CpuAllocation:    &rspec.CpuAllocation,
 	}
-	vm.Snapshot = &types.VirtualMachineSnapshotInfo{}
+	vm.Snapshot = nil // intentionally set to nil until a snapshot is created
 	vm.Storage = &types.VirtualMachineStorageInfo{
 		Timestamp: time.Now(),
 	}
@@ -420,6 +422,35 @@ func (vm *VirtualMachine) generateMAC() string {
 	return mac.String()
 }
 
+func numberToString(n int64, sep rune) string {
+	buf := &bytes.Buffer{}
+	if n < 0 {
+		n = -n
+		buf.WriteRune('-')
+	}
+	s := strconv.FormatInt(n, 10)
+	pos := 3 - (len(s) % 3)
+	for i := 0; i < len(s); i++ {
+		if pos == 3 {
+			if i != 0 {
+				buf.WriteRune(sep)
+			}
+			pos = 0
+		}
+		pos++
+		buf.WriteByte(s[i])
+	}
+
+	return buf.String()
+}
+
+func getDiskSize(disk *types.VirtualDisk) int64 {
+	if disk.CapacityInBytes == 0 {
+		return disk.CapacityInKB * 1024
+	}
+	return disk.CapacityInBytes
+}
+
 func (vm *VirtualMachine) configureDevice(devices object.VirtualDeviceList, spec *types.VirtualDeviceConfigSpec) types.BaseMethodFault {
 	device := spec.Device
 	d := device.GetVirtualDevice()
@@ -469,6 +500,7 @@ func (vm *VirtualMachine) configureDevice(devices object.VirtualDeviceList, spec
 			c.MacAddress = vm.generateMAC()
 		}
 	case *types.VirtualDisk:
+		summary = fmt.Sprintf("%s KB", numberToString(x.CapacityInKB, ','))
 		switch b := d.Backing.(type) {
 		case types.BaseVirtualDeviceFileBackingInfo:
 			info := b.GetVirtualDeviceFileBackingInfo()
@@ -493,9 +525,16 @@ func (vm *VirtualMachine) configureDevice(devices object.VirtualDeviceList, spec
 			p, _ := parseDatastorePath(info.FileName)
 
 			host := Map.Get(*vm.Runtime.Host).(*HostSystem)
-			ds := Map.FindByName(p.Datastore, host.Datastore).Reference()
 
-			info.Datastore = &ds
+			entity := Map.FindByName(p.Datastore, host.Datastore)
+			ref := entity.Reference()
+			info.Datastore = &ref
+
+			ds := entity.(*Datastore)
+
+			// XXX: compare disk size and free space until windows stat is supported
+			ds.Summary.FreeSpace -= getDiskSize(x)
+			ds.Info.GetDatastoreInfo().FreeSpace = ds.Summary.FreeSpace
 		}
 	}
 
@@ -531,6 +570,15 @@ func (vm *VirtualMachine) removeDevice(devices object.VirtualDeviceList, spec *t
 				switch b := device.Backing.(type) {
 				case types.BaseVirtualDeviceFileBackingInfo:
 					file = b.GetVirtualDeviceFileBackingInfo().FileName
+
+					p, _ := parseDatastorePath(file)
+
+					host := Map.Get(*vm.Runtime.Host).(*HostSystem)
+
+					ds := Map.FindByName(p.Datastore, host.Datastore).(*Datastore)
+
+					ds.Summary.FreeSpace += getDiskSize(device)
+					ds.Info.GetDatastoreInfo().FreeSpace = ds.Summary.FreeSpace
 				}
 
 				if file != "" {
@@ -661,15 +709,9 @@ func (c *powerVMTask) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
 		}
 	}
 
-	c.VirtualMachine.Runtime.PowerState = c.state
-	c.VirtualMachine.Summary.Runtime.PowerState = c.state
-
-	bt := &c.VirtualMachine.Summary.Runtime.BootTime
+	var boot types.AnyType
 	if c.state == types.VirtualMachinePowerStatePoweredOn {
-		now := time.Now()
-		*bt = &now
-	} else {
-		*bt = nil
+		boot = time.Now()
 	}
 
 	event := c.event()
@@ -680,9 +722,23 @@ func (c *powerVMTask) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
 			&types.VmPoweredOnEvent{VmEvent: event},
 		)
 	case types.VirtualMachinePowerStatePoweredOff:
-		c.ctx.postEvent(&types.VmPoweredOffEvent{VmEvent: event})
+		c.ctx.postEvent(
+			&types.VmStoppingEvent{VmEvent: event},
+			&types.VmPoweredOffEvent{VmEvent: event},
+		)
+	case types.VirtualMachinePowerStateSuspended:
+		c.ctx.postEvent(
+			&types.VmSuspendingEvent{VmEvent: event},
+			&types.VmSuspendedEvent{VmEvent: event},
+		)
 	}
 
+	Map.Update(c.VirtualMachine, []types.PropertyChange{
+		{Name: "runtime.powerState", Val: c.state},
+		{Name: "summary.runtime.powerState", Val: c.state},
+		{Name: "summary.runtime.bootTime", Val: boot},
+	})
+
 	return nil, nil
 }
 
@@ -714,6 +770,37 @@ func (vm *VirtualMachine) PowerOffVMTask(ctx *Context, c *types.PowerOffVM_Task)
 	}
 }
 
+func (vm *VirtualMachine) SuspendVMTask(ctx *Context, req *types.SuspendVM_Task) soap.HasFault {
+	runner := &powerVMTask{vm, types.VirtualMachinePowerStateSuspended, ctx}
+	task := CreateTask(runner.Reference(), "suspend", runner.Run)
+
+	return &methods.SuspendVM_TaskBody{
+		Res: &types.SuspendVM_TaskResponse{
+			Returnval: task.Run(),
+		},
+	}
+}
+
+func (vm *VirtualMachine) ResetVMTask(ctx *Context, req *types.ResetVM_Task) soap.HasFault {
+	task := CreateTask(vm, "reset", func(task *Task) (types.AnyType, types.BaseMethodFault) {
+		res := vm.PowerOffVMTask(ctx, &types.PowerOffVM_Task{This: vm.Self})
+		ctask := Map.Get(res.(*methods.PowerOffVM_TaskBody).Res.Returnval).(*Task)
+		if ctask.Info.Error != nil {
+			return nil, ctask.Info.Error.Fault
+		}
+
+		_ = vm.PowerOnVMTask(ctx, &types.PowerOnVM_Task{This: vm.Self})
+
+		return nil, nil
+	})
+
+	return &methods.ResetVM_TaskBody{
+		Res: &types.ResetVM_TaskResponse{
+			Returnval: task.Run(),
+		},
+	}
+}
+
 func (vm *VirtualMachine) ReconfigVMTask(ctx *Context, req *types.ReconfigVM_Task) soap.HasFault {
 	task := CreateTask(vm, "reconfigVm", func(t *Task) (types.AnyType, types.BaseMethodFault) {
 		err := vm.configure(&req.Spec)
@@ -746,6 +833,11 @@ func (vm *VirtualMachine) DestroyTask(ctx *Context, req *types.Destroy_Task) soa
 			return nil, r.Fault().VimFault().(types.BaseMethodFault)
 		}
 
+		// Remove all devices
+		devices := object.VirtualDeviceList(vm.Config.Hardware.Device)
+		spec, _ := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationRemove)
+		vm.configureDevices(&types.VirtualMachineConfigSpec{DeviceChange: spec})
+
 		// Delete VM files from the datastore (ignoring result for now)
 		m := Map.FileManager()
 		dc := Map.getEntityDatacenter(vm).Reference()
@@ -882,29 +974,36 @@ func (vm *VirtualMachine) CloneVMTask(ctx *Context, req *types.CloneVM_Task) soa
 
 func (vm *VirtualMachine) RelocateVMTask(req *types.RelocateVM_Task) soap.HasFault {
 	task := CreateTask(vm, "relocateVm", func(t *Task) (types.AnyType, types.BaseMethodFault) {
+		var changes []types.PropertyChange
+
 		if ref := req.Spec.Datastore; ref != nil {
 			ds := Map.Get(*ref).(*Datastore)
 			Map.RemoveReference(ds, &ds.Vm, *ref)
 
-			vm.Datastore = []types.ManagedObjectReference{*ref}
-
 			// TODO: migrate vm.Config.Files (and vm.Summary.Config.VmPathName)
+
+			changes = append(changes, types.PropertyChange{Name: "datastore", Val: []types.ManagedObjectReference{*ref}})
 		}
 
 		if ref := req.Spec.Pool; ref != nil {
 			pool := Map.Get(*ref).(*ResourcePool)
 			Map.RemoveReference(pool, &pool.Vm, *ref)
 
-			vm.ResourcePool = ref
+			changes = append(changes, types.PropertyChange{Name: "resourcePool", Val: *ref})
 		}
 
 		if ref := req.Spec.Host; ref != nil {
 			host := Map.Get(*ref).(*HostSystem)
 			Map.RemoveReference(host, &host.Vm, *ref)
 
-			vm.Runtime.Host = ref
+			changes = append(changes,
+				types.PropertyChange{Name: "runtime.host", Val: *ref},
+				types.PropertyChange{Name: "summary.runtime.host", Val: *ref},
+			)
 		}
 
+		Map.Update(vm, changes)
+
 		return nil, nil
 	})
 
@@ -991,8 +1090,7 @@ func (vm *VirtualMachine) RemoveAllSnapshotsTask(req *types.RemoveAllSnapshots_T
 
 		refs := allSnapshotsInTree(vm.Snapshot.RootSnapshotList)
 
-		vm.Snapshot.CurrentSnapshot = nil
-		vm.Snapshot.RootSnapshotList = nil
+		vm.Snapshot = nil
 
 		for _, ref := range refs {
 			Map.Remove(ref)
@@ -1008,7 +1106,7 @@ func (vm *VirtualMachine) RemoveAllSnapshotsTask(req *types.RemoveAllSnapshots_T
 	}
 }
 
-func (vm *VirtualMachine) ShutdownGuest(c *types.ShutdownGuest) soap.HasFault {
+func (vm *VirtualMachine) ShutdownGuest(ctx *Context, c *types.ShutdownGuest) soap.HasFault {
 	r := &methods.ShutdownGuestBody{}
 	// should be poweron
 	if vm.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOff {
@@ -1023,6 +1121,17 @@ func (vm *VirtualMachine) ShutdownGuest(c *types.ShutdownGuest) soap.HasFault {
 	vm.Runtime.PowerState = types.VirtualMachinePowerStatePoweredOff
 	vm.Summary.Runtime.PowerState = types.VirtualMachinePowerStatePoweredOff
 
+	event := vm.event()
+	ctx.postEvent(
+		&types.VmGuestShutdownEvent{VmEvent: event},
+		&types.VmPoweredOffEvent{VmEvent: event},
+	)
+
+	Map.Update(vm, []types.PropertyChange{
+		{Name: "runtime.powerState", Val: types.VirtualMachinePowerStatePoweredOff},
+		{Name: "summary.runtime.powerState", Val: types.VirtualMachinePowerStatePoweredOff},
+	})
+
 	r.Res = new(types.ShutdownGuestResponse)
 
 	return r
diff --git a/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go b/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go
index 6ed4ba68e8..7bbf0c02d6 100644
--- a/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go
+++ b/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go
@@ -57,6 +57,10 @@ var Setting = []types.BaseOptionValue{
 		Key:   "config.vpxd.sso.admin.uri",
 		Value: "https://127.0.0.1/sso-adminserver/sdk/vsphere.local",
 	},
+	&types.OptionValue{
+		Key:   "VirtualCenter.InstanceName",
+		Value: "127.0.0.1",
+	},
 	&types.OptionValue{
 		Key:   "event.batchsize",
 		Value: int32(2000),
diff --git a/vendor/github.com/vmware/govmomi/vcsim/main.go b/vendor/github.com/vmware/govmomi/vcsim/main.go
index cfae221d57..0387b61c44 100644
--- a/vendor/github.com/vmware/govmomi/vcsim/main.go
+++ b/vendor/github.com/vmware/govmomi/vcsim/main.go
@@ -29,8 +29,12 @@ import (
 	"syscall"
 
 	"github.com/google/uuid"
+	lookup "github.com/vmware/govmomi/lookup/simulator"
 	"github.com/vmware/govmomi/simulator"
 	"github.com/vmware/govmomi/simulator/esx"
+	"github.com/vmware/govmomi/simulator/vpx"
+	sts "github.com/vmware/govmomi/sts/simulator"
+	vapi "github.com/vmware/govmomi/vapi/simulator"
 )
 
 func main() {
@@ -54,6 +58,7 @@ func main() {
 	cert := flag.String("tlscert", "", "Path to TLS certificate file")
 	key := flag.String("tlskey", "", "Path to TLS key file")
 	env := flag.String("E", "-", "Output vcsim variables to the given fifo or stdout")
+	tunnel := flag.Int("tunnel", -1, "SDK tunnel port")
 	flag.BoolVar(&simulator.Trace, "trace", simulator.Trace, "Trace SOAP to stderr")
 
 	flag.Parse()
@@ -128,6 +133,26 @@ func main() {
 
 	s := model.Service.NewServer()
 
+	if *tunnel >= 0 {
+		s.Tunnel = *tunnel
+		if err := s.StartTunnel(); err != nil {
+			log.Fatal(err)
+		}
+	}
+
+	if !*isESX {
+		// STS simulator
+		path, handler := sts.New(s.URL, vpx.Setting)
+		model.Service.ServeMux.Handle(path, handler)
+
+		// vAPI simulator
+		path, handler = vapi.New(s.URL, vpx.Setting)
+		model.Service.ServeMux.Handle(path, handler)
+
+		// Lookup Service simulator
+		model.Service.RegisterSDK(lookup.New())
+	}
+
 	fmt.Fprintf(out, "export GOVC_URL=%s GOVC_SIM_PID=%d\n", s.URL, os.Getpid())
 	if out != os.Stdout {
 		_ = out.Close()
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/doc.go b/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/doc.go
deleted file mode 100644
index 3a9ec2db4f..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/doc.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-
-Agg computes aggregate values over tabular text.
-It behaves somewhat like the SQL “GROUP BY” clause.
-
-Usage:
-
-	agg [function...]
-
-It reads input from stdin as a sequence of records, one per line.
-It treats each line as a set of fields separated by white space.
-One field (the first, by default) is designated as the key.
-Successive lines with equal keys are grouped into a group,
-and agg produces one line of output for each group.
-(Note that only contiguous input lines can form a group.
-If you need to make sure that all records for a given key
-are grouped together, sort the input first.)
-
-For each remaining field,
-agg applies a function to all the values in the group,
-producing a single output value.
-The command line arguments specify which functions to use,
-one per field in the input table.
-
-Functions
-
-The available functions are:
-
-    key        group by this field (default for field 1)
-    first      value from first line of group (default for rest)
-    last       value from last line of group
-    sample     value from any line of group, uniformly at random
-    prefix     longest common string prefix
-    join:sep   concatenate strings with given sep
-    smin       lexically least string
-    smax       lexically greatest string
-    min        numerically least value
-    max        numerically greatest value
-    sum        numeric sum
-    mean       arithmetic mean
-    count      number of records (ignores input value)
-    const:val  print val, ignoring input
-    drop       omit the column entirely
-
-The numeric functions skip items that don't parse as numbers.
-
-Examples
-
-Using the following input:
-
-    $ cat >input
-    -rwx   alice      100   /home/alice/bin/crdt
-    -rw-   alice   210002   /home/alice/thesis.tex
-    -rw-   bob      10051   /home/bob/expenses.tab
-    -rwx   kr      862060   /home/kr/bin/blog
-    -rwx   kr      304608   /home/kr/bin/agg
-
-Disk usage for each user, plus where that disk usage occurs
-(longest common prefix of filesystem paths):
-
-    $ agg <input drop key sum prefix
-    alice	210153	/home/alice/
-    bob	10051	/home/bob/expenses.tab
-    kr	1166668	/home/kr/
-
-Disk usage for executable vs non-executable files:
-
-    $ sort input | agg key drop sum join:,
-    -rw-	220053	/home/alice/thesis.tex,/home/bob/expenses.tab
-    -rwx	1166768	/home/alice/bin/crdt,/home/kr/bin/agg,/home/kr/bin/blog
-
-*/
-package main
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/main.go b/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/main.go
deleted file mode 100644
index 4239aa43ca..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/main.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package main
-
-// TODO(kr): tests
-
-import (
-	"bufio"
-	"fmt"
-	"log"
-	"math/rand"
-	"os"
-	"strings"
-	"time"
-)
-
-type agg interface {
-	merge(string)
-	String() string
-}
-
-var (
-	key     = 0
-	funcmap = make(map[int]func(init, arg string) agg)
-	argmap  = make(map[int]string)
-	symtab  = map[string]func(init, arg string) agg{
-		"first":  first,
-		"last":   last,
-		"prefix": prefix,
-		"sample": sample,
-		"join":   join,
-		"smin":   smin,
-		"smax":   smax,
-		"min":    min,
-		"max":    max,
-		"sum":    sum,
-		"mean":   mean,
-		"count":  count,
-		"const":  constf,
-		"drop":   nil,
-	}
-)
-
-func main() {
-	log.SetPrefix("agg: ")
-	log.SetFlags(0)
-	rand.Seed(time.Now().UnixNano())
-	for i, sym := range os.Args[1:] {
-		if p := strings.IndexByte(sym, ':'); p >= 0 {
-			sym, argmap[i] = sym[:p], sym[p+1:]
-		}
-		if sym == "key" {
-			key, sym = i, "first"
-		}
-		f, ok := symtab[sym]
-		if !ok {
-			log.Fatalf("bad function: %q", sym)
-		}
-		funcmap[i] = f
-	}
-
-	sc := bufio.NewScanner(os.Stdin)
-	var g *group
-	for sc.Scan() {
-		ss := strings.Fields(sc.Text())
-		if !matches(g, ss) {
-			emit(g)
-			g = &group{key: ss[key]}
-		}
-		mergeLine(g, ss)
-	}
-	emit(g)
-}
-
-type group struct {
-	key string
-	agg []agg
-}
-
-func matches(g *group, ss []string) bool {
-	return g != nil && g.key == ss[key]
-}
-
-func emit(g *group) {
-	if g == nil {
-		return
-	}
-	rest := false
-	for i, a := range g.agg {
-		if f, ok := funcmap[i]; ok && f == nil {
-			continue
-		}
-		if rest {
-			fmt.Print("\t")
-		}
-		rest = true
-		fmt.Print(a)
-	}
-	fmt.Println()
-}
-
-func mergeLine(g *group, ss []string) {
-	for i, s := range ss {
-		if i >= len(g.agg) {
-			f := funcmap[i]
-			if f == nil {
-				f = first
-			}
-			g.agg = append(g.agg, f(s, argmap[i]))
-		} else {
-			g.agg[i].merge(s)
-		}
-	}
-}
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/num.go b/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/num.go
deleted file mode 100644
index 93ac3fe15e..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/num.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package main
-
-import (
-	"math/big"
-	"strconv"
-)
-
-func min(s, arg string) agg { return newBinop(s, opmin) }
-func max(s, arg string) agg { return newBinop(s, opmax) }
-func sum(s, arg string) agg { return newBinop(s, opsum) }
-
-type binop struct {
-	v *big.Float
-	f func(a, b *big.Float) *big.Float
-}
-
-func newBinop(s string, f func(a, b *big.Float) *big.Float) *binop {
-	v, _ := parseFloat(s)
-	return &binop{v, f}
-}
-
-func (o *binop) String() string {
-	if o.v == nil {
-		return "NaN"
-	}
-	return o.v.Text('f', -1)
-}
-
-func (o *binop) merge(s string) {
-	v, ok := parseFloat(s)
-	if !ok {
-		return
-	}
-	o.v = o.f(o.v, v)
-}
-
-func opmin(a, b *big.Float) *big.Float {
-	if a != nil && (b == nil || a.Cmp(b) <= 0) {
-		return a
-	}
-	return b
-}
-
-func opmax(a, b *big.Float) *big.Float {
-	if a != nil && (b == nil || a.Cmp(b) >= 0) {
-		return a
-	}
-	return b
-}
-
-func opsum(a, b *big.Float) *big.Float {
-	if a == nil {
-		return b
-	} else if b == nil {
-		return a
-	}
-	return a.Add(a, b)
-}
-
-type meanagg struct {
-	v *big.Float
-	d float64 // actually an integer
-}
-
-func mean(s, arg string) agg {
-	v, ok := parseFloat(s)
-	if !ok {
-		return &meanagg{new(big.Float), 0}
-	}
-	return &meanagg{v, 1}
-}
-
-func (m *meanagg) String() string {
-	if m.d == 0 {
-		return "NaN"
-	}
-	v := new(big.Float).Quo(m.v, big.NewFloat(m.d))
-	return v.Text('f', -1)
-}
-
-func (m *meanagg) merge(s string) {
-	v, ok := parseFloat(s)
-	if !ok {
-		return
-	}
-	m.v.Add(m.v, v)
-	m.d++
-}
-
-func parseFloat(s string) (*big.Float, bool) {
-	v, _, err := big.ParseFloat(s, 0, 1000, big.ToNearestEven)
-	return v, err == nil
-}
-
-type counter int
-
-func count(init, arg string) agg  { return new(counter) }
-func (c *counter) String() string { return strconv.Itoa(int(*c) + 1) }
-func (c *counter) merge(string)   { *c++ }
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/string.go b/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/string.go
deleted file mode 100644
index 9a8cf78cae..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/cmd/agg/string.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package main
-
-import (
-	"math/rand"
-	"strings"
-)
-
-func first(s, arg string) agg  { return &sbinop{s, opfirst} }
-func last(s, arg string) agg   { return &sbinop{s, oplast} }
-func prefix(s, arg string) agg { return &sbinop{s, opprefix} }
-func join(s, arg string) agg   { return &sbinop{s, opjoin(arg)} }
-func smin(s, arg string) agg   { return &sbinop{s, opsmin} }
-func smax(s, arg string) agg   { return &sbinop{s, opsmax} }
-
-type sbinop struct {
-	s string
-	f func(a, b string) string
-}
-
-func (o *sbinop) String() string { return o.s }
-
-func (o *sbinop) merge(s string) { o.s = o.f(o.s, s) }
-
-func opfirst(a, b string) string { return a }
-func oplast(a, b string) string  { return b }
-
-func opprefix(a, b string) string {
-	for i := range a {
-		if i >= len(b) || a[i] != b[i] {
-			return a[:i]
-		}
-	}
-	return a
-}
-
-func opjoin(sep string) func(a, b string) string {
-	return func(a, b string) string {
-		return a + sep + b // TODO(kr): too slow? maybe strings.Join?
-	}
-}
-
-func opsmin(a, b string) string {
-	if strings.Compare(a, b) <= 0 {
-		return a
-	}
-	return b
-}
-
-func opsmax(a, b string) string {
-	if strings.Compare(a, b) >= 0 {
-		return a
-	}
-	return b
-}
-
-type sampler struct {
-	n int
-	s string
-}
-
-func sample(s, arg string) agg    { return &sampler{1, s} }
-func (p *sampler) String() string { return p.s }
-func (p *sampler) merge(s string) {
-	p.n++
-	if rand.Intn(p.n) == 0 {
-		p.s = s
-	}
-}
-
-type constant string
-
-func constf(init, arg string) agg { return constant(arg) }
-func (c constant) String() string { return string(c) }
-func (c constant) merge(string)   {}
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/colwriter/column.go b/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/colwriter/column.go
deleted file mode 100644
index 7302ce9f7a..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/kr/text/colwriter/column.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Package colwriter provides a write filter that formats
-// input lines in multiple columns.
-//
-// The package is a straightforward translation from
-// /src/cmd/draw/mc.c in Plan 9 from User Space.
-package colwriter
-
-import (
-	"bytes"
-	"io"
-	"unicode/utf8"
-)
-
-const (
-	tab = 4
-)
-
-const (
-	// Print each input line ending in a colon ':' separately.
-	BreakOnColon uint = 1 << iota
-)
-
-// A Writer is a filter that arranges input lines in as many columns as will
-// fit in its width. Tab '\t' chars in the input are translated to sequences
-// of spaces ending at multiples of 4 positions.
-//
-// If BreakOnColon is set, each input line ending in a colon ':' is written
-// separately.
-//
-// The Writer assumes that all Unicode code points have the same width; this
-// may not be true in some fonts.
-type Writer struct {
-	w     io.Writer
-	buf   []byte
-	width int
-	flag  uint
-}
-
-// NewWriter allocates and initializes a new Writer writing to w.
-// Parameter width controls the total number of characters on each line
-// across all columns.
-func NewWriter(w io.Writer, width int, flag uint) *Writer {
-	return &Writer{
-		w:     w,
-		width: width,
-		flag:  flag,
-	}
-}
-
-// Write writes p to the writer w. The only errors returned are ones
-// encountered while writing to the underlying output stream.
-func (w *Writer) Write(p []byte) (n int, err error) {
-	var linelen int
-	var lastWasColon bool
-	for i, c := range p {
-		w.buf = append(w.buf, c)
-		linelen++
-		if c == '\t' {
-			w.buf[len(w.buf)-1] = ' '
-			for linelen%tab != 0 {
-				w.buf = append(w.buf, ' ')
-				linelen++
-			}
-		}
-		if w.flag&BreakOnColon != 0 && c == ':' {
-			lastWasColon = true
-		} else if lastWasColon {
-			if c == '\n' {
-				pos := bytes.LastIndex(w.buf[:len(w.buf)-1], []byte{'\n'})
-				if pos < 0 {
-					pos = 0
-				}
-				line := w.buf[pos:]
-				w.buf = w.buf[:pos]
-				if err = w.columnate(); err != nil {
-					if len(line) < i {
-						return i - len(line), err
-					}
-					return 0, err
-				}
-				if n, err := w.w.Write(line); err != nil {
-					if r := len(line) - n; r < i {
-						return i - r, err
-					}
-					return 0, err
-				}
-			}
-			lastWasColon = false
-		}
-		if c == '\n' {
-			linelen = 0
-		}
-	}
-	return len(p), nil
-}
-
-// Flush should be called after the last call to Write to ensure that any data
-// buffered in the Writer is written to output.
-func (w *Writer) Flush() error {
-	return w.columnate()
-}
-
-func (w *Writer) columnate() error {
-	words := bytes.Split(w.buf, []byte{'\n'})
-	w.buf = nil
-	if len(words[len(words)-1]) == 0 {
-		words = words[:len(words)-1]
-	}
-	maxwidth := 0
-	for _, wd := range words {
-		if n := utf8.RuneCount(wd); n > maxwidth {
-			maxwidth = n
-		}
-	}
-	maxwidth++ // space char
-	wordsPerLine := w.width / maxwidth
-	if wordsPerLine <= 0 {
-		wordsPerLine = 1
-	}
-	nlines := (len(words) + wordsPerLine - 1) / wordsPerLine
-	for i := 0; i < nlines; i++ {
-		col := 0
-		endcol := 0
-		for j := i; j < len(words); j += nlines {
-			endcol += maxwidth
-			_, err := w.w.Write(words[j])
-			if err != nil {
-				return err
-			}
-			col += utf8.RuneCount(words[j])
-			if j+nlines < len(words) {
-				for col < endcol {
-					_, err := w.w.Write([]byte{' '})
-					if err != nil {
-						return err
-					}
-					col++
-				}
-			}
-		}
-		_, err := w.w.Write([]byte{'\n'})
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/examples/main.go b/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/examples/main.go
deleted file mode 100644
index 6658020ca3..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/examples/main.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-
-	"github.com/vmware/vmw-guestinfo/rpcvmx"
-	"github.com/vmware/vmw-guestinfo/vmcheck"
-)
-
-var (
-	set bool
-	get bool
-)
-
-func init() {
-
-	flag.BoolVar(&set, "set", false, "Sets the guestinfo.KEY with the string VALUE")
-	flag.BoolVar(&get, "get", false, "Returns the config string in the guestinfo.* namespace")
-
-	flag.Parse()
-}
-
-func main() {
-
-	isVM, err := vmcheck.IsVirtualWorld()
-	if err != nil {
-		log.Fatalf("Error: %s", err)
-	}
-
-	if !isVM {
-		log.Fatalf("ERROR: not in a virtual world.")
-	}
-
-	if !set && !get {
-		flag.Usage()
-	}
-
-	config := rpcvmx.NewConfig()
-	if set {
-		if flag.NArg() != 2 {
-			log.Fatalf("ERROR: Please provide guestinfo key / value pair (eg; -set foo bar")
-		}
-		if err := config.SetString(flag.Arg(0), flag.Arg(1)); err != nil {
-			log.Fatalf("ERROR: SetString failed with %s", err)
-		}
-	}
-
-	if get {
-		if flag.NArg() != 1 {
-			log.Fatalf("ERROR: Please provide guestinfo key (eg; -get foo)")
-		}
-		if out, err := config.String(flag.Arg(0), ""); err != nil {
-			log.Fatalf("ERROR: String failed with %s", err)
-		} else {
-			fmt.Printf("%s\n", out)
-		}
-	}
-
-}
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/rpcout/rpcout.go b/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/rpcout/rpcout.go
deleted file mode 100644
index 3b5879b44a..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/rpcout/rpcout.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rpcout
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/vmware/vmw-guestinfo/message"
-)
-
-// ErrRpciFormat represents an invalid result format
-var ErrRpciFormat = errors.New("invalid format for RPCI command result")
-
-const rpciProtocolNum uint32 = 0x49435052
-
-// SendOne is a command-oriented wrapper for SendOneRaw
-func SendOne(format string, a ...interface{}) (reply []byte, ok bool, err error) {
-	request := fmt.Sprintf(format, a...)
-	return SendOneRaw([]byte(request))
-}
-
-// SendOneRaw uses a throw-away RPCOut to send a request
-func SendOneRaw(request []byte) (reply []byte, ok bool, err error) {
-	out := &RPCOut{}
-	if err = out.Start(); err != nil {
-		return
-	}
-	if reply, ok, err = out.Send(request); err != nil {
-		return
-	}
-	if err = out.Stop(); err != nil {
-		return
-	}
-	return
-}
-
-// RPCOut is an ougoing connection from the VM to the hypervisor
-type RPCOut struct {
-	channel *message.Channel
-}
-
-// Start opens the connection
-func (out *RPCOut) Start() error {
-	channel, err := message.NewChannel(rpciProtocolNum)
-	if err != nil {
-		return err
-	}
-	out.channel = channel
-	return nil
-}
-
-// Stop closes the connection
-func (out *RPCOut) Stop() error {
-	err := out.channel.Close()
-	out.channel = nil
-	return err
-}
-
-// Send emits a request and receives a response
-func (out *RPCOut) Send(request []byte) (reply []byte, ok bool, err error) {
-	if err = out.channel.Send(request); err != nil {
-		return
-	}
-
-	var resp []byte
-	if resp, err = out.channel.Receive(); err != nil {
-		return
-	}
-
-	switch string(resp[:2]) {
-	case "0 ":
-		reply = resp[2:]
-	case "1 ":
-		reply = resp[2:]
-		ok = true
-	default:
-		err = ErrRpciFormat
-	}
-	return
-}
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/rpcvmx/rpcvmx.go b/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/rpcvmx/rpcvmx.go
deleted file mode 100644
index a832ad7fbb..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/rpcvmx/rpcvmx.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rpcvmx
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/vmware/vmw-guestinfo/rpcout"
-)
-
-const (
-	prefix = "guestinfo"
-)
-
-// Config gives access to the vmx config through the VMware backdoor
-type Config struct{}
-
-// NewConfig creates a new Config object
-func NewConfig() *Config {
-	return &Config{}
-}
-
-// String returns the config string in the guestinfo.* namespace
-func (c *Config) String(key string, defaultValue string) (string, error) {
-	// add "guestinfo." prefix if missing
-	if !strings.HasPrefix(key, prefix) {
-		key = fmt.Sprintf("%s.%s", prefix, key)
-	}
-
-	out, ok, err := rpcout.SendOne("info-get %s", key)
-	if err != nil {
-		return "", err
-	} else if !ok {
-		return defaultValue, nil
-	}
-	return string(out), nil
-}
-
-// Bool returns the config boolean in the guestinfo.* namespace
-func (c *Config) Bool(key string, defaultValue bool) (bool, error) {
-	val, err := c.String(key, fmt.Sprintf("%t", defaultValue))
-	if err != nil {
-		return false, err
-	}
-	res, err := strconv.ParseBool(val)
-	if err != nil {
-		return defaultValue, nil
-	}
-	return res, nil
-}
-
-// Int returns the config integer in the guestinfo.* namespace
-func (c *Config) Int(key string, defaultValue int) (int, error) {
-	val, err := c.String(key, "")
-	if err != nil {
-		return 0, err
-	}
-	res, err := strconv.Atoi(val)
-	if err != nil {
-		return defaultValue, nil
-	}
-	return res, nil
-}
-
-// SetString sets the guestinfo.KEY with the string VALUE
-func (c *Config) SetString(key string, value string) error {
-	// add "guestinfo." prefix if missing
-	if !strings.HasPrefix(key, prefix) {
-		key = fmt.Sprintf("%s.%s", prefix, key)
-	}
-
-	_, _, err := rpcout.SendOne("info-set %s %s", key, value)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// SetString sets the guestinfo.KEY with the bool VALUE
-func (c *Config) SetBool(key string, value bool) error {
-	return c.SetString(key, strconv.FormatBool(value))
-}
-
-// SetString sets the guestinfo.KEY with the int VALUE
-func (c *Config) SetInt(key string, value int) error {
-	return c.SetString(key, strconv.Itoa(value))
-}
diff --git a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/util/util.go b/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/util/util.go
deleted file mode 100644
index 7445c0b3ce..0000000000
--- a/vendor/github.com/vmware/govmomi/vendor/github.com/vmware/vmw-guestinfo/util/util.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"reflect"
-	"runtime"
-	"testing"
-)
-
-// Test utilities.
-
-func AssertEqual(t *testing.T, a interface{}, b interface{}) bool {
-	if !reflect.DeepEqual(a, b) {
-		Fail(t)
-		return false
-	}
-
-	return true
-}
-
-func AssertNoError(t *testing.T, err error) bool {
-	if err != nil {
-		t.Logf("error :%s", err.Error())
-		Fail(t)
-		return false
-	}
-
-	return true
-}
-
-func AssertNotNil(t *testing.T, a interface{}) bool {
-	val := reflect.ValueOf(a)
-	if val.IsNil() {
-		Fail(t)
-		return false
-	}
-
-	return true
-}
-
-func Fail(t *testing.T) {
-	_, file, line, _ := runtime.Caller(2)
-	t.Logf("FAIL on %s:%d", file, line)
-	t.Fail()
-}
diff --git a/vendor/github.com/vmware/govmomi/vim25/client.go b/vendor/github.com/vmware/govmomi/vim25/client.go
index 1289f33ef0..1d26fb8b6a 100644
--- a/vendor/github.com/vmware/govmomi/vim25/client.go
+++ b/vendor/github.com/vmware/govmomi/vim25/client.go
@@ -19,12 +19,26 @@ package vim25
 import (
 	"context"
 	"encoding/json"
+	"strings"
 
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
 )
 
+const (
+	Namespace = "vim25"
+	Version   = "6.7"
+	Path      = "/sdk"
+)
+
+var (
+	ServiceInstance = types.ManagedObjectReference{
+		Type:  "ServiceInstance",
+		Value: "ServiceInstance",
+	}
+)
+
 // Client is a tiny wrapper around the vim25/soap Client that stores session
 // specific state (i.e. state that only needs to be retrieved once after the
 // client has been created). This means the client can be reused after
@@ -43,19 +57,28 @@ type Client struct {
 // NewClient creates and returns a new client wirh the ServiceContent field
 // filled in.
 func NewClient(ctx context.Context, rt soap.RoundTripper) (*Client, error) {
-	serviceContent, err := methods.GetServiceContent(ctx, rt)
-	if err != nil {
-		return nil, err
-	}
-
 	c := Client{
-		ServiceContent: serviceContent,
-		RoundTripper:   rt,
+		RoundTripper: rt,
 	}
 
 	// Set client if it happens to be a soap.Client
 	if sc, ok := rt.(*soap.Client); ok {
 		c.Client = sc
+
+		if c.Namespace == "" {
+			c.Namespace = "urn:" + Namespace
+		} else if strings.Index(c.Namespace, ":") < 0 {
+			c.Namespace = "urn:" + c.Namespace // ensure valid URI format
+		}
+		if c.Version == "" {
+			c.Version = Version
+		}
+	}
+
+	var err error
+	c.ServiceContent, err = methods.GetServiceContent(ctx, rt)
+	if err != nil {
+		return nil, err
 	}
 
 	return &c, nil
diff --git a/vendor/github.com/vmware/govmomi/vim25/methods/methods.go b/vendor/github.com/vmware/govmomi/vim25/methods/methods.go
index 0895a81c60..c3ad23eefb 100644
--- a/vendor/github.com/vmware/govmomi/vim25/methods/methods.go
+++ b/vendor/github.com/vmware/govmomi/vim25/methods/methods.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -683,6 +683,26 @@ func ApplyEntitiesConfig_Task(ctx context.Context, r soap.RoundTripper, req *typ
 	return resBody.Res, nil
 }
 
+type ApplyEvcModeVM_TaskBody struct {
+	Req    *types.ApplyEvcModeVM_Task         `xml:"urn:vim25 ApplyEvcModeVM_Task,omitempty"`
+	Res    *types.ApplyEvcModeVM_TaskResponse `xml:"urn:vim25 ApplyEvcModeVM_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ApplyEvcModeVM_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ApplyEvcModeVM_Task(ctx context.Context, r soap.RoundTripper, req *types.ApplyEvcModeVM_Task) (*types.ApplyEvcModeVM_TaskResponse, error) {
+	var reqBody, resBody ApplyEvcModeVM_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ApplyHostConfig_TaskBody struct {
 	Req    *types.ApplyHostConfig_Task         `xml:"urn:vim25 ApplyHostConfig_Task,omitempty"`
 	Res    *types.ApplyHostConfig_TaskResponse `xml:"urn:vim25 ApplyHostConfig_TaskResponse,omitempty"`
@@ -1243,6 +1263,26 @@ func ChangeFileAttributesInGuest(ctx context.Context, r soap.RoundTripper, req *
 	return resBody.Res, nil
 }
 
+type ChangeKey_TaskBody struct {
+	Req    *types.ChangeKey_Task         `xml:"urn:vim25 ChangeKey_Task,omitempty"`
+	Res    *types.ChangeKey_TaskResponse `xml:"urn:vim25 ChangeKey_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ChangeKey_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ChangeKey_Task(ctx context.Context, r soap.RoundTripper, req *types.ChangeKey_Task) (*types.ChangeKey_TaskResponse, error) {
+	var reqBody, resBody ChangeKey_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ChangeLockdownModeBody struct {
 	Req    *types.ChangeLockdownMode         `xml:"urn:vim25 ChangeLockdownMode,omitempty"`
 	Res    *types.ChangeLockdownModeResponse `xml:"urn:vim25 ChangeLockdownModeResponse,omitempty"`
@@ -1343,6 +1383,26 @@ func CheckAnswerFileStatus_Task(ctx context.Context, r soap.RoundTripper, req *t
 	return resBody.Res, nil
 }
 
+type CheckClone_TaskBody struct {
+	Req    *types.CheckClone_Task         `xml:"urn:vim25 CheckClone_Task,omitempty"`
+	Res    *types.CheckClone_TaskResponse `xml:"urn:vim25 CheckClone_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckClone_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckClone_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckClone_Task) (*types.CheckClone_TaskResponse, error) {
+	var reqBody, resBody CheckClone_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CheckCompatibility_TaskBody struct {
 	Req    *types.CheckCompatibility_Task         `xml:"urn:vim25 CheckCompatibility_Task,omitempty"`
 	Res    *types.CheckCompatibility_TaskResponse `xml:"urn:vim25 CheckCompatibility_TaskResponse,omitempty"`
@@ -1483,6 +1543,26 @@ func CheckHostPatch_Task(ctx context.Context, r soap.RoundTripper, req *types.Ch
 	return resBody.Res, nil
 }
 
+type CheckInstantClone_TaskBody struct {
+	Req    *types.CheckInstantClone_Task         `xml:"urn:vim25 CheckInstantClone_Task,omitempty"`
+	Res    *types.CheckInstantClone_TaskResponse `xml:"urn:vim25 CheckInstantClone_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckInstantClone_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckInstantClone_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckInstantClone_Task) (*types.CheckInstantClone_TaskResponse, error) {
+	var reqBody, resBody CheckInstantClone_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CheckLicenseFeatureBody struct {
 	Req    *types.CheckLicenseFeature         `xml:"urn:vim25 CheckLicenseFeature,omitempty"`
 	Res    *types.CheckLicenseFeatureResponse `xml:"urn:vim25 CheckLicenseFeatureResponse,omitempty"`
@@ -1523,6 +1603,26 @@ func CheckMigrate_Task(ctx context.Context, r soap.RoundTripper, req *types.Chec
 	return resBody.Res, nil
 }
 
+type CheckPowerOn_TaskBody struct {
+	Req    *types.CheckPowerOn_Task         `xml:"urn:vim25 CheckPowerOn_Task,omitempty"`
+	Res    *types.CheckPowerOn_TaskResponse `xml:"urn:vim25 CheckPowerOn_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckPowerOn_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckPowerOn_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckPowerOn_Task) (*types.CheckPowerOn_TaskResponse, error) {
+	var reqBody, resBody CheckPowerOn_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CheckProfileCompliance_TaskBody struct {
 	Req    *types.CheckProfileCompliance_Task         `xml:"urn:vim25 CheckProfileCompliance_Task,omitempty"`
 	Res    *types.CheckProfileCompliance_TaskResponse `xml:"urn:vim25 CheckProfileCompliance_TaskResponse,omitempty"`
@@ -1563,6 +1663,26 @@ func CheckRelocate_Task(ctx context.Context, r soap.RoundTripper, req *types.Che
 	return resBody.Res, nil
 }
 
+type CheckVmConfig_TaskBody struct {
+	Req    *types.CheckVmConfig_Task         `xml:"urn:vim25 CheckVmConfig_Task,omitempty"`
+	Res    *types.CheckVmConfig_TaskResponse `xml:"urn:vim25 CheckVmConfig_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CheckVmConfig_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CheckVmConfig_Task(ctx context.Context, r soap.RoundTripper, req *types.CheckVmConfig_Task) (*types.CheckVmConfig_TaskResponse, error) {
+	var reqBody, resBody CheckVmConfig_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ClearComplianceStatusBody struct {
 	Req    *types.ClearComplianceStatus         `xml:"urn:vim25 ClearComplianceStatus,omitempty"`
 	Res    *types.ClearComplianceStatusResponse `xml:"urn:vim25 ClearComplianceStatusResponse,omitempty"`
@@ -1623,6 +1743,46 @@ func ClearSystemEventLog(ctx context.Context, r soap.RoundTripper, req *types.Cl
 	return resBody.Res, nil
 }
 
+type ClearTriggeredAlarmsBody struct {
+	Req    *types.ClearTriggeredAlarms         `xml:"urn:vim25 ClearTriggeredAlarms,omitempty"`
+	Res    *types.ClearTriggeredAlarmsResponse `xml:"urn:vim25 ClearTriggeredAlarmsResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ClearTriggeredAlarmsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ClearTriggeredAlarms(ctx context.Context, r soap.RoundTripper, req *types.ClearTriggeredAlarms) (*types.ClearTriggeredAlarmsResponse, error) {
+	var reqBody, resBody ClearTriggeredAlarmsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ClearVStorageObjectControlFlagsBody struct {
+	Req    *types.ClearVStorageObjectControlFlags         `xml:"urn:vim25 ClearVStorageObjectControlFlags,omitempty"`
+	Res    *types.ClearVStorageObjectControlFlagsResponse `xml:"urn:vim25 ClearVStorageObjectControlFlagsResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ClearVStorageObjectControlFlagsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ClearVStorageObjectControlFlags(ctx context.Context, r soap.RoundTripper, req *types.ClearVStorageObjectControlFlags) (*types.ClearVStorageObjectControlFlagsResponse, error) {
+	var reqBody, resBody ClearVStorageObjectControlFlagsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CloneSessionBody struct {
 	Req    *types.CloneSession         `xml:"urn:vim25 CloneSession,omitempty"`
 	Res    *types.CloneSessionResponse `xml:"urn:vim25 CloneSessionResponse,omitempty"`
@@ -1743,6 +1903,26 @@ func ClusterEnterMaintenanceMode(ctx context.Context, r soap.RoundTripper, req *
 	return resBody.Res, nil
 }
 
+type CompositeHostProfile_TaskBody struct {
+	Req    *types.CompositeHostProfile_Task         `xml:"urn:vim25 CompositeHostProfile_Task,omitempty"`
+	Res    *types.CompositeHostProfile_TaskResponse `xml:"urn:vim25 CompositeHostProfile_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CompositeHostProfile_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CompositeHostProfile_Task(ctx context.Context, r soap.RoundTripper, req *types.CompositeHostProfile_Task) (*types.CompositeHostProfile_TaskResponse, error) {
+	var reqBody, resBody CompositeHostProfile_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ComputeDiskPartitionInfoBody struct {
 	Req    *types.ComputeDiskPartitionInfo         `xml:"urn:vim25 ComputeDiskPartitionInfo,omitempty"`
 	Res    *types.ComputeDiskPartitionInfoResponse `xml:"urn:vim25 ComputeDiskPartitionInfoResponse,omitempty"`
@@ -2363,6 +2543,26 @@ func CreateDirectory(ctx context.Context, r soap.RoundTripper, req *types.Create
 	return resBody.Res, nil
 }
 
+type CreateDiskFromSnapshot_TaskBody struct {
+	Req    *types.CreateDiskFromSnapshot_Task         `xml:"urn:vim25 CreateDiskFromSnapshot_Task,omitempty"`
+	Res    *types.CreateDiskFromSnapshot_TaskResponse `xml:"urn:vim25 CreateDiskFromSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateDiskFromSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateDiskFromSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateDiskFromSnapshot_Task) (*types.CreateDiskFromSnapshot_TaskResponse, error) {
+	var reqBody, resBody CreateDiskFromSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CreateDisk_TaskBody struct {
 	Req    *types.CreateDisk_Task         `xml:"urn:vim25 CreateDisk_Task,omitempty"`
 	Res    *types.CreateDisk_TaskResponse `xml:"urn:vim25 CreateDisk_TaskResponse,omitempty"`
@@ -2583,6 +2783,26 @@ func CreateNasDatastore(ctx context.Context, r soap.RoundTripper, req *types.Cre
 	return resBody.Res, nil
 }
 
+type CreateNvdimmNamespace_TaskBody struct {
+	Req    *types.CreateNvdimmNamespace_Task         `xml:"urn:vim25 CreateNvdimmNamespace_Task,omitempty"`
+	Res    *types.CreateNvdimmNamespace_TaskResponse `xml:"urn:vim25 CreateNvdimmNamespace_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateNvdimmNamespace_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateNvdimmNamespace_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateNvdimmNamespace_Task) (*types.CreateNvdimmNamespace_TaskResponse, error) {
+	var reqBody, resBody CreateNvdimmNamespace_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CreateObjectScheduledTaskBody struct {
 	Req    *types.CreateObjectScheduledTask         `xml:"urn:vim25 CreateObjectScheduledTask,omitempty"`
 	Res    *types.CreateObjectScheduledTaskResponse `xml:"urn:vim25 CreateObjectScheduledTaskResponse,omitempty"`
@@ -3023,6 +3243,66 @@ func CreateVvolDatastore(ctx context.Context, r soap.RoundTripper, req *types.Cr
 	return resBody.Res, nil
 }
 
+type CryptoManagerHostEnableBody struct {
+	Req    *types.CryptoManagerHostEnable         `xml:"urn:vim25 CryptoManagerHostEnable,omitempty"`
+	Res    *types.CryptoManagerHostEnableResponse `xml:"urn:vim25 CryptoManagerHostEnableResponse,omitempty"`
+	Fault_ *soap.Fault                            `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CryptoManagerHostEnableBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CryptoManagerHostEnable(ctx context.Context, r soap.RoundTripper, req *types.CryptoManagerHostEnable) (*types.CryptoManagerHostEnableResponse, error) {
+	var reqBody, resBody CryptoManagerHostEnableBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CryptoManagerHostPrepareBody struct {
+	Req    *types.CryptoManagerHostPrepare         `xml:"urn:vim25 CryptoManagerHostPrepare,omitempty"`
+	Res    *types.CryptoManagerHostPrepareResponse `xml:"urn:vim25 CryptoManagerHostPrepareResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CryptoManagerHostPrepareBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CryptoManagerHostPrepare(ctx context.Context, r soap.RoundTripper, req *types.CryptoManagerHostPrepare) (*types.CryptoManagerHostPrepareResponse, error) {
+	var reqBody, resBody CryptoManagerHostPrepareBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CryptoUnlock_TaskBody struct {
+	Req    *types.CryptoUnlock_Task         `xml:"urn:vim25 CryptoUnlock_Task,omitempty"`
+	Res    *types.CryptoUnlock_TaskResponse `xml:"urn:vim25 CryptoUnlock_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CryptoUnlock_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CryptoUnlock_Task(ctx context.Context, r soap.RoundTripper, req *types.CryptoUnlock_Task) (*types.CryptoUnlock_TaskResponse, error) {
+	var reqBody, resBody CryptoUnlock_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type CurrentTimeBody struct {
 	Req    *types.CurrentTime         `xml:"urn:vim25 CurrentTime,omitempty"`
 	Res    *types.CurrentTimeResponse `xml:"urn:vim25 CurrentTimeResponse,omitempty"`
@@ -3443,6 +3723,46 @@ func DeleteHostSubSpecification(ctx context.Context, r soap.RoundTripper, req *t
 	return resBody.Res, nil
 }
 
+type DeleteNvdimmBlockNamespaces_TaskBody struct {
+	Req    *types.DeleteNvdimmBlockNamespaces_Task         `xml:"urn:vim25 DeleteNvdimmBlockNamespaces_Task,omitempty"`
+	Res    *types.DeleteNvdimmBlockNamespaces_TaskResponse `xml:"urn:vim25 DeleteNvdimmBlockNamespaces_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteNvdimmBlockNamespaces_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteNvdimmBlockNamespaces_Task(ctx context.Context, r soap.RoundTripper, req *types.DeleteNvdimmBlockNamespaces_Task) (*types.DeleteNvdimmBlockNamespaces_TaskResponse, error) {
+	var reqBody, resBody DeleteNvdimmBlockNamespaces_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeleteNvdimmNamespace_TaskBody struct {
+	Req    *types.DeleteNvdimmNamespace_Task         `xml:"urn:vim25 DeleteNvdimmNamespace_Task,omitempty"`
+	Res    *types.DeleteNvdimmNamespace_TaskResponse `xml:"urn:vim25 DeleteNvdimmNamespace_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteNvdimmNamespace_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteNvdimmNamespace_Task(ctx context.Context, r soap.RoundTripper, req *types.DeleteNvdimmNamespace_Task) (*types.DeleteNvdimmNamespace_TaskResponse, error) {
+	var reqBody, resBody DeleteNvdimmNamespace_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type DeleteRegistryKeyInGuestBody struct {
 	Req    *types.DeleteRegistryKeyInGuest         `xml:"urn:vim25 DeleteRegistryKeyInGuest,omitempty"`
 	Res    *types.DeleteRegistryKeyInGuestResponse `xml:"urn:vim25 DeleteRegistryKeyInGuestResponse,omitempty"`
@@ -3503,6 +3823,26 @@ func DeleteScsiLunState(ctx context.Context, r soap.RoundTripper, req *types.Del
 	return resBody.Res, nil
 }
 
+type DeleteSnapshot_TaskBody struct {
+	Req    *types.DeleteSnapshot_Task         `xml:"urn:vim25 DeleteSnapshot_Task,omitempty"`
+	Res    *types.DeleteSnapshot_TaskResponse `xml:"urn:vim25 DeleteSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeleteSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeleteSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.DeleteSnapshot_Task) (*types.DeleteSnapshot_TaskResponse, error) {
+	var reqBody, resBody DeleteSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type DeleteVStorageObject_TaskBody struct {
 	Req    *types.DeleteVStorageObject_Task         `xml:"urn:vim25 DeleteVStorageObject_Task,omitempty"`
 	Res    *types.DeleteVStorageObject_TaskResponse `xml:"urn:vim25 DeleteVStorageObject_TaskResponse,omitempty"`
@@ -5643,6 +5983,26 @@ func HasUserPrivilegeOnEntities(ctx context.Context, r soap.RoundTripper, req *t
 	return resBody.Res, nil
 }
 
+type HostClearVStorageObjectControlFlagsBody struct {
+	Req    *types.HostClearVStorageObjectControlFlags         `xml:"urn:vim25 HostClearVStorageObjectControlFlags,omitempty"`
+	Res    *types.HostClearVStorageObjectControlFlagsResponse `xml:"urn:vim25 HostClearVStorageObjectControlFlagsResponse,omitempty"`
+	Fault_ *soap.Fault                                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostClearVStorageObjectControlFlagsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostClearVStorageObjectControlFlags(ctx context.Context, r soap.RoundTripper, req *types.HostClearVStorageObjectControlFlags) (*types.HostClearVStorageObjectControlFlagsResponse, error) {
+	var reqBody, resBody HostClearVStorageObjectControlFlagsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type HostCloneVStorageObject_TaskBody struct {
 	Req    *types.HostCloneVStorageObject_Task         `xml:"urn:vim25 HostCloneVStorageObject_Task,omitempty"`
 	Res    *types.HostCloneVStorageObject_TaskResponse `xml:"urn:vim25 HostCloneVStorageObject_TaskResponse,omitempty"`
@@ -5863,10 +6223,30 @@ func HostListVStorageObject(ctx context.Context, r soap.RoundTripper, req *types
 	return resBody.Res, nil
 }
 
-type HostReconcileDatastoreInventory_TaskBody struct {
-	Req    *types.HostReconcileDatastoreInventory_Task         `xml:"urn:vim25 HostReconcileDatastoreInventory_Task,omitempty"`
-	Res    *types.HostReconcileDatastoreInventory_TaskResponse `xml:"urn:vim25 HostReconcileDatastoreInventory_TaskResponse,omitempty"`
-	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+type HostProfileResetValidationStateBody struct {
+	Req    *types.HostProfileResetValidationState         `xml:"urn:vim25 HostProfileResetValidationState,omitempty"`
+	Res    *types.HostProfileResetValidationStateResponse `xml:"urn:vim25 HostProfileResetValidationStateResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostProfileResetValidationStateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostProfileResetValidationState(ctx context.Context, r soap.RoundTripper, req *types.HostProfileResetValidationState) (*types.HostProfileResetValidationStateResponse, error) {
+	var reqBody, resBody HostProfileResetValidationStateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostReconcileDatastoreInventory_TaskBody struct {
+	Req    *types.HostReconcileDatastoreInventory_Task         `xml:"urn:vim25 HostReconcileDatastoreInventory_Task,omitempty"`
+	Res    *types.HostReconcileDatastoreInventory_TaskResponse `xml:"urn:vim25 HostReconcileDatastoreInventory_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
 
 func (b *HostReconcileDatastoreInventory_TaskBody) Fault() *soap.Fault { return b.Fault_ }
@@ -5963,6 +6343,26 @@ func HostRenameVStorageObject(ctx context.Context, r soap.RoundTripper, req *typ
 	return resBody.Res, nil
 }
 
+type HostRetrieveVStorageInfrastructureObjectPolicyBody struct {
+	Req    *types.HostRetrieveVStorageInfrastructureObjectPolicy         `xml:"urn:vim25 HostRetrieveVStorageInfrastructureObjectPolicy,omitempty"`
+	Res    *types.HostRetrieveVStorageInfrastructureObjectPolicyResponse `xml:"urn:vim25 HostRetrieveVStorageInfrastructureObjectPolicyResponse,omitempty"`
+	Fault_ *soap.Fault                                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostRetrieveVStorageInfrastructureObjectPolicyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostRetrieveVStorageInfrastructureObjectPolicy(ctx context.Context, r soap.RoundTripper, req *types.HostRetrieveVStorageInfrastructureObjectPolicy) (*types.HostRetrieveVStorageInfrastructureObjectPolicyResponse, error) {
+	var reqBody, resBody HostRetrieveVStorageInfrastructureObjectPolicyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type HostRetrieveVStorageObjectBody struct {
 	Req    *types.HostRetrieveVStorageObject         `xml:"urn:vim25 HostRetrieveVStorageObject,omitempty"`
 	Res    *types.HostRetrieveVStorageObjectResponse `xml:"urn:vim25 HostRetrieveVStorageObjectResponse,omitempty"`
@@ -6023,6 +6423,26 @@ func HostScheduleReconcileDatastoreInventory(ctx context.Context, r soap.RoundTr
 	return resBody.Res, nil
 }
 
+type HostSetVStorageObjectControlFlagsBody struct {
+	Req    *types.HostSetVStorageObjectControlFlags         `xml:"urn:vim25 HostSetVStorageObjectControlFlags,omitempty"`
+	Res    *types.HostSetVStorageObjectControlFlagsResponse `xml:"urn:vim25 HostSetVStorageObjectControlFlagsResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostSetVStorageObjectControlFlagsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostSetVStorageObjectControlFlags(ctx context.Context, r soap.RoundTripper, req *types.HostSetVStorageObjectControlFlags) (*types.HostSetVStorageObjectControlFlagsResponse, error) {
+	var reqBody, resBody HostSetVStorageObjectControlFlagsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type HostSpecGetUpdatedHostsBody struct {
 	Req    *types.HostSpecGetUpdatedHosts         `xml:"urn:vim25 HostSpecGetUpdatedHosts,omitempty"`
 	Res    *types.HostSpecGetUpdatedHostsResponse `xml:"urn:vim25 HostSpecGetUpdatedHostsResponse,omitempty"`
@@ -6043,6 +6463,106 @@ func HostSpecGetUpdatedHosts(ctx context.Context, r soap.RoundTripper, req *type
 	return resBody.Res, nil
 }
 
+type HostVStorageObjectCreateDiskFromSnapshot_TaskBody struct {
+	Req    *types.HostVStorageObjectCreateDiskFromSnapshot_Task         `xml:"urn:vim25 HostVStorageObjectCreateDiskFromSnapshot_Task,omitempty"`
+	Res    *types.HostVStorageObjectCreateDiskFromSnapshot_TaskResponse `xml:"urn:vim25 HostVStorageObjectCreateDiskFromSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostVStorageObjectCreateDiskFromSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostVStorageObjectCreateDiskFromSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.HostVStorageObjectCreateDiskFromSnapshot_Task) (*types.HostVStorageObjectCreateDiskFromSnapshot_TaskResponse, error) {
+	var reqBody, resBody HostVStorageObjectCreateDiskFromSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostVStorageObjectCreateSnapshot_TaskBody struct {
+	Req    *types.HostVStorageObjectCreateSnapshot_Task         `xml:"urn:vim25 HostVStorageObjectCreateSnapshot_Task,omitempty"`
+	Res    *types.HostVStorageObjectCreateSnapshot_TaskResponse `xml:"urn:vim25 HostVStorageObjectCreateSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostVStorageObjectCreateSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostVStorageObjectCreateSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.HostVStorageObjectCreateSnapshot_Task) (*types.HostVStorageObjectCreateSnapshot_TaskResponse, error) {
+	var reqBody, resBody HostVStorageObjectCreateSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostVStorageObjectDeleteSnapshot_TaskBody struct {
+	Req    *types.HostVStorageObjectDeleteSnapshot_Task         `xml:"urn:vim25 HostVStorageObjectDeleteSnapshot_Task,omitempty"`
+	Res    *types.HostVStorageObjectDeleteSnapshot_TaskResponse `xml:"urn:vim25 HostVStorageObjectDeleteSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostVStorageObjectDeleteSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostVStorageObjectDeleteSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.HostVStorageObjectDeleteSnapshot_Task) (*types.HostVStorageObjectDeleteSnapshot_TaskResponse, error) {
+	var reqBody, resBody HostVStorageObjectDeleteSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostVStorageObjectRetrieveSnapshotInfoBody struct {
+	Req    *types.HostVStorageObjectRetrieveSnapshotInfo         `xml:"urn:vim25 HostVStorageObjectRetrieveSnapshotInfo,omitempty"`
+	Res    *types.HostVStorageObjectRetrieveSnapshotInfoResponse `xml:"urn:vim25 HostVStorageObjectRetrieveSnapshotInfoResponse,omitempty"`
+	Fault_ *soap.Fault                                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostVStorageObjectRetrieveSnapshotInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostVStorageObjectRetrieveSnapshotInfo(ctx context.Context, r soap.RoundTripper, req *types.HostVStorageObjectRetrieveSnapshotInfo) (*types.HostVStorageObjectRetrieveSnapshotInfoResponse, error) {
+	var reqBody, resBody HostVStorageObjectRetrieveSnapshotInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HostVStorageObjectRevert_TaskBody struct {
+	Req    *types.HostVStorageObjectRevert_Task         `xml:"urn:vim25 HostVStorageObjectRevert_Task,omitempty"`
+	Res    *types.HostVStorageObjectRevert_TaskResponse `xml:"urn:vim25 HostVStorageObjectRevert_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HostVStorageObjectRevert_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HostVStorageObjectRevert_Task(ctx context.Context, r soap.RoundTripper, req *types.HostVStorageObjectRevert_Task) (*types.HostVStorageObjectRevert_TaskResponse, error) {
+	var reqBody, resBody HostVStorageObjectRevert_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type HttpNfcLeaseAbortBody struct {
 	Req    *types.HttpNfcLeaseAbort         `xml:"urn:vim25 HttpNfcLeaseAbort,omitempty"`
 	Res    *types.HttpNfcLeaseAbortResponse `xml:"urn:vim25 HttpNfcLeaseAbortResponse,omitempty"`
@@ -6123,6 +6643,46 @@ func HttpNfcLeaseProgress(ctx context.Context, r soap.RoundTripper, req *types.H
 	return resBody.Res, nil
 }
 
+type HttpNfcLeasePullFromUrls_TaskBody struct {
+	Req    *types.HttpNfcLeasePullFromUrls_Task         `xml:"urn:vim25 HttpNfcLeasePullFromUrls_Task,omitempty"`
+	Res    *types.HttpNfcLeasePullFromUrls_TaskResponse `xml:"urn:vim25 HttpNfcLeasePullFromUrls_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HttpNfcLeasePullFromUrls_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HttpNfcLeasePullFromUrls_Task(ctx context.Context, r soap.RoundTripper, req *types.HttpNfcLeasePullFromUrls_Task) (*types.HttpNfcLeasePullFromUrls_TaskResponse, error) {
+	var reqBody, resBody HttpNfcLeasePullFromUrls_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type HttpNfcLeaseSetManifestChecksumTypeBody struct {
+	Req    *types.HttpNfcLeaseSetManifestChecksumType         `xml:"urn:vim25 HttpNfcLeaseSetManifestChecksumType,omitempty"`
+	Res    *types.HttpNfcLeaseSetManifestChecksumTypeResponse `xml:"urn:vim25 HttpNfcLeaseSetManifestChecksumTypeResponse,omitempty"`
+	Fault_ *soap.Fault                                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *HttpNfcLeaseSetManifestChecksumTypeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func HttpNfcLeaseSetManifestChecksumType(ctx context.Context, r soap.RoundTripper, req *types.HttpNfcLeaseSetManifestChecksumType) (*types.HttpNfcLeaseSetManifestChecksumTypeResponse, error) {
+	var reqBody, resBody HttpNfcLeaseSetManifestChecksumTypeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ImpersonateUserBody struct {
 	Req    *types.ImpersonateUser         `xml:"urn:vim25 ImpersonateUser,omitempty"`
 	Res    *types.ImpersonateUserResponse `xml:"urn:vim25 ImpersonateUserResponse,omitempty"`
@@ -6403,6 +6963,26 @@ func InstallSmartCardTrustAnchor(ctx context.Context, r soap.RoundTripper, req *
 	return resBody.Res, nil
 }
 
+type InstantClone_TaskBody struct {
+	Req    *types.InstantClone_Task         `xml:"urn:vim25 InstantClone_Task,omitempty"`
+	Res    *types.InstantClone_TaskResponse `xml:"urn:vim25 InstantClone_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstantClone_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstantClone_Task(ctx context.Context, r soap.RoundTripper, req *types.InstantClone_Task) (*types.InstantClone_TaskResponse, error) {
+	var reqBody, resBody InstantClone_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type IsSharedGraphicsActiveBody struct {
 	Req    *types.IsSharedGraphicsActive         `xml:"urn:vim25 IsSharedGraphicsActive,omitempty"`
 	Res    *types.IsSharedGraphicsActiveResponse `xml:"urn:vim25 IsSharedGraphicsActiveResponse,omitempty"`
@@ -10923,6 +11503,26 @@ func RefreshStorageDrsRecommendation(ctx context.Context, r soap.RoundTripper, r
 	return resBody.Res, nil
 }
 
+type RefreshStorageDrsRecommendationsForPod_TaskBody struct {
+	Req    *types.RefreshStorageDrsRecommendationsForPod_Task         `xml:"urn:vim25 RefreshStorageDrsRecommendationsForPod_Task,omitempty"`
+	Res    *types.RefreshStorageDrsRecommendationsForPod_TaskResponse `xml:"urn:vim25 RefreshStorageDrsRecommendationsForPod_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RefreshStorageDrsRecommendationsForPod_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RefreshStorageDrsRecommendationsForPod_Task(ctx context.Context, r soap.RoundTripper, req *types.RefreshStorageDrsRecommendationsForPod_Task) (*types.RefreshStorageDrsRecommendationsForPod_TaskResponse, error) {
+	var reqBody, resBody RefreshStorageDrsRecommendationsForPod_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type RefreshStorageInfoBody struct {
 	Req    *types.RefreshStorageInfo         `xml:"urn:vim25 RefreshStorageInfo,omitempty"`
 	Res    *types.RefreshStorageInfoResponse `xml:"urn:vim25 RefreshStorageInfoResponse,omitempty"`
@@ -12963,6 +13563,26 @@ func RetrieveServiceContent(ctx context.Context, r soap.RoundTripper, req *types
 	return resBody.Res, nil
 }
 
+type RetrieveSnapshotInfoBody struct {
+	Req    *types.RetrieveSnapshotInfo         `xml:"urn:vim25 RetrieveSnapshotInfo,omitempty"`
+	Res    *types.RetrieveSnapshotInfoResponse `xml:"urn:vim25 RetrieveSnapshotInfoResponse,omitempty"`
+	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveSnapshotInfoBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveSnapshotInfo(ctx context.Context, r soap.RoundTripper, req *types.RetrieveSnapshotInfo) (*types.RetrieveSnapshotInfoResponse, error) {
+	var reqBody, resBody RetrieveSnapshotInfoBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type RetrieveUserGroupsBody struct {
 	Req    *types.RetrieveUserGroups         `xml:"urn:vim25 RetrieveUserGroups,omitempty"`
 	Res    *types.RetrieveUserGroupsResponse `xml:"urn:vim25 RetrieveUserGroupsResponse,omitempty"`
@@ -12983,6 +13603,26 @@ func RetrieveUserGroups(ctx context.Context, r soap.RoundTripper, req *types.Ret
 	return resBody.Res, nil
 }
 
+type RetrieveVStorageInfrastructureObjectPolicyBody struct {
+	Req    *types.RetrieveVStorageInfrastructureObjectPolicy         `xml:"urn:vim25 RetrieveVStorageInfrastructureObjectPolicy,omitempty"`
+	Res    *types.RetrieveVStorageInfrastructureObjectPolicyResponse `xml:"urn:vim25 RetrieveVStorageInfrastructureObjectPolicyResponse,omitempty"`
+	Fault_ *soap.Fault                                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveVStorageInfrastructureObjectPolicyBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveVStorageInfrastructureObjectPolicy(ctx context.Context, r soap.RoundTripper, req *types.RetrieveVStorageInfrastructureObjectPolicy) (*types.RetrieveVStorageInfrastructureObjectPolicyResponse, error) {
+	var reqBody, resBody RetrieveVStorageInfrastructureObjectPolicyBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type RetrieveVStorageObjectBody struct {
 	Req    *types.RetrieveVStorageObject         `xml:"urn:vim25 RetrieveVStorageObject,omitempty"`
 	Res    *types.RetrieveVStorageObjectResponse `xml:"urn:vim25 RetrieveVStorageObjectResponse,omitempty"`
@@ -13003,6 +13643,26 @@ func RetrieveVStorageObject(ctx context.Context, r soap.RoundTripper, req *types
 	return resBody.Res, nil
 }
 
+type RetrieveVStorageObjectAssociationsBody struct {
+	Req    *types.RetrieveVStorageObjectAssociations         `xml:"urn:vim25 RetrieveVStorageObjectAssociations,omitempty"`
+	Res    *types.RetrieveVStorageObjectAssociationsResponse `xml:"urn:vim25 RetrieveVStorageObjectAssociationsResponse,omitempty"`
+	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RetrieveVStorageObjectAssociationsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RetrieveVStorageObjectAssociations(ctx context.Context, r soap.RoundTripper, req *types.RetrieveVStorageObjectAssociations) (*types.RetrieveVStorageObjectAssociationsResponse, error) {
+	var reqBody, resBody RetrieveVStorageObjectAssociationsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type RetrieveVStorageObjectStateBody struct {
 	Req    *types.RetrieveVStorageObjectState         `xml:"urn:vim25 RetrieveVStorageObjectState,omitempty"`
 	Res    *types.RetrieveVStorageObjectStateResponse `xml:"urn:vim25 RetrieveVStorageObjectStateResponse,omitempty"`
@@ -13063,6 +13723,26 @@ func RevertToSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.
 	return resBody.Res, nil
 }
 
+type RevertVStorageObject_TaskBody struct {
+	Req    *types.RevertVStorageObject_Task         `xml:"urn:vim25 RevertVStorageObject_Task,omitempty"`
+	Res    *types.RevertVStorageObject_TaskResponse `xml:"urn:vim25 RevertVStorageObject_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *RevertVStorageObject_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func RevertVStorageObject_Task(ctx context.Context, r soap.RoundTripper, req *types.RevertVStorageObject_Task) (*types.RevertVStorageObject_TaskResponse, error) {
+	var reqBody, resBody RevertVStorageObject_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type RewindCollectorBody struct {
 	Req    *types.RewindCollector         `xml:"urn:vim25 RewindCollector,omitempty"`
 	Res    *types.RewindCollectorResponse `xml:"urn:vim25 RewindCollectorResponse,omitempty"`
@@ -13623,6 +14303,26 @@ func SetTaskState(ctx context.Context, r soap.RoundTripper, req *types.SetTaskSt
 	return resBody.Res, nil
 }
 
+type SetVStorageObjectControlFlagsBody struct {
+	Req    *types.SetVStorageObjectControlFlags         `xml:"urn:vim25 SetVStorageObjectControlFlags,omitempty"`
+	Res    *types.SetVStorageObjectControlFlagsResponse `xml:"urn:vim25 SetVStorageObjectControlFlagsResponse,omitempty"`
+	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetVStorageObjectControlFlagsBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetVStorageObjectControlFlags(ctx context.Context, r soap.RoundTripper, req *types.SetVStorageObjectControlFlags) (*types.SetVStorageObjectControlFlagsResponse, error) {
+	var reqBody, resBody SetVStorageObjectControlFlagsBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type SetVirtualDiskUuidBody struct {
 	Req    *types.SetVirtualDiskUuid         `xml:"urn:vim25 SetVirtualDiskUuid,omitempty"`
 	Res    *types.SetVirtualDiskUuidResponse `xml:"urn:vim25 SetVirtualDiskUuidResponse,omitempty"`
@@ -15723,16 +16423,16 @@ func UpdateVAppConfig(ctx context.Context, r soap.RoundTripper, req *types.Updat
 	return resBody.Res, nil
 }
 
-type UpdateVVolVirtualMachineFiles_TaskBody struct {
-	Req    *types.UpdateVVolVirtualMachineFiles_Task         `xml:"urn:vim25 UpdateVVolVirtualMachineFiles_Task,omitempty"`
-	Res    *types.UpdateVVolVirtualMachineFiles_TaskResponse `xml:"urn:vim25 UpdateVVolVirtualMachineFiles_TaskResponse,omitempty"`
-	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+type UpdateVStorageInfrastructureObjectPolicy_TaskBody struct {
+	Req    *types.UpdateVStorageInfrastructureObjectPolicy_Task         `xml:"urn:vim25 UpdateVStorageInfrastructureObjectPolicy_Task,omitempty"`
+	Res    *types.UpdateVStorageInfrastructureObjectPolicy_TaskResponse `xml:"urn:vim25 UpdateVStorageInfrastructureObjectPolicy_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
 
-func (b *UpdateVVolVirtualMachineFiles_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+func (b *UpdateVStorageInfrastructureObjectPolicy_TaskBody) Fault() *soap.Fault { return b.Fault_ }
 
-func UpdateVVolVirtualMachineFiles_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVVolVirtualMachineFiles_Task) (*types.UpdateVVolVirtualMachineFiles_TaskResponse, error) {
-	var reqBody, resBody UpdateVVolVirtualMachineFiles_TaskBody
+func UpdateVStorageInfrastructureObjectPolicy_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVStorageInfrastructureObjectPolicy_Task) (*types.UpdateVStorageInfrastructureObjectPolicy_TaskResponse, error) {
+	var reqBody, resBody UpdateVStorageInfrastructureObjectPolicy_TaskBody
 
 	reqBody.Req = req
 
@@ -15743,16 +16443,16 @@ func UpdateVVolVirtualMachineFiles_Task(ctx context.Context, r soap.RoundTripper
 	return resBody.Res, nil
 }
 
-type UpdateVirtualMachineFiles_TaskBody struct {
-	Req    *types.UpdateVirtualMachineFiles_Task         `xml:"urn:vim25 UpdateVirtualMachineFiles_Task,omitempty"`
-	Res    *types.UpdateVirtualMachineFiles_TaskResponse `xml:"urn:vim25 UpdateVirtualMachineFiles_TaskResponse,omitempty"`
-	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+type UpdateVStorageObjectPolicy_TaskBody struct {
+	Req    *types.UpdateVStorageObjectPolicy_Task         `xml:"urn:vim25 UpdateVStorageObjectPolicy_Task,omitempty"`
+	Res    *types.UpdateVStorageObjectPolicy_TaskResponse `xml:"urn:vim25 UpdateVStorageObjectPolicy_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
 
-func (b *UpdateVirtualMachineFiles_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+func (b *UpdateVStorageObjectPolicy_TaskBody) Fault() *soap.Fault { return b.Fault_ }
 
-func UpdateVirtualMachineFiles_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVirtualMachineFiles_Task) (*types.UpdateVirtualMachineFiles_TaskResponse, error) {
-	var reqBody, resBody UpdateVirtualMachineFiles_TaskBody
+func UpdateVStorageObjectPolicy_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVStorageObjectPolicy_Task) (*types.UpdateVStorageObjectPolicy_TaskResponse, error) {
+	var reqBody, resBody UpdateVStorageObjectPolicy_TaskBody
 
 	reqBody.Req = req
 
@@ -15763,8 +16463,48 @@ func UpdateVirtualMachineFiles_Task(ctx context.Context, r soap.RoundTripper, re
 	return resBody.Res, nil
 }
 
-type UpdateVirtualNicBody struct {
-	Req    *types.UpdateVirtualNic         `xml:"urn:vim25 UpdateVirtualNic,omitempty"`
+type UpdateVVolVirtualMachineFiles_TaskBody struct {
+	Req    *types.UpdateVVolVirtualMachineFiles_Task         `xml:"urn:vim25 UpdateVVolVirtualMachineFiles_Task,omitempty"`
+	Res    *types.UpdateVVolVirtualMachineFiles_TaskResponse `xml:"urn:vim25 UpdateVVolVirtualMachineFiles_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVVolVirtualMachineFiles_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVVolVirtualMachineFiles_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVVolVirtualMachineFiles_Task) (*types.UpdateVVolVirtualMachineFiles_TaskResponse, error) {
+	var reqBody, resBody UpdateVVolVirtualMachineFiles_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateVirtualMachineFiles_TaskBody struct {
+	Req    *types.UpdateVirtualMachineFiles_Task         `xml:"urn:vim25 UpdateVirtualMachineFiles_Task,omitempty"`
+	Res    *types.UpdateVirtualMachineFiles_TaskResponse `xml:"urn:vim25 UpdateVirtualMachineFiles_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVirtualMachineFiles_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVirtualMachineFiles_Task(ctx context.Context, r soap.RoundTripper, req *types.UpdateVirtualMachineFiles_Task) (*types.UpdateVirtualMachineFiles_TaskResponse, error) {
+	var reqBody, resBody UpdateVirtualMachineFiles_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UpdateVirtualNicBody struct {
+	Req    *types.UpdateVirtualNic         `xml:"urn:vim25 UpdateVirtualNic,omitempty"`
 	Res    *types.UpdateVirtualNicResponse `xml:"urn:vim25 UpdateVirtualNicResponse,omitempty"`
 	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
@@ -15803,6 +16543,26 @@ func UpdateVirtualSwitch(ctx context.Context, r soap.RoundTripper, req *types.Up
 	return resBody.Res, nil
 }
 
+type UpdateVmfsUnmapBandwidthBody struct {
+	Req    *types.UpdateVmfsUnmapBandwidth         `xml:"urn:vim25 UpdateVmfsUnmapBandwidth,omitempty"`
+	Res    *types.UpdateVmfsUnmapBandwidthResponse `xml:"urn:vim25 UpdateVmfsUnmapBandwidthResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UpdateVmfsUnmapBandwidthBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UpdateVmfsUnmapBandwidth(ctx context.Context, r soap.RoundTripper, req *types.UpdateVmfsUnmapBandwidth) (*types.UpdateVmfsUnmapBandwidthResponse, error) {
+	var reqBody, resBody UpdateVmfsUnmapBandwidthBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type UpdateVmfsUnmapPriorityBody struct {
 	Req    *types.UpdateVmfsUnmapPriority         `xml:"urn:vim25 UpdateVmfsUnmapPriority,omitempty"`
 	Res    *types.UpdateVmfsUnmapPriorityResponse `xml:"urn:vim25 UpdateVmfsUnmapPriorityResponse,omitempty"`
@@ -16003,6 +16763,26 @@ func UploadKmipServerCert(ctx context.Context, r soap.RoundTripper, req *types.U
 	return resBody.Res, nil
 }
 
+type VStorageObjectCreateSnapshot_TaskBody struct {
+	Req    *types.VStorageObjectCreateSnapshot_Task         `xml:"urn:vim25 VStorageObjectCreateSnapshot_Task,omitempty"`
+	Res    *types.VStorageObjectCreateSnapshot_TaskResponse `xml:"urn:vim25 VStorageObjectCreateSnapshot_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *VStorageObjectCreateSnapshot_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func VStorageObjectCreateSnapshot_Task(ctx context.Context, r soap.RoundTripper, req *types.VStorageObjectCreateSnapshot_Task) (*types.VStorageObjectCreateSnapshot_TaskResponse, error) {
+	var reqBody, resBody VStorageObjectCreateSnapshot_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ValidateCredentialsInGuestBody struct {
 	Req    *types.ValidateCredentialsInGuest         `xml:"urn:vim25 ValidateCredentialsInGuest,omitempty"`
 	Res    *types.ValidateCredentialsInGuestResponse `xml:"urn:vim25 ValidateCredentialsInGuestResponse,omitempty"`
@@ -16043,6 +16823,26 @@ func ValidateHost(ctx context.Context, r soap.RoundTripper, req *types.ValidateH
 	return resBody.Res, nil
 }
 
+type ValidateHostProfileComposition_TaskBody struct {
+	Req    *types.ValidateHostProfileComposition_Task         `xml:"urn:vim25 ValidateHostProfileComposition_Task,omitempty"`
+	Res    *types.ValidateHostProfileComposition_TaskResponse `xml:"urn:vim25 ValidateHostProfileComposition_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ValidateHostProfileComposition_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ValidateHostProfileComposition_Task(ctx context.Context, r soap.RoundTripper, req *types.ValidateHostProfileComposition_Task) (*types.ValidateHostProfileComposition_TaskResponse, error) {
+	var reqBody, resBody ValidateHostProfileComposition_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type ValidateMigrationBody struct {
 	Req    *types.ValidateMigration         `xml:"urn:vim25 ValidateMigration,omitempty"`
 	Res    *types.ValidateMigrationResponse `xml:"urn:vim25 ValidateMigrationResponse,omitempty"`
@@ -16063,6 +16863,26 @@ func ValidateMigration(ctx context.Context, r soap.RoundTripper, req *types.Vali
 	return resBody.Res, nil
 }
 
+type ValidateStoragePodConfigBody struct {
+	Req    *types.ValidateStoragePodConfig         `xml:"urn:vim25 ValidateStoragePodConfig,omitempty"`
+	Res    *types.ValidateStoragePodConfigResponse `xml:"urn:vim25 ValidateStoragePodConfigResponse,omitempty"`
+	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ValidateStoragePodConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ValidateStoragePodConfig(ctx context.Context, r soap.RoundTripper, req *types.ValidateStoragePodConfig) (*types.ValidateStoragePodConfigResponse, error) {
+	var reqBody, resBody ValidateStoragePodConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
 type WaitForUpdatesBody struct {
 	Req    *types.WaitForUpdates         `xml:"urn:vim25 WaitForUpdates,omitempty"`
 	Res    *types.WaitForUpdatesResponse `xml:"urn:vim25 WaitForUpdatesResponse,omitempty"`
@@ -16142,3 +16962,323 @@ func ZeroFillVirtualDisk_Task(ctx context.Context, r soap.RoundTripper, req *typ
 
 	return resBody.Res, nil
 }
+
+type ConfigureVcha_TaskBody struct {
+	Req    *types.ConfigureVcha_Task         `xml:"urn:vim25 configureVcha_Task,omitempty"`
+	Res    *types.ConfigureVcha_TaskResponse `xml:"urn:vim25 configureVcha_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ConfigureVcha_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ConfigureVcha_Task(ctx context.Context, r soap.RoundTripper, req *types.ConfigureVcha_Task) (*types.ConfigureVcha_TaskResponse, error) {
+	var reqBody, resBody ConfigureVcha_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreatePassiveNode_TaskBody struct {
+	Req    *types.CreatePassiveNode_Task         `xml:"urn:vim25 createPassiveNode_Task,omitempty"`
+	Res    *types.CreatePassiveNode_TaskResponse `xml:"urn:vim25 createPassiveNode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreatePassiveNode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreatePassiveNode_Task(ctx context.Context, r soap.RoundTripper, req *types.CreatePassiveNode_Task) (*types.CreatePassiveNode_TaskResponse, error) {
+	var reqBody, resBody CreatePassiveNode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type CreateWitnessNode_TaskBody struct {
+	Req    *types.CreateWitnessNode_Task         `xml:"urn:vim25 createWitnessNode_Task,omitempty"`
+	Res    *types.CreateWitnessNode_TaskResponse `xml:"urn:vim25 createWitnessNode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                           `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *CreateWitnessNode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func CreateWitnessNode_Task(ctx context.Context, r soap.RoundTripper, req *types.CreateWitnessNode_Task) (*types.CreateWitnessNode_TaskResponse, error) {
+	var reqBody, resBody CreateWitnessNode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DeployVcha_TaskBody struct {
+	Req    *types.DeployVcha_Task         `xml:"urn:vim25 deployVcha_Task,omitempty"`
+	Res    *types.DeployVcha_TaskResponse `xml:"urn:vim25 deployVcha_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DeployVcha_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DeployVcha_Task(ctx context.Context, r soap.RoundTripper, req *types.DeployVcha_Task) (*types.DeployVcha_TaskResponse, error) {
+	var reqBody, resBody DeployVcha_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type DestroyVcha_TaskBody struct {
+	Req    *types.DestroyVcha_Task         `xml:"urn:vim25 destroyVcha_Task,omitempty"`
+	Res    *types.DestroyVcha_TaskResponse `xml:"urn:vim25 destroyVcha_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *DestroyVcha_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func DestroyVcha_Task(ctx context.Context, r soap.RoundTripper, req *types.DestroyVcha_Task) (*types.DestroyVcha_TaskResponse, error) {
+	var reqBody, resBody DestroyVcha_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type FetchSoftwarePackagesBody struct {
+	Req    *types.FetchSoftwarePackages         `xml:"urn:vim25 fetchSoftwarePackages,omitempty"`
+	Res    *types.FetchSoftwarePackagesResponse `xml:"urn:vim25 fetchSoftwarePackagesResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *FetchSoftwarePackagesBody) Fault() *soap.Fault { return b.Fault_ }
+
+func FetchSoftwarePackages(ctx context.Context, r soap.RoundTripper, req *types.FetchSoftwarePackages) (*types.FetchSoftwarePackagesResponse, error) {
+	var reqBody, resBody FetchSoftwarePackagesBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetClusterModeBody struct {
+	Req    *types.GetClusterMode         `xml:"urn:vim25 getClusterMode,omitempty"`
+	Res    *types.GetClusterModeResponse `xml:"urn:vim25 getClusterModeResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetClusterModeBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetClusterMode(ctx context.Context, r soap.RoundTripper, req *types.GetClusterMode) (*types.GetClusterModeResponse, error) {
+	var reqBody, resBody GetClusterModeBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type GetVchaConfigBody struct {
+	Req    *types.GetVchaConfig         `xml:"urn:vim25 getVchaConfig,omitempty"`
+	Res    *types.GetVchaConfigResponse `xml:"urn:vim25 getVchaConfigResponse,omitempty"`
+	Fault_ *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *GetVchaConfigBody) Fault() *soap.Fault { return b.Fault_ }
+
+func GetVchaConfig(ctx context.Context, r soap.RoundTripper, req *types.GetVchaConfig) (*types.GetVchaConfigResponse, error) {
+	var reqBody, resBody GetVchaConfigBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InitiateFailover_TaskBody struct {
+	Req    *types.InitiateFailover_Task         `xml:"urn:vim25 initiateFailover_Task,omitempty"`
+	Res    *types.InitiateFailover_TaskResponse `xml:"urn:vim25 initiateFailover_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InitiateFailover_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InitiateFailover_Task(ctx context.Context, r soap.RoundTripper, req *types.InitiateFailover_Task) (*types.InitiateFailover_TaskResponse, error) {
+	var reqBody, resBody InitiateFailover_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type InstallDateBody struct {
+	Req    *types.InstallDate         `xml:"urn:vim25 installDate,omitempty"`
+	Res    *types.InstallDateResponse `xml:"urn:vim25 installDateResponse,omitempty"`
+	Fault_ *soap.Fault                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *InstallDateBody) Fault() *soap.Fault { return b.Fault_ }
+
+func InstallDate(ctx context.Context, r soap.RoundTripper, req *types.InstallDate) (*types.InstallDateResponse, error) {
+	var reqBody, resBody InstallDateBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type PrepareVcha_TaskBody struct {
+	Req    *types.PrepareVcha_Task         `xml:"urn:vim25 prepareVcha_Task,omitempty"`
+	Res    *types.PrepareVcha_TaskResponse `xml:"urn:vim25 prepareVcha_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *PrepareVcha_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func PrepareVcha_Task(ctx context.Context, r soap.RoundTripper, req *types.PrepareVcha_Task) (*types.PrepareVcha_TaskResponse, error) {
+	var reqBody, resBody PrepareVcha_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type QueryDatacenterConfigOptionDescriptorBody struct {
+	Req    *types.QueryDatacenterConfigOptionDescriptor         `xml:"urn:vim25 queryDatacenterConfigOptionDescriptor,omitempty"`
+	Res    *types.QueryDatacenterConfigOptionDescriptorResponse `xml:"urn:vim25 queryDatacenterConfigOptionDescriptorResponse,omitempty"`
+	Fault_ *soap.Fault                                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *QueryDatacenterConfigOptionDescriptorBody) Fault() *soap.Fault { return b.Fault_ }
+
+func QueryDatacenterConfigOptionDescriptor(ctx context.Context, r soap.RoundTripper, req *types.QueryDatacenterConfigOptionDescriptor) (*types.QueryDatacenterConfigOptionDescriptorResponse, error) {
+	var reqBody, resBody QueryDatacenterConfigOptionDescriptorBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type ReloadVirtualMachineFromPath_TaskBody struct {
+	Req    *types.ReloadVirtualMachineFromPath_Task         `xml:"urn:vim25 reloadVirtualMachineFromPath_Task,omitempty"`
+	Res    *types.ReloadVirtualMachineFromPath_TaskResponse `xml:"urn:vim25 reloadVirtualMachineFromPath_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *ReloadVirtualMachineFromPath_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func ReloadVirtualMachineFromPath_Task(ctx context.Context, r soap.RoundTripper, req *types.ReloadVirtualMachineFromPath_Task) (*types.ReloadVirtualMachineFromPath_TaskResponse, error) {
+	var reqBody, resBody ReloadVirtualMachineFromPath_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetClusterMode_TaskBody struct {
+	Req    *types.SetClusterMode_Task         `xml:"urn:vim25 setClusterMode_Task,omitempty"`
+	Res    *types.SetClusterMode_TaskResponse `xml:"urn:vim25 setClusterMode_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetClusterMode_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetClusterMode_Task(ctx context.Context, r soap.RoundTripper, req *types.SetClusterMode_Task) (*types.SetClusterMode_TaskResponse, error) {
+	var reqBody, resBody SetClusterMode_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type SetCustomValueBody struct {
+	Req    *types.SetCustomValue         `xml:"urn:vim25 setCustomValue,omitempty"`
+	Res    *types.SetCustomValueResponse `xml:"urn:vim25 setCustomValueResponse,omitempty"`
+	Fault_ *soap.Fault                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *SetCustomValueBody) Fault() *soap.Fault { return b.Fault_ }
+
+func SetCustomValue(ctx context.Context, r soap.RoundTripper, req *types.SetCustomValue) (*types.SetCustomValueResponse, error) {
+	var reqBody, resBody SetCustomValueBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
+
+type UnregisterVApp_TaskBody struct {
+	Req    *types.UnregisterVApp_Task         `xml:"urn:vim25 unregisterVApp_Task,omitempty"`
+	Res    *types.UnregisterVApp_TaskResponse `xml:"urn:vim25 unregisterVApp_TaskResponse,omitempty"`
+	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *UnregisterVApp_TaskBody) Fault() *soap.Fault { return b.Fault_ }
+
+func UnregisterVApp_Task(ctx context.Context, r soap.RoundTripper, req *types.UnregisterVApp_Task) (*types.UnregisterVApp_TaskResponse, error) {
+	var reqBody, resBody UnregisterVApp_TaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	return resBody.Res, nil
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/methods/service_content.go b/vendor/github.com/vmware/govmomi/vim25/methods/service_content.go
index 634fbfbd98..401646598d 100644
--- a/vendor/github.com/vmware/govmomi/vim25/methods/service_content.go
+++ b/vendor/github.com/vmware/govmomi/vim25/methods/service_content.go
@@ -24,14 +24,15 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 )
 
-var ServiceInstance = types.ManagedObjectReference{
+// copy of vim25.ServiceInstance to avoid import cycle
+var serviceInstance = types.ManagedObjectReference{
 	Type:  "ServiceInstance",
 	Value: "ServiceInstance",
 }
 
 func GetServiceContent(ctx context.Context, r soap.RoundTripper) (types.ServiceContent, error) {
 	req := types.RetrieveServiceContent{
-		This: ServiceInstance,
+		This: serviceInstance,
 	}
 
 	res, err := RetrieveServiceContent(ctx, r, &req)
@@ -44,7 +45,7 @@ func GetServiceContent(ctx context.Context, r soap.RoundTripper) (types.ServiceC
 
 func GetCurrentTime(ctx context.Context, r soap.RoundTripper) (*time.Time, error) {
 	req := types.CurrentTime{
-		This: ServiceInstance,
+		This: serviceInstance,
 	}
 
 	res, err := CurrentTime(ctx, r, &req)
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/mo.go b/vendor/github.com/vmware/govmomi/vim25/mo/mo.go
index ede6e44d7d..4f19988e36 100644
--- a/vendor/github.com/vmware/govmomi/vim25/mo/mo.go
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/mo.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -164,6 +164,22 @@ func init() {
 	t["CryptoManager"] = reflect.TypeOf((*CryptoManager)(nil)).Elem()
 }
 
+type CryptoManagerHost struct {
+	CryptoManager
+}
+
+func init() {
+	t["CryptoManagerHost"] = reflect.TypeOf((*CryptoManagerHost)(nil)).Elem()
+}
+
+type CryptoManagerHostKMS struct {
+	CryptoManagerHost
+}
+
+func init() {
+	t["CryptoManagerHostKMS"] = reflect.TypeOf((*CryptoManagerHostKMS)(nil)).Elem()
+}
+
 type CryptoManagerKmip struct {
 	CryptoManager
 
@@ -759,9 +775,10 @@ func init() {
 type HostGraphicsManager struct {
 	ExtensibleManagedObject
 
-	GraphicsInfo           []types.HostGraphicsInfo  `mo:"graphicsInfo"`
-	GraphicsConfig         *types.HostGraphicsConfig `mo:"graphicsConfig"`
-	SharedPassthruGpuTypes []string                  `mo:"sharedPassthruGpuTypes"`
+	GraphicsInfo           []types.HostGraphicsInfo          `mo:"graphicsInfo"`
+	GraphicsConfig         *types.HostGraphicsConfig         `mo:"graphicsConfig"`
+	SharedPassthruGpuTypes []string                          `mo:"sharedPassthruGpuTypes"`
+	SharedGpuCapabilities  []types.HostSharedGpuCapabilities `mo:"sharedGpuCapabilities"`
 }
 
 func init() {
@@ -853,6 +870,20 @@ func init() {
 	t["HostNetworkSystem"] = reflect.TypeOf((*HostNetworkSystem)(nil)).Elem()
 }
 
+type HostNvdimmSystem struct {
+	Self types.ManagedObjectReference
+
+	NvdimmSystemInfo types.NvdimmSystemInfo `mo:"nvdimmSystemInfo"`
+}
+
+func (m HostNvdimmSystem) Reference() types.ManagedObjectReference {
+	return m.Self
+}
+
+func init() {
+	t["HostNvdimmSystem"] = reflect.TypeOf((*HostNvdimmSystem)(nil)).Elem()
+}
+
 type HostPatchManager struct {
 	Self types.ManagedObjectReference
 }
@@ -894,7 +925,10 @@ func init() {
 type HostProfile struct {
 	Profile
 
-	ReferenceHost *types.ManagedObjectReference `mo:"referenceHost"`
+	ValidationState           *string                                 `mo:"validationState"`
+	ValidationStateUpdateTime *time.Time                              `mo:"validationStateUpdateTime"`
+	ValidationFailureInfo     *types.HostProfileValidationFailureInfo `mo:"validationFailureInfo"`
+	ReferenceHost             *types.ManagedObjectReference           `mo:"referenceHost"`
 }
 
 func init() {
@@ -962,18 +996,25 @@ func init() {
 type HostSystem struct {
 	ManagedEntity
 
-	Runtime            types.HostRuntimeInfo            `mo:"runtime"`
-	Summary            types.HostListSummary            `mo:"summary"`
-	Hardware           *types.HostHardwareInfo          `mo:"hardware"`
-	Capability         *types.HostCapability            `mo:"capability"`
-	LicensableResource types.HostLicensableResourceInfo `mo:"licensableResource"`
-	ConfigManager      types.HostConfigManager          `mo:"configManager"`
-	Config             *types.HostConfigInfo            `mo:"config"`
-	Vm                 []types.ManagedObjectReference   `mo:"vm"`
-	Datastore          []types.ManagedObjectReference   `mo:"datastore"`
-	Network            []types.ManagedObjectReference   `mo:"network"`
-	DatastoreBrowser   types.ManagedObjectReference     `mo:"datastoreBrowser"`
-	SystemResources    *types.HostSystemResourceInfo    `mo:"systemResources"`
+	Runtime                    types.HostRuntimeInfo                      `mo:"runtime"`
+	Summary                    types.HostListSummary                      `mo:"summary"`
+	Hardware                   *types.HostHardwareInfo                    `mo:"hardware"`
+	Capability                 *types.HostCapability                      `mo:"capability"`
+	LicensableResource         types.HostLicensableResourceInfo           `mo:"licensableResource"`
+	RemediationState           *types.HostSystemRemediationState          `mo:"remediationState"`
+	PrecheckRemediationResult  *types.ApplyHostProfileConfigurationSpec   `mo:"precheckRemediationResult"`
+	RemediationResult          *types.ApplyHostProfileConfigurationResult `mo:"remediationResult"`
+	ComplianceCheckState       *types.HostSystemComplianceCheckState      `mo:"complianceCheckState"`
+	ComplianceCheckResult      *types.ComplianceResult                    `mo:"complianceCheckResult"`
+	ConfigManager              types.HostConfigManager                    `mo:"configManager"`
+	Config                     *types.HostConfigInfo                      `mo:"config"`
+	Vm                         []types.ManagedObjectReference             `mo:"vm"`
+	Datastore                  []types.ManagedObjectReference             `mo:"datastore"`
+	Network                    []types.ManagedObjectReference             `mo:"network"`
+	DatastoreBrowser           types.ManagedObjectReference               `mo:"datastoreBrowser"`
+	SystemResources            *types.HostSystemResourceInfo              `mo:"systemResources"`
+	AnswerFileValidationState  *types.AnswerFileStatusResult              `mo:"answerFileValidationState"`
+	AnswerFileValidationResult *types.AnswerFileStatusResult              `mo:"answerFileValidationResult"`
 }
 
 func (m *HostSystem) Entity() *ManagedEntity {
@@ -1056,10 +1097,13 @@ func init() {
 type HttpNfcLease struct {
 	Self types.ManagedObjectReference
 
-	InitializeProgress int32                       `mo:"initializeProgress"`
-	Info               *types.HttpNfcLeaseInfo     `mo:"info"`
-	State              types.HttpNfcLeaseState     `mo:"state"`
-	Error              *types.LocalizedMethodFault `mo:"error"`
+	InitializeProgress int32                          `mo:"initializeProgress"`
+	TransferProgress   int32                          `mo:"transferProgress"`
+	Mode               string                         `mo:"mode"`
+	Capabilities       types.HttpNfcLeaseCapabilities `mo:"capabilities"`
+	Info               *types.HttpNfcLeaseInfo        `mo:"info"`
+	State              types.HttpNfcLeaseState        `mo:"state"`
+	Error              *types.LocalizedMethodFault    `mo:"error"`
 }
 
 func (m HttpNfcLease) Reference() types.ManagedObjectReference {
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go b/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go
index e7ffc32cec..c470c0ac0a 100644
--- a/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/retrieve.go
@@ -65,6 +65,22 @@ func ObjectContentToType(o types.ObjectContent) (interface{}, error) {
 	return v.Elem().Interface(), nil
 }
 
+// ApplyPropertyChange converts the response of a call to WaitForUpdates
+// and applies it to the given managed object.
+func ApplyPropertyChange(obj Reference, changes []types.PropertyChange) {
+	t := typeInfoForType(obj.Reference().Type)
+	v := reflect.ValueOf(obj)
+
+	for _, p := range changes {
+		rv, ok := t.props[p.Name]
+		if !ok {
+			continue
+		}
+
+		assignValue(v, rv, reflect.ValueOf(p.Val))
+	}
+}
+
 // LoadRetrievePropertiesResponse converts the response of a call to
 // RetrieveProperties to one or more managed objects.
 func LoadRetrievePropertiesResponse(res *types.RetrievePropertiesResponse, dst interface{}) error {
diff --git a/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go b/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go
index 0c9e5b0348..2228e53a0c 100644
--- a/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go
+++ b/vendor/github.com/vmware/govmomi/vim25/mo/type_info.go
@@ -155,6 +155,8 @@ func (t *typeInfo) build(typ reflect.Type, fn string, fi []int) {
 	}
 }
 
+var nilValue reflect.Value
+
 // assignValue assignes a value 'pv' to the struct pointed to by 'val', given a
 // slice of field indices. It recurses into the struct until it finds the field
 // specified by the indices. It creates new values for pointer types where
@@ -172,6 +174,11 @@ func assignValue(val reflect.Value, fi []int, pv reflect.Value) {
 	rv := val.Field(fi[0])
 	fi = fi[1:]
 	if len(fi) == 0 {
+		if pv == nilValue {
+			pv = reflect.Zero(rv.Type())
+			rv.Set(pv)
+			return
+		}
 		rt := rv.Type()
 		pt := pv.Type()
 
@@ -182,6 +189,24 @@ func assignValue(val reflect.Value, fi []int, pv reflect.Value) {
 			rt = rv.Type()
 		}
 
+		// If the target type is a slice, but the source is not, deference any ArrayOfXYZ type
+		if rt.Kind() == reflect.Slice && pt.Kind() != reflect.Slice {
+			if pt.Kind() == reflect.Ptr {
+				pv = pv.Elem()
+				pt = pt.Elem()
+			}
+
+			m := arrayOfRegexp.FindStringSubmatch(pt.Name())
+			if len(m) > 0 {
+				pv = pv.FieldByName(m[1]) // ArrayOfXYZ type has single field named XYZ
+				pt = pv.Type()
+
+				if !pv.IsValid() {
+					panic(fmt.Sprintf("expected %s type to have field %s", m[0], m[1]))
+				}
+			}
+		}
+
 		// If type is an interface, check if pv implements it.
 		if rt.Kind() == reflect.Interface && !pt.Implements(rt) {
 			// Check if pointer to pv implements it.
@@ -200,7 +225,7 @@ func assignValue(val reflect.Value, fi []int, pv reflect.Value) {
 		} else if rt.ConvertibleTo(pt) {
 			rv.Set(pv.Convert(rt))
 		} else {
-			panic(fmt.Sprintf("cannot assign %s (%s) to %s (%s)", rt.Name(), rt.Kind(), pt.Name(), pt.Kind()))
+			panic(fmt.Sprintf("cannot assign %q (%s) to %q (%s)", rt.Name(), rt.Kind(), pt.Name(), pt.Kind()))
 		}
 
 		return
@@ -211,23 +236,6 @@ func assignValue(val reflect.Value, fi []int, pv reflect.Value) {
 
 var arrayOfRegexp = regexp.MustCompile("ArrayOf(.*)$")
 
-func anyTypeToValue(t interface{}) reflect.Value {
-	rt := reflect.TypeOf(t)
-	rv := reflect.ValueOf(t)
-
-	// Dereference if ArrayOfXYZ type
-	m := arrayOfRegexp.FindStringSubmatch(rt.Name())
-	if len(m) > 0 {
-		// ArrayOfXYZ type has single field named XYZ
-		rv = rv.FieldByName(m[1])
-		if !rv.IsValid() {
-			panic(fmt.Sprintf("expected %s type to have field %s", m[0], m[1]))
-		}
-	}
-
-	return rv
-}
-
 // LoadObjectFromContent loads properties from the 'PropSet' field in the
 // specified ObjectContent value into the value it represents, which is
 // returned as a reflect.Value.
@@ -240,7 +248,7 @@ func (t *typeInfo) LoadFromObjectContent(o types.ObjectContent) (reflect.Value,
 		if !ok {
 			continue
 		}
-		assignValue(v, rv, anyTypeToValue(p.Val))
+		assignValue(v, rv, reflect.ValueOf(p.Val))
 	}
 
 	return v, nil
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/client.go b/vendor/github.com/vmware/govmomi/vim25/soap/client.go
index 76592493cc..a51f61189a 100644
--- a/vendor/github.com/vmware/govmomi/vim25/soap/client.go
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/client.go
@@ -28,6 +28,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"net"
 	"net/http"
 	"net/http/cookiejar"
@@ -53,17 +54,9 @@ type RoundTripper interface {
 }
 
 const (
-	DefaultVimNamespace  = "urn:vim25"
-	DefaultVimVersion    = "6.5"
-	DefaultMinVimVersion = "5.5"
-	SessionCookieName    = "vmware_soap_session"
+	SessionCookieName = "vmware_soap_session"
 )
 
-type header struct {
-	Cookie string `xml:"vcSessionCookie,omitempty"`
-	ID     string `xml:"operationID,omitempty"`
-}
-
 type Client struct {
 	http.Client
 
@@ -71,7 +64,6 @@ type Client struct {
 	k bool // Named after curl's -k flag
 	d *debugContainer
 	t *http.Transport
-	p *url.URL
 
 	hostsMu sync.Mutex
 	hosts   map[string]string
@@ -85,6 +77,17 @@ type Client struct {
 
 var schemeMatch = regexp.MustCompile(`^\w+://`)
 
+type errInvalidCACertificate struct {
+	File string
+}
+
+func (e errInvalidCACertificate) Error() string {
+	return fmt.Sprintf(
+		"invalid certificate '%s', cannot be used as a trusted CA certificate",
+		e.File,
+	)
+}
+
 // ParseURL is wrapper around url.Parse, where Scheme defaults to "https" and Path defaults to "/sdk"
 func ParseURL(s string) (*url.URL, error) {
 	var err error
@@ -149,20 +152,33 @@ func NewClient(u *url.URL, insecure bool) *Client {
 	c.u = c.URL()
 	c.u.User = nil
 
-	c.Namespace = DefaultVimNamespace
-	c.Version = DefaultVimVersion
-
 	return &c
 }
 
 // NewServiceClient creates a NewClient with the given URL.Path and namespace.
 func (c *Client) NewServiceClient(path string, namespace string) *Client {
-	u := c.URL()
-	u.Path = path
+	vc := c.URL()
+	u, err := url.Parse(path)
+	if err != nil {
+		log.Panicf("url.Parse(%q): %s", path, err)
+	}
+	if u.Host == "" {
+		u.Scheme = vc.Scheme
+		u.Host = vc.Host
+	}
 
 	client := NewClient(u, c.k)
+	client.Namespace = "urn:" + namespace
+	if cert := c.Certificate(); cert != nil {
+		client.SetCertificate(*cert)
+	}
 
-	client.Namespace = namespace
+	// Copy the trusted thumbprints
+	c.hostsMu.Lock()
+	for k, v := range c.hosts {
+		client.hosts[k] = v
+	}
+	c.hostsMu.Unlock()
 
 	// Copy the cookies
 	client.Client.Jar.SetCookies(u, c.Client.Jar.Cookies(u))
@@ -175,6 +191,9 @@ func (c *Client) NewServiceClient(path string, namespace string) *Client {
 		}
 	}
 
+	// Copy any query params (e.g. GOVMOMI_TUNNEL_PROXY_PORT used in testing)
+	client.u.RawQuery = vc.RawQuery
+
 	return client
 }
 
@@ -192,7 +211,11 @@ func (c *Client) SetRootCAs(file string) error {
 			return err
 		}
 
-		pool.AppendCertsFromPEM(pem)
+		if ok := pool.AppendCertsFromPEM(pem); !ok {
+			return errInvalidCACertificate{
+				File: name,
+			}
+		}
 	}
 
 	c.t.TLSClientConfig.RootCAs = pool
@@ -346,19 +369,33 @@ func splitHostPort(host string) (string, string) {
 
 const sdkTunnel = "sdkTunnel:8089"
 
+func (c *Client) Certificate() *tls.Certificate {
+	certs := c.t.TLSClientConfig.Certificates
+	if len(certs) == 0 {
+		return nil
+	}
+	return &certs[0]
+}
+
 func (c *Client) SetCertificate(cert tls.Certificate) {
 	t := c.Client.Transport.(*http.Transport)
 
-	// Extension certificate
+	// Extension or HoK certificate
 	t.TLSClientConfig.Certificates = []tls.Certificate{cert}
+}
 
+// Tunnel returns a Client configured to proxy requests through vCenter's http port 80,
+// to the SDK tunnel virtual host.  Use of the SDK tunnel is required by LoginExtensionByCertificate()
+// and optional for other methods.
+func (c *Client) Tunnel() *Client {
+	tunnel := c.NewServiceClient(c.u.Path, c.Namespace)
+	t := tunnel.Client.Transport.(*http.Transport)
 	// Proxy to vCenter host on port 80
-	host, _ := splitHostPort(c.u.Host)
-
+	host := tunnel.u.Hostname()
 	// Should be no reason to change the default port other than testing
 	key := "GOVMOMI_TUNNEL_PROXY_PORT"
 
-	port := c.URL().Query().Get(key)
+	port := tunnel.URL().Query().Get(key)
 	if port == "" {
 		port = os.Getenv(key)
 	}
@@ -367,20 +404,14 @@ func (c *Client) SetCertificate(cert tls.Certificate) {
 		host += ":" + port
 	}
 
-	c.p = &url.URL{
+	t.Proxy = http.ProxyURL(&url.URL{
 		Scheme: "http",
 		Host:   host,
-	}
-	t.Proxy = func(r *http.Request) (*url.URL, error) {
-		// Only sdk requests should be proxied
-		if r.URL.Path == "/sdk" {
-			return c.p, nil
-		}
-		return http.ProxyFromEnvironment(r)
-	}
+	})
 
 	// Rewrite url Host to use the sdk tunnel, required for a certificate request.
-	c.u.Host = sdkTunnel
+	tunnel.u.Host = sdkTunnel
+	return tunnel
 }
 
 func (c *Client) URL() *url.URL {
@@ -418,52 +449,18 @@ func (c *Client) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (c *Client) do(ctx context.Context, req *http.Request) (*http.Response, error) {
-	if nil == ctx || nil == ctx.Done() { // ctx.Done() is for ctx
-		return c.Client.Do(req)
-	}
+type kindContext struct{}
 
-	return c.Client.Do(req.WithContext(ctx))
-}
-
-func (c *Client) RoundTrip(ctx context.Context, reqBody, resBody HasFault) error {
-	var err error
-
-	reqEnv := Envelope{Body: reqBody}
-	resEnv := Envelope{Body: resBody}
-
-	h := &header{
-		Cookie: c.cookie,
-	}
-
-	if id, ok := ctx.Value(types.ID{}).(string); ok {
-		h.ID = id
+func (c *Client) Do(ctx context.Context, req *http.Request, f func(*http.Response) error) error {
+	if ctx == nil {
+		ctx = context.Background()
 	}
-
-	reqEnv.Header = h
-
 	// Create debugging context for this round trip
 	d := c.d.newRoundTrip()
 	if d.enabled() {
 		defer d.done()
 	}
 
-	b, err := xml.Marshal(reqEnv)
-	if err != nil {
-		panic(err)
-	}
-
-	rawReqBody := io.MultiReader(strings.NewReader(xml.Header), bytes.NewReader(b))
-	req, err := http.NewRequest("POST", c.u.String(), rawReqBody)
-	if err != nil {
-		panic(err)
-	}
-
-	req = req.WithContext(ctx)
-
-	req.Header.Set(`Content-Type`, `text/xml; charset="utf-8"`)
-	soapAction := fmt.Sprintf("%s/%s", c.Namespace, c.Version)
-	req.Header.Set(`SOAPAction`, soapAction)
 	if c.UserAgent != "" {
 		req.Header.Set(`User-Agent`, c.UserAgent)
 	}
@@ -473,45 +470,117 @@ func (c *Client) RoundTrip(ctx context.Context, reqBody, resBody HasFault) error
 	}
 
 	tstart := time.Now()
-	res, err := c.do(ctx, req)
+	res, err := c.Client.Do(req.WithContext(ctx))
 	tstop := time.Now()
 
 	if d.enabled() {
-		d.logf("%6dms (%T)", tstop.Sub(tstart)/time.Millisecond, resBody)
+		var name string
+		if kind, ok := ctx.Value(kindContext{}).(HasFault); ok {
+			name = fmt.Sprintf("%T", kind)
+		} else {
+			name = fmt.Sprintf("%s %s", req.Method, req.URL)
+		}
+		d.logf("%6dms (%s)", tstop.Sub(tstart)/time.Millisecond, name)
 	}
 
 	if err != nil {
 		return err
 	}
 
+	defer res.Body.Close()
+
 	if d.enabled() {
 		d.debugResponse(res)
 	}
 
-	// Close response regardless of what happens next
-	defer res.Body.Close()
+	return f(res)
+}
 
-	switch res.StatusCode {
-	case http.StatusOK:
-		// OK
-	case http.StatusInternalServerError:
-		// Error, but typically includes a body explaining the error
-	default:
-		return errors.New(res.Status)
+// Signer can be implemented by soap.Header.Security to sign requests.
+// If the soap.Header.Security field is set to an implementation of Signer via WithHeader(),
+// then Client.RoundTrip will call Sign() to marshal the SOAP request.
+type Signer interface {
+	Sign(Envelope) ([]byte, error)
+}
+
+type headerContext struct{}
+
+// WithHeader can be used to modify the outgoing request soap.Header fields.
+func (c *Client) WithHeader(ctx context.Context, header Header) context.Context {
+	return context.WithValue(ctx, headerContext{}, header)
+}
+
+func (c *Client) RoundTrip(ctx context.Context, reqBody, resBody HasFault) error {
+	var err error
+	var b []byte
+
+	reqEnv := Envelope{Body: reqBody}
+	resEnv := Envelope{Body: resBody}
+
+	h, ok := ctx.Value(headerContext{}).(Header)
+	if !ok {
+		h = Header{}
+	}
+
+	// We added support for OperationID before soap.Header was exported.
+	if id, ok := ctx.Value(types.ID{}).(string); ok {
+		h.ID = id
 	}
 
-	dec := xml.NewDecoder(res.Body)
-	dec.TypeFunc = types.TypeFunc()
-	err = dec.Decode(&resEnv)
+	h.Cookie = c.cookie
+	if h.Cookie != "" || h.ID != "" || h.Security != nil {
+		reqEnv.Header = &h // XML marshal header only if a field is set
+	}
+
+	if signer, ok := h.Security.(Signer); ok {
+		b, err = signer.Sign(reqEnv)
+		if err != nil {
+			return err
+		}
+	} else {
+		b, err = xml.Marshal(reqEnv)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	rawReqBody := io.MultiReader(strings.NewReader(xml.Header), bytes.NewReader(b))
+	req, err := http.NewRequest("POST", c.u.String(), rawReqBody)
 	if err != nil {
-		return err
+		panic(err)
 	}
 
-	if f := resBody.Fault(); f != nil {
-		return WrapSoapFault(f)
+	req.Header.Set(`Content-Type`, `text/xml; charset="utf-8"`)
+
+	action := h.Action
+	if action == "" {
+		action = fmt.Sprintf("%s/%s", c.Namespace, c.Version)
 	}
+	req.Header.Set(`SOAPAction`, action)
 
-	return err
+	return c.Do(context.WithValue(ctx, kindContext{}, resBody), req, func(res *http.Response) error {
+		switch res.StatusCode {
+		case http.StatusOK:
+			// OK
+		case http.StatusInternalServerError:
+			// Error, but typically includes a body explaining the error
+		default:
+			return errors.New(res.Status)
+		}
+
+		dec := xml.NewDecoder(res.Body)
+		dec.TypeFunc = types.TypeFunc()
+		err = dec.Decode(&resEnv)
+		if err != nil {
+			return err
+		}
+
+		if f := resBody.Fault(); f != nil {
+			return WrapSoapFault(f)
+		}
+
+		return err
+	})
 }
 
 func (c *Client) CloseIdleConnections() {
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/debug.go b/vendor/github.com/vmware/govmomi/vim25/soap/debug.go
index 63518abca3..844581b99c 100644
--- a/vendor/github.com/vmware/govmomi/vim25/soap/debug.go
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/debug.go
@@ -21,6 +21,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httputil"
+	"strings"
 	"sync/atomic"
 	"time"
 
@@ -69,6 +70,14 @@ func (d *debugRoundTrip) newFile(suffix string) io.WriteCloser {
 	return debug.NewFile(fmt.Sprintf("%d-%04d.%s", d.cn, d.rn, suffix))
 }
 
+func (d *debugRoundTrip) ext(h http.Header) string {
+	ext := "xml"
+	if strings.Contains(h.Get("Content-Type"), "/json") {
+		ext = "json"
+	}
+	return ext
+}
+
 func (d *debugRoundTrip) debugRequest(req *http.Request) {
 	if d == nil {
 		return
@@ -83,7 +92,7 @@ func (d *debugRoundTrip) debugRequest(req *http.Request) {
 	wc.Close()
 
 	// Capture body
-	wc = d.newFile("req.xml")
+	wc = d.newFile("req." + d.ext(req.Header))
 	req.Body = newTeeReader(req.Body, wc)
 
 	// Delay closing until marked done
@@ -104,7 +113,7 @@ func (d *debugRoundTrip) debugResponse(res *http.Response) {
 	wc.Close()
 
 	// Capture body
-	wc = d.newFile("res.xml")
+	wc = d.newFile("res." + d.ext(res.Header))
 	res.Body = newTeeReader(res.Body, wc)
 
 	// Delay closing until marked done
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/error.go b/vendor/github.com/vmware/govmomi/vim25/soap/error.go
index d89208522a..46111556cb 100644
--- a/vendor/github.com/vmware/govmomi/vim25/soap/error.go
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/error.go
@@ -39,7 +39,11 @@ func (s soapFaultError) Error() string {
 	msg := s.fault.String
 
 	if msg == "" {
-		msg = reflect.TypeOf(s.fault.Detail.Fault).Name()
+		if s.fault.Detail.Fault == nil {
+			msg = "unknown fault"
+		} else {
+			msg = reflect.TypeOf(s.fault.Detail.Fault).Name()
+		}
 	}
 
 	return fmt.Sprintf("%s: %s", s.fault.Code, msg)
diff --git a/vendor/github.com/vmware/govmomi/vim25/soap/soap.go b/vendor/github.com/vmware/govmomi/vim25/soap/soap.go
index a8baa0122a..a8dc121baa 100644
--- a/vendor/github.com/vmware/govmomi/vim25/soap/soap.go
+++ b/vendor/github.com/vmware/govmomi/vim25/soap/soap.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,9 +21,17 @@ import (
 	"github.com/vmware/govmomi/vim25/xml"
 )
 
+// Header includes optional soap Header fields.
+type Header struct {
+	Action   string      `xml:"-"`                         // Action is the 'SOAPAction' HTTP header value. Defaults to "Client.Namespace/Client.Version".
+	Cookie   string      `xml:"vcSessionCookie,omitempty"` // Cookie is a vCenter session cookie that can be used with other SDK endpoints (e.g. pbm).
+	ID       string      `xml:"operationID,omitempty"`     // ID is the operationID used by ESX/vCenter logging for correlation.
+	Security interface{} `xml:",omitempty"`                // Security is used for SAML token authentication and request signing.
+}
+
 type Envelope struct {
-	XMLName xml.Name    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
-	Header  interface{} `xml:",omitempty"`
+	XMLName xml.Name `xml:"http://schemas.xmlsoap.org/soap/envelope/ Envelope"`
+	Header  *Header  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Header,omitempty"`
 	Body    interface{}
 }
 
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/enum.go b/vendor/github.com/vmware/govmomi/vim25/types/enum.go
index 02f7f3cb59..c8c5977526 100644
--- a/vendor/github.com/vmware/govmomi/vim25/types/enum.go
+++ b/vendor/github.com/vmware/govmomi/vim25/types/enum.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -82,6 +82,59 @@ func init() {
 	t["AgentInstallFailedReason"] = reflect.TypeOf((*AgentInstallFailedReason)(nil)).Elem()
 }
 
+type AlarmFilterSpecAlarmTypeByEntity string
+
+const (
+	AlarmFilterSpecAlarmTypeByEntityEntityTypeAll  = AlarmFilterSpecAlarmTypeByEntity("entityTypeAll")
+	AlarmFilterSpecAlarmTypeByEntityEntityTypeHost = AlarmFilterSpecAlarmTypeByEntity("entityTypeHost")
+	AlarmFilterSpecAlarmTypeByEntityEntityTypeVm   = AlarmFilterSpecAlarmTypeByEntity("entityTypeVm")
+)
+
+func init() {
+	t["AlarmFilterSpecAlarmTypeByEntity"] = reflect.TypeOf((*AlarmFilterSpecAlarmTypeByEntity)(nil)).Elem()
+}
+
+type AlarmFilterSpecAlarmTypeByTrigger string
+
+const (
+	AlarmFilterSpecAlarmTypeByTriggerTriggerTypeAll    = AlarmFilterSpecAlarmTypeByTrigger("triggerTypeAll")
+	AlarmFilterSpecAlarmTypeByTriggerTriggerTypeEvent  = AlarmFilterSpecAlarmTypeByTrigger("triggerTypeEvent")
+	AlarmFilterSpecAlarmTypeByTriggerTriggerTypeMetric = AlarmFilterSpecAlarmTypeByTrigger("triggerTypeMetric")
+)
+
+func init() {
+	t["AlarmFilterSpecAlarmTypeByTrigger"] = reflect.TypeOf((*AlarmFilterSpecAlarmTypeByTrigger)(nil)).Elem()
+}
+
+type AnswerFileValidationInfoStatus string
+
+const (
+	AnswerFileValidationInfoStatusSuccess         = AnswerFileValidationInfoStatus("success")
+	AnswerFileValidationInfoStatusFailed          = AnswerFileValidationInfoStatus("failed")
+	AnswerFileValidationInfoStatusFailed_defaults = AnswerFileValidationInfoStatus("failed_defaults")
+)
+
+func init() {
+	t["AnswerFileValidationInfoStatus"] = reflect.TypeOf((*AnswerFileValidationInfoStatus)(nil)).Elem()
+}
+
+type ApplyHostProfileConfigurationResultStatus string
+
+const (
+	ApplyHostProfileConfigurationResultStatusSuccess                     = ApplyHostProfileConfigurationResultStatus("success")
+	ApplyHostProfileConfigurationResultStatusFailed                      = ApplyHostProfileConfigurationResultStatus("failed")
+	ApplyHostProfileConfigurationResultStatusReboot_failed               = ApplyHostProfileConfigurationResultStatus("reboot_failed")
+	ApplyHostProfileConfigurationResultStatusStateless_reboot_failed     = ApplyHostProfileConfigurationResultStatus("stateless_reboot_failed")
+	ApplyHostProfileConfigurationResultStatusCheck_compliance_failed     = ApplyHostProfileConfigurationResultStatus("check_compliance_failed")
+	ApplyHostProfileConfigurationResultStatusState_not_satisfied         = ApplyHostProfileConfigurationResultStatus("state_not_satisfied")
+	ApplyHostProfileConfigurationResultStatusExit_maintenancemode_failed = ApplyHostProfileConfigurationResultStatus("exit_maintenancemode_failed")
+	ApplyHostProfileConfigurationResultStatusCanceled                    = ApplyHostProfileConfigurationResultStatus("canceled")
+)
+
+func init() {
+	t["ApplyHostProfileConfigurationResultStatus"] = reflect.TypeOf((*ApplyHostProfileConfigurationResultStatus)(nil)).Elem()
+}
+
 type ArrayUpdateOperation string
 
 const (
@@ -410,6 +463,7 @@ const (
 	ComplianceResultStatusCompliant    = ComplianceResultStatus("compliant")
 	ComplianceResultStatusNonCompliant = ComplianceResultStatus("nonCompliant")
 	ComplianceResultStatusUnknown      = ComplianceResultStatus("unknown")
+	ComplianceResultStatusRunning      = ComplianceResultStatus("running")
 )
 
 func init() {
@@ -499,6 +553,17 @@ func init() {
 	t["DVPortStatusVmDirectPathGen2InactiveReasonOther"] = reflect.TypeOf((*DVPortStatusVmDirectPathGen2InactiveReasonOther)(nil)).Elem()
 }
 
+type DVSMacLimitPolicyType string
+
+const (
+	DVSMacLimitPolicyTypeAllow = DVSMacLimitPolicyType("allow")
+	DVSMacLimitPolicyTypeDrop  = DVSMacLimitPolicyType("drop")
+)
+
+func init() {
+	t["DVSMacLimitPolicyType"] = reflect.TypeOf((*DVSMacLimitPolicyType)(nil)).Elem()
+}
+
 type DasConfigFaultDasConfigFaultReason string
 
 const (
@@ -1079,6 +1144,18 @@ func init() {
 	t["HostCapabilityFtUnsupportedReason"] = reflect.TypeOf((*HostCapabilityFtUnsupportedReason)(nil)).Elem()
 }
 
+type HostCapabilityUnmapMethodSupported string
+
+const (
+	HostCapabilityUnmapMethodSupportedPriority = HostCapabilityUnmapMethodSupported("priority")
+	HostCapabilityUnmapMethodSupportedFixed    = HostCapabilityUnmapMethodSupported("fixed")
+	HostCapabilityUnmapMethodSupportedDynamic  = HostCapabilityUnmapMethodSupported("dynamic")
+)
+
+func init() {
+	t["HostCapabilityUnmapMethodSupported"] = reflect.TypeOf((*HostCapabilityUnmapMethodSupported)(nil)).Elem()
+}
+
 type HostCapabilityVmDirectPathGen2UnsupportedReason string
 
 const (
@@ -1186,8 +1263,12 @@ func init() {
 type HostDigestInfoDigestMethodType string
 
 const (
-	HostDigestInfoDigestMethodTypeSHA1 = HostDigestInfoDigestMethodType("SHA1")
-	HostDigestInfoDigestMethodTypeMD5  = HostDigestInfoDigestMethodType("MD5")
+	HostDigestInfoDigestMethodTypeSHA1    = HostDigestInfoDigestMethodType("SHA1")
+	HostDigestInfoDigestMethodTypeMD5     = HostDigestInfoDigestMethodType("MD5")
+	HostDigestInfoDigestMethodTypeSHA256  = HostDigestInfoDigestMethodType("SHA256")
+	HostDigestInfoDigestMethodTypeSHA384  = HostDigestInfoDigestMethodType("SHA384")
+	HostDigestInfoDigestMethodTypeSHA512  = HostDigestInfoDigestMethodType("SHA512")
+	HostDigestInfoDigestMethodTypeSM3_256 = HostDigestInfoDigestMethodType("SM3_256")
 )
 
 func init() {
@@ -1261,6 +1342,7 @@ const (
 	HostFileSystemVolumeFileSystemTypeVsan  = HostFileSystemVolumeFileSystemType("vsan")
 	HostFileSystemVolumeFileSystemTypeVFFS  = HostFileSystemVolumeFileSystemType("VFFS")
 	HostFileSystemVolumeFileSystemTypeVVOL  = HostFileSystemVolumeFileSystemType("VVOL")
+	HostFileSystemVolumeFileSystemTypePMEM  = HostFileSystemVolumeFileSystemType("PMEM")
 	HostFileSystemVolumeFileSystemTypeOTHER = HostFileSystemVolumeFileSystemType("OTHER")
 )
 
@@ -1720,6 +1802,28 @@ func init() {
 	t["HostProfileManagerAnswerFileStatus"] = reflect.TypeOf((*HostProfileManagerAnswerFileStatus)(nil)).Elem()
 }
 
+type HostProfileManagerCompositionResultResultElementStatus string
+
+const (
+	HostProfileManagerCompositionResultResultElementStatusSuccess = HostProfileManagerCompositionResultResultElementStatus("success")
+	HostProfileManagerCompositionResultResultElementStatusError   = HostProfileManagerCompositionResultResultElementStatus("error")
+)
+
+func init() {
+	t["HostProfileManagerCompositionResultResultElementStatus"] = reflect.TypeOf((*HostProfileManagerCompositionResultResultElementStatus)(nil)).Elem()
+}
+
+type HostProfileManagerCompositionValidationResultResultElementStatus string
+
+const (
+	HostProfileManagerCompositionValidationResultResultElementStatusSuccess = HostProfileManagerCompositionValidationResultResultElementStatus("success")
+	HostProfileManagerCompositionValidationResultResultElementStatusError   = HostProfileManagerCompositionValidationResultResultElementStatus("error")
+)
+
+func init() {
+	t["HostProfileManagerCompositionValidationResultResultElementStatus"] = reflect.TypeOf((*HostProfileManagerCompositionValidationResultResultElementStatus)(nil)).Elem()
+}
+
 type HostProfileManagerTaskListRequirement string
 
 const (
@@ -1731,6 +1835,31 @@ func init() {
 	t["HostProfileManagerTaskListRequirement"] = reflect.TypeOf((*HostProfileManagerTaskListRequirement)(nil)).Elem()
 }
 
+type HostProfileValidationFailureInfoUpdateType string
+
+const (
+	HostProfileValidationFailureInfoUpdateTypeHostBased = HostProfileValidationFailureInfoUpdateType("HostBased")
+	HostProfileValidationFailureInfoUpdateTypeImport    = HostProfileValidationFailureInfoUpdateType("Import")
+	HostProfileValidationFailureInfoUpdateTypeEdit      = HostProfileValidationFailureInfoUpdateType("Edit")
+	HostProfileValidationFailureInfoUpdateTypeCompose   = HostProfileValidationFailureInfoUpdateType("Compose")
+)
+
+func init() {
+	t["HostProfileValidationFailureInfoUpdateType"] = reflect.TypeOf((*HostProfileValidationFailureInfoUpdateType)(nil)).Elem()
+}
+
+type HostProfileValidationState string
+
+const (
+	HostProfileValidationStateReady   = HostProfileValidationState("Ready")
+	HostProfileValidationStateRunning = HostProfileValidationState("Running")
+	HostProfileValidationStateFailed  = HostProfileValidationState("Failed")
+)
+
+func init() {
+	t["HostProfileValidationState"] = reflect.TypeOf((*HostProfileValidationState)(nil)).Elem()
+}
+
 type HostProtocolEndpointPEType string
 
 const (
@@ -1856,6 +1985,32 @@ func init() {
 	t["HostSystemPowerState"] = reflect.TypeOf((*HostSystemPowerState)(nil)).Elem()
 }
 
+type HostSystemRemediationStateState string
+
+const (
+	HostSystemRemediationStateStateRemediationReady            = HostSystemRemediationStateState("remediationReady")
+	HostSystemRemediationStateStatePrecheckRemediationRunning  = HostSystemRemediationStateState("precheckRemediationRunning")
+	HostSystemRemediationStateStatePrecheckRemediationComplete = HostSystemRemediationStateState("precheckRemediationComplete")
+	HostSystemRemediationStateStatePrecheckRemediationFailed   = HostSystemRemediationStateState("precheckRemediationFailed")
+	HostSystemRemediationStateStateRemediationRunning          = HostSystemRemediationStateState("remediationRunning")
+	HostSystemRemediationStateStateRemediationFailed           = HostSystemRemediationStateState("remediationFailed")
+)
+
+func init() {
+	t["HostSystemRemediationStateState"] = reflect.TypeOf((*HostSystemRemediationStateState)(nil)).Elem()
+}
+
+type HostTpmAttestationInfoAcceptanceStatus string
+
+const (
+	HostTpmAttestationInfoAcceptanceStatusNotAccepted = HostTpmAttestationInfoAcceptanceStatus("notAccepted")
+	HostTpmAttestationInfoAcceptanceStatusAccepted    = HostTpmAttestationInfoAcceptanceStatus("accepted")
+)
+
+func init() {
+	t["HostTpmAttestationInfoAcceptanceStatus"] = reflect.TypeOf((*HostTpmAttestationInfoAcceptanceStatus)(nil)).Elem()
+}
+
 type HostUnresolvedVmfsExtentUnresolvedReason string
 
 const (
@@ -1907,6 +2062,17 @@ func init() {
 	t["HostVmciAccessManagerMode"] = reflect.TypeOf((*HostVmciAccessManagerMode)(nil)).Elem()
 }
 
+type HostVmfsVolumeUnmapBandwidthPolicy string
+
+const (
+	HostVmfsVolumeUnmapBandwidthPolicyFixed   = HostVmfsVolumeUnmapBandwidthPolicy("fixed")
+	HostVmfsVolumeUnmapBandwidthPolicyDynamic = HostVmfsVolumeUnmapBandwidthPolicy("dynamic")
+)
+
+func init() {
+	t["HostVmfsVolumeUnmapBandwidthPolicy"] = reflect.TypeOf((*HostVmfsVolumeUnmapBandwidthPolicy)(nil)).Elem()
+}
+
 type HostVmfsVolumeUnmapPriority string
 
 const (
@@ -1918,6 +2084,28 @@ func init() {
 	t["HostVmfsVolumeUnmapPriority"] = reflect.TypeOf((*HostVmfsVolumeUnmapPriority)(nil)).Elem()
 }
 
+type HttpNfcLeaseManifestEntryChecksumType string
+
+const (
+	HttpNfcLeaseManifestEntryChecksumTypeSha1   = HttpNfcLeaseManifestEntryChecksumType("sha1")
+	HttpNfcLeaseManifestEntryChecksumTypeSha256 = HttpNfcLeaseManifestEntryChecksumType("sha256")
+)
+
+func init() {
+	t["HttpNfcLeaseManifestEntryChecksumType"] = reflect.TypeOf((*HttpNfcLeaseManifestEntryChecksumType)(nil)).Elem()
+}
+
+type HttpNfcLeaseMode string
+
+const (
+	HttpNfcLeaseModePushOrGet = HttpNfcLeaseMode("pushOrGet")
+	HttpNfcLeaseModePull      = HttpNfcLeaseMode("pull")
+)
+
+func init() {
+	t["HttpNfcLeaseMode"] = reflect.TypeOf((*HttpNfcLeaseMode)(nil)).Elem()
+}
+
 type HttpNfcLeaseState string
 
 const (
@@ -2288,6 +2476,84 @@ func init() {
 	t["NumVirtualCpusIncompatibleReason"] = reflect.TypeOf((*NumVirtualCpusIncompatibleReason)(nil)).Elem()
 }
 
+type NvdimmInterleaveSetState string
+
+const (
+	NvdimmInterleaveSetStateInvalid = NvdimmInterleaveSetState("invalid")
+	NvdimmInterleaveSetStateActive  = NvdimmInterleaveSetState("active")
+)
+
+func init() {
+	t["NvdimmInterleaveSetState"] = reflect.TypeOf((*NvdimmInterleaveSetState)(nil)).Elem()
+}
+
+type NvdimmNamespaceHealthStatus string
+
+const (
+	NvdimmNamespaceHealthStatusNormal            = NvdimmNamespaceHealthStatus("normal")
+	NvdimmNamespaceHealthStatusMissing           = NvdimmNamespaceHealthStatus("missing")
+	NvdimmNamespaceHealthStatusLabelMissing      = NvdimmNamespaceHealthStatus("labelMissing")
+	NvdimmNamespaceHealthStatusInterleaveBroken  = NvdimmNamespaceHealthStatus("interleaveBroken")
+	NvdimmNamespaceHealthStatusLabelInconsistent = NvdimmNamespaceHealthStatus("labelInconsistent")
+	NvdimmNamespaceHealthStatusBttCorrupt        = NvdimmNamespaceHealthStatus("bttCorrupt")
+	NvdimmNamespaceHealthStatusBadBlockSize      = NvdimmNamespaceHealthStatus("badBlockSize")
+)
+
+func init() {
+	t["NvdimmNamespaceHealthStatus"] = reflect.TypeOf((*NvdimmNamespaceHealthStatus)(nil)).Elem()
+}
+
+type NvdimmNamespaceState string
+
+const (
+	NvdimmNamespaceStateInvalid  = NvdimmNamespaceState("invalid")
+	NvdimmNamespaceStateNotInUse = NvdimmNamespaceState("notInUse")
+	NvdimmNamespaceStateInUse    = NvdimmNamespaceState("inUse")
+)
+
+func init() {
+	t["NvdimmNamespaceState"] = reflect.TypeOf((*NvdimmNamespaceState)(nil)).Elem()
+}
+
+type NvdimmNamespaceType string
+
+const (
+	NvdimmNamespaceTypeBlockNamespace      = NvdimmNamespaceType("blockNamespace")
+	NvdimmNamespaceTypePersistentNamespace = NvdimmNamespaceType("persistentNamespace")
+)
+
+func init() {
+	t["NvdimmNamespaceType"] = reflect.TypeOf((*NvdimmNamespaceType)(nil)).Elem()
+}
+
+type NvdimmNvdimmHealthInfoState string
+
+const (
+	NvdimmNvdimmHealthInfoStateNormal = NvdimmNvdimmHealthInfoState("normal")
+	NvdimmNvdimmHealthInfoStateError  = NvdimmNvdimmHealthInfoState("error")
+)
+
+func init() {
+	t["NvdimmNvdimmHealthInfoState"] = reflect.TypeOf((*NvdimmNvdimmHealthInfoState)(nil)).Elem()
+}
+
+type NvdimmRangeType string
+
+const (
+	NvdimmRangeTypeVolatileRange              = NvdimmRangeType("volatileRange")
+	NvdimmRangeTypePersistentRange            = NvdimmRangeType("persistentRange")
+	NvdimmRangeTypeControlRange               = NvdimmRangeType("controlRange")
+	NvdimmRangeTypeBlockRange                 = NvdimmRangeType("blockRange")
+	NvdimmRangeTypeVolatileVirtualDiskRange   = NvdimmRangeType("volatileVirtualDiskRange")
+	NvdimmRangeTypeVolatileVirtualCDRange     = NvdimmRangeType("volatileVirtualCDRange")
+	NvdimmRangeTypePersistentVirtualDiskRange = NvdimmRangeType("persistentVirtualDiskRange")
+	NvdimmRangeTypePersistentVirtualCDRange   = NvdimmRangeType("persistentVirtualCDRange")
+)
+
+func init() {
+	t["NvdimmRangeType"] = reflect.TypeOf((*NvdimmRangeType)(nil)).Elem()
+}
+
 type ObjectUpdateKind string
 
 const (
@@ -2491,6 +2757,20 @@ func init() {
 	t["ProfileNumericComparator"] = reflect.TypeOf((*ProfileNumericComparator)(nil)).Elem()
 }
 
+type ProfileParameterMetadataRelationType string
+
+const (
+	ProfileParameterMetadataRelationTypeDynamic_relation     = ProfileParameterMetadataRelationType("dynamic_relation")
+	ProfileParameterMetadataRelationTypeExtensible_relation  = ProfileParameterMetadataRelationType("extensible_relation")
+	ProfileParameterMetadataRelationTypeLocalizable_relation = ProfileParameterMetadataRelationType("localizable_relation")
+	ProfileParameterMetadataRelationTypeStatic_relation      = ProfileParameterMetadataRelationType("static_relation")
+	ProfileParameterMetadataRelationTypeValidation_relation  = ProfileParameterMetadataRelationType("validation_relation")
+)
+
+func init() {
+	t["ProfileParameterMetadataRelationType"] = reflect.TypeOf((*ProfileParameterMetadataRelationType)(nil)).Elem()
+}
+
 type PropertyChangeOp string
 
 const (
@@ -2611,6 +2891,8 @@ const (
 	ReplicationVmConfigFaultReasonForFaultReplicationNotEnabled                    = ReplicationVmConfigFaultReasonForFault("replicationNotEnabled")
 	ReplicationVmConfigFaultReasonForFaultReplicationConfigurationFailed           = ReplicationVmConfigFaultReasonForFault("replicationConfigurationFailed")
 	ReplicationVmConfigFaultReasonForFaultEncryptedVm                              = ReplicationVmConfigFaultReasonForFault("encryptedVm")
+	ReplicationVmConfigFaultReasonForFaultInvalidThumbprint                        = ReplicationVmConfigFaultReasonForFault("invalidThumbprint")
+	ReplicationVmConfigFaultReasonForFaultIncompatibleDevice                       = ReplicationVmConfigFaultReasonForFault("incompatibleDevice")
 )
 
 func init() {
@@ -2628,6 +2910,7 @@ const (
 	ReplicationVmFaultReasonForFaultInvalidState       = ReplicationVmFaultReasonForFault("invalidState")
 	ReplicationVmFaultReasonForFaultInvalidInstanceId  = ReplicationVmFaultReasonForFault("invalidInstanceId")
 	ReplicationVmFaultReasonForFaultCloseDiskError     = ReplicationVmFaultReasonForFault("closeDiskError")
+	ReplicationVmFaultReasonForFaultGroupExist         = ReplicationVmFaultReasonForFault("groupExist")
 )
 
 func init() {
@@ -2688,10 +2971,11 @@ func init() {
 type ScsiDiskType string
 
 const (
-	ScsiDiskTypeNative512   = ScsiDiskType("native512")
-	ScsiDiskTypeEmulated512 = ScsiDiskType("emulated512")
-	ScsiDiskTypeNative4k    = ScsiDiskType("native4k")
-	ScsiDiskTypeUnknown     = ScsiDiskType("unknown")
+	ScsiDiskTypeNative512          = ScsiDiskType("native512")
+	ScsiDiskTypeEmulated512        = ScsiDiskType("emulated512")
+	ScsiDiskTypeNative4k           = ScsiDiskType("native4k")
+	ScsiDiskTypeSoftwareEmulated4k = ScsiDiskType("SoftwareEmulated4k")
+	ScsiDiskTypeUnknown            = ScsiDiskType("unknown")
 )
 
 func init() {
@@ -3266,6 +3550,18 @@ func init() {
 	t["VirtualDeviceConfigSpecOperation"] = reflect.TypeOf((*VirtualDeviceConfigSpecOperation)(nil)).Elem()
 }
 
+type VirtualDeviceConnectInfoMigrateConnectOp string
+
+const (
+	VirtualDeviceConnectInfoMigrateConnectOpConnect    = VirtualDeviceConnectInfoMigrateConnectOp("connect")
+	VirtualDeviceConnectInfoMigrateConnectOpDisconnect = VirtualDeviceConnectInfoMigrateConnectOp("disconnect")
+	VirtualDeviceConnectInfoMigrateConnectOpUnset      = VirtualDeviceConnectInfoMigrateConnectOp("unset")
+)
+
+func init() {
+	t["VirtualDeviceConnectInfoMigrateConnectOp"] = reflect.TypeOf((*VirtualDeviceConnectInfoMigrateConnectOp)(nil)).Elem()
+}
+
 type VirtualDeviceConnectInfoStatus string
 
 const (
@@ -3365,6 +3661,18 @@ func init() {
 	t["VirtualDiskMode"] = reflect.TypeOf((*VirtualDiskMode)(nil)).Elem()
 }
 
+type VirtualDiskRuleSpecRuleType string
+
+const (
+	VirtualDiskRuleSpecRuleTypeAffinity     = VirtualDiskRuleSpecRuleType("affinity")
+	VirtualDiskRuleSpecRuleTypeAntiAffinity = VirtualDiskRuleSpecRuleType("antiAffinity")
+	VirtualDiskRuleSpecRuleTypeDisabled     = VirtualDiskRuleSpecRuleType("disabled")
+)
+
+func init() {
+	t["VirtualDiskRuleSpecRuleType"] = reflect.TypeOf((*VirtualDiskRuleSpecRuleType)(nil)).Elem()
+}
+
 type VirtualDiskSharing string
 
 const (
@@ -3530,6 +3838,17 @@ func init() {
 	t["VirtualMachineConnectionState"] = reflect.TypeOf((*VirtualMachineConnectionState)(nil)).Elem()
 }
 
+type VirtualMachineCryptoState string
+
+const (
+	VirtualMachineCryptoStateUnlocked = VirtualMachineCryptoState("unlocked")
+	VirtualMachineCryptoStateLocked   = VirtualMachineCryptoState("locked")
+)
+
+func init() {
+	t["VirtualMachineCryptoState"] = reflect.TypeOf((*VirtualMachineCryptoState)(nil)).Elem()
+}
+
 type VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeStateVmDirectPathGen2InactiveReasonOther string
 
 const (
@@ -3725,6 +4044,10 @@ const (
 	VirtualMachineGuestOsIdentifierWindowsHyperVGuest      = VirtualMachineGuestOsIdentifier("windowsHyperVGuest")
 	VirtualMachineGuestOsIdentifierFreebsdGuest            = VirtualMachineGuestOsIdentifier("freebsdGuest")
 	VirtualMachineGuestOsIdentifierFreebsd64Guest          = VirtualMachineGuestOsIdentifier("freebsd64Guest")
+	VirtualMachineGuestOsIdentifierFreebsd11Guest          = VirtualMachineGuestOsIdentifier("freebsd11Guest")
+	VirtualMachineGuestOsIdentifierFreebsd11_64Guest       = VirtualMachineGuestOsIdentifier("freebsd11_64Guest")
+	VirtualMachineGuestOsIdentifierFreebsd12Guest          = VirtualMachineGuestOsIdentifier("freebsd12Guest")
+	VirtualMachineGuestOsIdentifierFreebsd12_64Guest       = VirtualMachineGuestOsIdentifier("freebsd12_64Guest")
 	VirtualMachineGuestOsIdentifierRedhatGuest             = VirtualMachineGuestOsIdentifier("redhatGuest")
 	VirtualMachineGuestOsIdentifierRhel2Guest              = VirtualMachineGuestOsIdentifier("rhel2Guest")
 	VirtualMachineGuestOsIdentifierRhel3Guest              = VirtualMachineGuestOsIdentifier("rhel3Guest")
@@ -3737,18 +4060,21 @@ const (
 	VirtualMachineGuestOsIdentifierRhel6_64Guest           = VirtualMachineGuestOsIdentifier("rhel6_64Guest")
 	VirtualMachineGuestOsIdentifierRhel7Guest              = VirtualMachineGuestOsIdentifier("rhel7Guest")
 	VirtualMachineGuestOsIdentifierRhel7_64Guest           = VirtualMachineGuestOsIdentifier("rhel7_64Guest")
+	VirtualMachineGuestOsIdentifierRhel8_64Guest           = VirtualMachineGuestOsIdentifier("rhel8_64Guest")
 	VirtualMachineGuestOsIdentifierCentosGuest             = VirtualMachineGuestOsIdentifier("centosGuest")
 	VirtualMachineGuestOsIdentifierCentos64Guest           = VirtualMachineGuestOsIdentifier("centos64Guest")
 	VirtualMachineGuestOsIdentifierCentos6Guest            = VirtualMachineGuestOsIdentifier("centos6Guest")
 	VirtualMachineGuestOsIdentifierCentos6_64Guest         = VirtualMachineGuestOsIdentifier("centos6_64Guest")
 	VirtualMachineGuestOsIdentifierCentos7Guest            = VirtualMachineGuestOsIdentifier("centos7Guest")
 	VirtualMachineGuestOsIdentifierCentos7_64Guest         = VirtualMachineGuestOsIdentifier("centos7_64Guest")
+	VirtualMachineGuestOsIdentifierCentos8_64Guest         = VirtualMachineGuestOsIdentifier("centos8_64Guest")
 	VirtualMachineGuestOsIdentifierOracleLinuxGuest        = VirtualMachineGuestOsIdentifier("oracleLinuxGuest")
 	VirtualMachineGuestOsIdentifierOracleLinux64Guest      = VirtualMachineGuestOsIdentifier("oracleLinux64Guest")
 	VirtualMachineGuestOsIdentifierOracleLinux6Guest       = VirtualMachineGuestOsIdentifier("oracleLinux6Guest")
 	VirtualMachineGuestOsIdentifierOracleLinux6_64Guest    = VirtualMachineGuestOsIdentifier("oracleLinux6_64Guest")
 	VirtualMachineGuestOsIdentifierOracleLinux7Guest       = VirtualMachineGuestOsIdentifier("oracleLinux7Guest")
 	VirtualMachineGuestOsIdentifierOracleLinux7_64Guest    = VirtualMachineGuestOsIdentifier("oracleLinux7_64Guest")
+	VirtualMachineGuestOsIdentifierOracleLinux8_64Guest    = VirtualMachineGuestOsIdentifier("oracleLinux8_64Guest")
 	VirtualMachineGuestOsIdentifierSuseGuest               = VirtualMachineGuestOsIdentifier("suseGuest")
 	VirtualMachineGuestOsIdentifierSuse64Guest             = VirtualMachineGuestOsIdentifier("suse64Guest")
 	VirtualMachineGuestOsIdentifierSlesGuest               = VirtualMachineGuestOsIdentifier("slesGuest")
@@ -3759,6 +4085,7 @@ const (
 	VirtualMachineGuestOsIdentifierSles11_64Guest          = VirtualMachineGuestOsIdentifier("sles11_64Guest")
 	VirtualMachineGuestOsIdentifierSles12Guest             = VirtualMachineGuestOsIdentifier("sles12Guest")
 	VirtualMachineGuestOsIdentifierSles12_64Guest          = VirtualMachineGuestOsIdentifier("sles12_64Guest")
+	VirtualMachineGuestOsIdentifierSles15_64Guest          = VirtualMachineGuestOsIdentifier("sles15_64Guest")
 	VirtualMachineGuestOsIdentifierNld9Guest               = VirtualMachineGuestOsIdentifier("nld9Guest")
 	VirtualMachineGuestOsIdentifierOesGuest                = VirtualMachineGuestOsIdentifier("oesGuest")
 	VirtualMachineGuestOsIdentifierSjdsGuest               = VirtualMachineGuestOsIdentifier("sjdsGuest")
@@ -3789,6 +4116,7 @@ const (
 	VirtualMachineGuestOsIdentifierAsianux4_64Guest        = VirtualMachineGuestOsIdentifier("asianux4_64Guest")
 	VirtualMachineGuestOsIdentifierAsianux5_64Guest        = VirtualMachineGuestOsIdentifier("asianux5_64Guest")
 	VirtualMachineGuestOsIdentifierAsianux7_64Guest        = VirtualMachineGuestOsIdentifier("asianux7_64Guest")
+	VirtualMachineGuestOsIdentifierAsianux8_64Guest        = VirtualMachineGuestOsIdentifier("asianux8_64Guest")
 	VirtualMachineGuestOsIdentifierOpensuseGuest           = VirtualMachineGuestOsIdentifier("opensuseGuest")
 	VirtualMachineGuestOsIdentifierOpensuse64Guest         = VirtualMachineGuestOsIdentifier("opensuse64Guest")
 	VirtualMachineGuestOsIdentifierFedoraGuest             = VirtualMachineGuestOsIdentifier("fedoraGuest")
@@ -3799,10 +4127,12 @@ const (
 	VirtualMachineGuestOsIdentifierOther26xLinuxGuest      = VirtualMachineGuestOsIdentifier("other26xLinuxGuest")
 	VirtualMachineGuestOsIdentifierOtherLinuxGuest         = VirtualMachineGuestOsIdentifier("otherLinuxGuest")
 	VirtualMachineGuestOsIdentifierOther3xLinuxGuest       = VirtualMachineGuestOsIdentifier("other3xLinuxGuest")
+	VirtualMachineGuestOsIdentifierOther4xLinuxGuest       = VirtualMachineGuestOsIdentifier("other4xLinuxGuest")
 	VirtualMachineGuestOsIdentifierGenericLinuxGuest       = VirtualMachineGuestOsIdentifier("genericLinuxGuest")
 	VirtualMachineGuestOsIdentifierOther24xLinux64Guest    = VirtualMachineGuestOsIdentifier("other24xLinux64Guest")
 	VirtualMachineGuestOsIdentifierOther26xLinux64Guest    = VirtualMachineGuestOsIdentifier("other26xLinux64Guest")
 	VirtualMachineGuestOsIdentifierOther3xLinux64Guest     = VirtualMachineGuestOsIdentifier("other3xLinux64Guest")
+	VirtualMachineGuestOsIdentifierOther4xLinux64Guest     = VirtualMachineGuestOsIdentifier("other4xLinux64Guest")
 	VirtualMachineGuestOsIdentifierOtherLinux64Guest       = VirtualMachineGuestOsIdentifier("otherLinux64Guest")
 	VirtualMachineGuestOsIdentifierSolaris6Guest           = VirtualMachineGuestOsIdentifier("solaris6Guest")
 	VirtualMachineGuestOsIdentifierSolaris7Guest           = VirtualMachineGuestOsIdentifier("solaris7Guest")
@@ -3831,6 +4161,8 @@ const (
 	VirtualMachineGuestOsIdentifierDarwin14_64Guest        = VirtualMachineGuestOsIdentifier("darwin14_64Guest")
 	VirtualMachineGuestOsIdentifierDarwin15_64Guest        = VirtualMachineGuestOsIdentifier("darwin15_64Guest")
 	VirtualMachineGuestOsIdentifierDarwin16_64Guest        = VirtualMachineGuestOsIdentifier("darwin16_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin17_64Guest        = VirtualMachineGuestOsIdentifier("darwin17_64Guest")
+	VirtualMachineGuestOsIdentifierDarwin18_64Guest        = VirtualMachineGuestOsIdentifier("darwin18_64Guest")
 	VirtualMachineGuestOsIdentifierVmkernelGuest           = VirtualMachineGuestOsIdentifier("vmkernelGuest")
 	VirtualMachineGuestOsIdentifierVmkernel5Guest          = VirtualMachineGuestOsIdentifier("vmkernel5Guest")
 	VirtualMachineGuestOsIdentifierVmkernel6Guest          = VirtualMachineGuestOsIdentifier("vmkernel6Guest")
@@ -4051,10 +4383,11 @@ func init() {
 type VirtualMachineTicketType string
 
 const (
-	VirtualMachineTicketTypeMks          = VirtualMachineTicketType("mks")
-	VirtualMachineTicketTypeDevice       = VirtualMachineTicketType("device")
-	VirtualMachineTicketTypeGuestControl = VirtualMachineTicketType("guestControl")
-	VirtualMachineTicketTypeWebmks       = VirtualMachineTicketType("webmks")
+	VirtualMachineTicketTypeMks            = VirtualMachineTicketType("mks")
+	VirtualMachineTicketTypeDevice         = VirtualMachineTicketType("device")
+	VirtualMachineTicketTypeGuestControl   = VirtualMachineTicketType("guestControl")
+	VirtualMachineTicketTypeWebmks         = VirtualMachineTicketType("webmks")
+	VirtualMachineTicketTypeGuestIntegrity = VirtualMachineTicketType("guestIntegrity")
 )
 
 func init() {
@@ -4262,6 +4595,17 @@ func init() {
 	t["VirtualSerialPortEndPoint"] = reflect.TypeOf((*VirtualSerialPortEndPoint)(nil)).Elem()
 }
 
+type VirtualVmxnet3VrdmaOptionDeviceProtocols string
+
+const (
+	VirtualVmxnet3VrdmaOptionDeviceProtocolsRocev1 = VirtualVmxnet3VrdmaOptionDeviceProtocols("rocev1")
+	VirtualVmxnet3VrdmaOptionDeviceProtocolsRocev2 = VirtualVmxnet3VrdmaOptionDeviceProtocols("rocev2")
+)
+
+func init() {
+	t["VirtualVmxnet3VrdmaOptionDeviceProtocols"] = reflect.TypeOf((*VirtualVmxnet3VrdmaOptionDeviceProtocols)(nil)).Elem()
+}
+
 type VmDasBeingResetEventReasonCode string
 
 const (
@@ -4319,6 +4663,8 @@ const (
 	VmFaultToleranceConfigIssueReasonForIssueCpuHwmmuUnsupported            = VmFaultToleranceConfigIssueReasonForIssue("cpuHwmmuUnsupported")
 	VmFaultToleranceConfigIssueReasonForIssueCpuHvDisabled                  = VmFaultToleranceConfigIssueReasonForIssue("cpuHvDisabled")
 	VmFaultToleranceConfigIssueReasonForIssueHasEFIFirmware                 = VmFaultToleranceConfigIssueReasonForIssue("hasEFIFirmware")
+	VmFaultToleranceConfigIssueReasonForIssueTooManyVCPUs                   = VmFaultToleranceConfigIssueReasonForIssue("tooManyVCPUs")
+	VmFaultToleranceConfigIssueReasonForIssueTooMuchMemory                  = VmFaultToleranceConfigIssueReasonForIssue("tooMuchMemory")
 )
 
 func init() {
@@ -4464,3 +4810,15 @@ const (
 func init() {
 	t["WillLoseHAProtectionResolution"] = reflect.TypeOf((*WillLoseHAProtectionResolution)(nil)).Elem()
 }
+
+type VslmVStorageObjectControlFlag string
+
+const (
+	VslmVStorageObjectControlFlagKeepAfterDeleteVm          = VslmVStorageObjectControlFlag("keepAfterDeleteVm")
+	VslmVStorageObjectControlFlagDisableRelocation          = VslmVStorageObjectControlFlag("disableRelocation")
+	VslmVStorageObjectControlFlagEnableChangedBlockTracking = VslmVStorageObjectControlFlag("enableChangedBlockTracking")
+)
+
+func init() {
+	t["vslmVStorageObjectControlFlag"] = reflect.TypeOf((*VslmVStorageObjectControlFlag)(nil)).Elem()
+}
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/helpers.go b/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
index 7ccfd29b63..95c49f333f 100644
--- a/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
+++ b/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
@@ -71,7 +71,7 @@ func defaultResourceAllocationInfo() ResourceAllocationInfo {
 	return ResourceAllocationInfo{
 		Reservation:           NewInt64(0),
 		ExpandableReservation: NewBool(true),
-		Limit: NewInt64(-1),
+		Limit:                 NewInt64(-1),
 		Shares: &SharesInfo{
 			Level: SharesLevelNormal,
 		},
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/if.go b/vendor/github.com/vmware/govmomi/vim25/types/if.go
index 5b93cb433f..7576198e63 100644
--- a/vendor/github.com/vmware/govmomi/vim25/types/if.go
+++ b/vendor/github.com/vmware/govmomi/vim25/types/if.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -786,6 +786,7 @@ func (b *DvsFilterConfig) GetDvsFilterConfig() *DvsFilterConfig { return b }
 
 type BaseDvsFilterConfig interface {
 	GetDvsFilterConfig() *DvsFilterConfig
+	GetDvsTrafficFilterConfig() *DvsTrafficFilterConfig
 }
 
 func init() {
@@ -828,12 +829,21 @@ func (b *DvsNetworkRuleQualifier) GetDvsNetworkRuleQualifier() *DvsNetworkRuleQu
 
 type BaseDvsNetworkRuleQualifier interface {
 	GetDvsNetworkRuleQualifier() *DvsNetworkRuleQualifier
+	GetDvsIpNetworkRuleQualifier() *DvsIpNetworkRuleQualifier
 }
 
 func init() {
 	t["BaseDvsNetworkRuleQualifier"] = reflect.TypeOf((*DvsNetworkRuleQualifier)(nil)).Elem()
 }
 
+func (b *DvsIpNetworkRuleQualifier) GetDvsIpNetworkRuleQualifier() *DvsIpNetworkRuleQualifier {
+	return b
+}
+
+type BaseDvsIpNetworkRuleQualifier interface {
+	GetDvsIpNetworkRuleQualifier() *DvsIpNetworkRuleQualifier
+}
+
 func (b *DvsTrafficFilterConfig) GetDvsTrafficFilterConfig() *DvsTrafficFilterConfig { return b }
 
 type BaseDvsTrafficFilterConfig interface {
diff --git a/vendor/github.com/vmware/govmomi/vim25/types/types.go b/vendor/github.com/vmware/govmomi/vim25/types/types.go
index 564fd18ea9..e990e273e2 100644
--- a/vendor/github.com/vmware/govmomi/vim25/types/types.go
+++ b/vendor/github.com/vmware/govmomi/vim25/types/types.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ limitations under the License.
 package types
 
 import (
-	"net/url"
 	"reflect"
 	"time"
 )
@@ -897,6 +896,18 @@ func init() {
 	t["AlarmExpression"] = reflect.TypeOf((*AlarmExpression)(nil)).Elem()
 }
 
+type AlarmFilterSpec struct {
+	DynamicData
+
+	Status      []ManagedEntityStatus `xml:"status,omitempty"`
+	TypeEntity  string                `xml:"typeEntity,omitempty"`
+	TypeTrigger string                `xml:"typeTrigger,omitempty"`
+}
+
+func init() {
+	t["AlarmFilterSpec"] = reflect.TypeOf((*AlarmFilterSpec)(nil)).Elem()
+}
+
 type AlarmInfo struct {
 	AlarmSpec
 
@@ -1338,6 +1349,26 @@ type ApplyEntitiesConfig_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type ApplyEvcModeVMRequestType struct {
+	This          ManagedObjectReference `xml:"_this"`
+	Mask          []HostFeatureMask      `xml:"mask,omitempty"`
+	CompleteMasks *bool                  `xml:"completeMasks"`
+}
+
+func init() {
+	t["ApplyEvcModeVMRequestType"] = reflect.TypeOf((*ApplyEvcModeVMRequestType)(nil)).Elem()
+}
+
+type ApplyEvcModeVM_Task ApplyEvcModeVMRequestType
+
+func init() {
+	t["ApplyEvcModeVM_Task"] = reflect.TypeOf((*ApplyEvcModeVM_Task)(nil)).Elem()
+}
+
+type ApplyEvcModeVM_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type ApplyHostConfigRequestType struct {
 	This       ManagedObjectReference                 `xml:"_this"`
 	Host       ManagedObjectReference                 `xml:"host"`
@@ -1359,6 +1390,20 @@ type ApplyHostConfig_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type ApplyHostProfileConfigurationResult struct {
+	DynamicData
+
+	StartTime    time.Time              `xml:"startTime"`
+	CompleteTime time.Time              `xml:"completeTime"`
+	Host         ManagedObjectReference `xml:"host"`
+	Status       string                 `xml:"status"`
+	Errors       []LocalizedMethodFault `xml:"errors,omitempty"`
+}
+
+func init() {
+	t["ApplyHostProfileConfigurationResult"] = reflect.TypeOf((*ApplyHostProfileConfigurationResult)(nil)).Elem()
+}
+
 type ApplyHostProfileConfigurationSpec struct {
 	ProfileExecuteResult
 
@@ -1387,6 +1432,7 @@ type ApplyProfile struct {
 	ToReplaceWith    *bool                         `xml:"toReplaceWith"`
 	ToBeDeleted      *bool                         `xml:"toBeDeleted"`
 	CopyEnableStatus *bool                         `xml:"copyEnableStatus"`
+	Hidden           *bool                         `xml:"hidden"`
 }
 
 func init() {
@@ -1544,13 +1590,21 @@ func init() {
 }
 
 type ArrayOfAnyURI struct {
-	AnyURI []url.URL `xml:"anyURI,omitempty"`
+	AnyURI []string `xml:"anyURI,omitempty"`
 }
 
 func init() {
 	t["ArrayOfAnyURI"] = reflect.TypeOf((*ArrayOfAnyURI)(nil)).Elem()
 }
 
+type ArrayOfApplyHostProfileConfigurationResult struct {
+	ApplyHostProfileConfigurationResult []ApplyHostProfileConfigurationResult `xml:"ApplyHostProfileConfigurationResult,omitempty"`
+}
+
+func init() {
+	t["ArrayOfApplyHostProfileConfigurationResult"] = reflect.TypeOf((*ArrayOfApplyHostProfileConfigurationResult)(nil)).Elem()
+}
+
 type ArrayOfApplyHostProfileConfigurationSpec struct {
 	ApplyHostProfileConfigurationSpec []ApplyHostProfileConfigurationSpec `xml:"ApplyHostProfileConfigurationSpec,omitempty"`
 }
@@ -1591,6 +1645,14 @@ func init() {
 	t["ArrayOfAutoStartPowerInfo"] = reflect.TypeOf((*ArrayOfAutoStartPowerInfo)(nil)).Elem()
 }
 
+type ArrayOfBase64Binary struct {
+	Base64Binary [][]byte `xml:"base64Binary,omitempty"`
+}
+
+func init() {
+	t["ArrayOfBase64Binary"] = reflect.TypeOf((*ArrayOfBase64Binary)(nil)).Elem()
+}
+
 type ArrayOfBoolean struct {
 	Boolean []bool `xml:"boolean,omitempty"`
 }
@@ -2471,6 +2533,22 @@ func init() {
 	t["ArrayOfFaultToleranceDiskSpec"] = reflect.TypeOf((*ArrayOfFaultToleranceDiskSpec)(nil)).Elem()
 }
 
+type ArrayOfFaultsByHost struct {
+	FaultsByHost []FaultsByHost `xml:"FaultsByHost,omitempty"`
+}
+
+func init() {
+	t["ArrayOfFaultsByHost"] = reflect.TypeOf((*ArrayOfFaultsByHost)(nil)).Elem()
+}
+
+type ArrayOfFaultsByVM struct {
+	FaultsByVM []FaultsByVM `xml:"FaultsByVM,omitempty"`
+}
+
+func init() {
+	t["ArrayOfFaultsByVM"] = reflect.TypeOf((*ArrayOfFaultsByVM)(nil)).Elem()
+}
+
 type ArrayOfFcoeConfigVlanRange struct {
 	FcoeConfigVlanRange []FcoeConfigVlanRange `xml:"FcoeConfigVlanRange,omitempty"`
 }
@@ -3295,6 +3373,14 @@ func init() {
 	t["ArrayOfHostPowerPolicy"] = reflect.TypeOf((*ArrayOfHostPowerPolicy)(nil)).Elem()
 }
 
+type ArrayOfHostProfileManagerCompositionResultResultElement struct {
+	HostProfileManagerCompositionResultResultElement []HostProfileManagerCompositionResultResultElement `xml:"HostProfileManagerCompositionResultResultElement,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostProfileManagerCompositionResultResultElement"] = reflect.TypeOf((*ArrayOfHostProfileManagerCompositionResultResultElement)(nil)).Elem()
+}
+
 type ArrayOfHostProfileManagerCompositionValidationResultResultElement struct {
 	HostProfileManagerCompositionValidationResultResultElement []HostProfileManagerCompositionValidationResultResultElement `xml:"HostProfileManagerCompositionValidationResultResultElement,omitempty"`
 }
@@ -3415,6 +3501,14 @@ func init() {
 	t["ArrayOfHostServiceConfig"] = reflect.TypeOf((*ArrayOfHostServiceConfig)(nil)).Elem()
 }
 
+type ArrayOfHostSharedGpuCapabilities struct {
+	HostSharedGpuCapabilities []HostSharedGpuCapabilities `xml:"HostSharedGpuCapabilities,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHostSharedGpuCapabilities"] = reflect.TypeOf((*ArrayOfHostSharedGpuCapabilities)(nil)).Elem()
+}
+
 type ArrayOfHostSnmpDestination struct {
 	HostSnmpDestination []HostSnmpDestination `xml:"HostSnmpDestination,omitempty"`
 }
@@ -3703,6 +3797,14 @@ func init() {
 	t["ArrayOfHttpNfcLeaseManifestEntry"] = reflect.TypeOf((*ArrayOfHttpNfcLeaseManifestEntry)(nil)).Elem()
 }
 
+type ArrayOfHttpNfcLeaseSourceFile struct {
+	HttpNfcLeaseSourceFile []HttpNfcLeaseSourceFile `xml:"HttpNfcLeaseSourceFile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfHttpNfcLeaseSourceFile"] = reflect.TypeOf((*ArrayOfHttpNfcLeaseSourceFile)(nil)).Elem()
+}
+
 type ArrayOfID struct {
 	ID []ID `xml:"ID,omitempty"`
 }
@@ -3887,6 +3989,14 @@ func init() {
 	t["ArrayOfLong"] = reflect.TypeOf((*ArrayOfLong)(nil)).Elem()
 }
 
+type ArrayOfManagedEntityStatus struct {
+	ManagedEntityStatus []ManagedEntityStatus `xml:"ManagedEntityStatus,omitempty"`
+}
+
+func init() {
+	t["ArrayOfManagedEntityStatus"] = reflect.TypeOf((*ArrayOfManagedEntityStatus)(nil)).Elem()
+}
+
 type ArrayOfManagedObjectReference struct {
 	ManagedObjectReference []ManagedObjectReference `xml:"ManagedObjectReference,omitempty"`
 }
@@ -3999,6 +4109,14 @@ func init() {
 	t["ArrayOfNetStackInstanceProfile"] = reflect.TypeOf((*ArrayOfNetStackInstanceProfile)(nil)).Elem()
 }
 
+type ArrayOfNsxHostVNicProfile struct {
+	NsxHostVNicProfile []NsxHostVNicProfile `xml:"NsxHostVNicProfile,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNsxHostVNicProfile"] = reflect.TypeOf((*ArrayOfNsxHostVNicProfile)(nil)).Elem()
+}
+
 type ArrayOfNumericRange struct {
 	NumericRange []NumericRange `xml:"NumericRange,omitempty"`
 }
@@ -4007,6 +4125,46 @@ func init() {
 	t["ArrayOfNumericRange"] = reflect.TypeOf((*ArrayOfNumericRange)(nil)).Elem()
 }
 
+type ArrayOfNvdimmDimmInfo struct {
+	NvdimmDimmInfo []NvdimmDimmInfo `xml:"NvdimmDimmInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNvdimmDimmInfo"] = reflect.TypeOf((*ArrayOfNvdimmDimmInfo)(nil)).Elem()
+}
+
+type ArrayOfNvdimmGuid struct {
+	NvdimmGuid []NvdimmGuid `xml:"NvdimmGuid,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNvdimmGuid"] = reflect.TypeOf((*ArrayOfNvdimmGuid)(nil)).Elem()
+}
+
+type ArrayOfNvdimmInterleaveSetInfo struct {
+	NvdimmInterleaveSetInfo []NvdimmInterleaveSetInfo `xml:"NvdimmInterleaveSetInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNvdimmInterleaveSetInfo"] = reflect.TypeOf((*ArrayOfNvdimmInterleaveSetInfo)(nil)).Elem()
+}
+
+type ArrayOfNvdimmNamespaceInfo struct {
+	NvdimmNamespaceInfo []NvdimmNamespaceInfo `xml:"NvdimmNamespaceInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNvdimmNamespaceInfo"] = reflect.TypeOf((*ArrayOfNvdimmNamespaceInfo)(nil)).Elem()
+}
+
+type ArrayOfNvdimmRegionInfo struct {
+	NvdimmRegionInfo []NvdimmRegionInfo `xml:"NvdimmRegionInfo,omitempty"`
+}
+
+func init() {
+	t["ArrayOfNvdimmRegionInfo"] = reflect.TypeOf((*ArrayOfNvdimmRegionInfo)(nil)).Elem()
+}
+
 type ArrayOfObjectContent struct {
 	ObjectContent []ObjectContent `xml:"ObjectContent,omitempty"`
 }
@@ -4391,6 +4549,14 @@ func init() {
 	t["ArrayOfProfileMetadata"] = reflect.TypeOf((*ArrayOfProfileMetadata)(nil)).Elem()
 }
 
+type ArrayOfProfileMetadataProfileOperationMessage struct {
+	ProfileMetadataProfileOperationMessage []ProfileMetadataProfileOperationMessage `xml:"ProfileMetadataProfileOperationMessage,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileMetadataProfileOperationMessage"] = reflect.TypeOf((*ArrayOfProfileMetadataProfileOperationMessage)(nil)).Elem()
+}
+
 type ArrayOfProfileMetadataProfileSortSpec struct {
 	ProfileMetadataProfileSortSpec []ProfileMetadataProfileSortSpec `xml:"ProfileMetadataProfileSortSpec,omitempty"`
 }
@@ -4407,6 +4573,14 @@ func init() {
 	t["ArrayOfProfileParameterMetadata"] = reflect.TypeOf((*ArrayOfProfileParameterMetadata)(nil)).Elem()
 }
 
+type ArrayOfProfileParameterMetadataParameterRelationMetadata struct {
+	ProfileParameterMetadataParameterRelationMetadata []ProfileParameterMetadataParameterRelationMetadata `xml:"ProfileParameterMetadataParameterRelationMetadata,omitempty"`
+}
+
+func init() {
+	t["ArrayOfProfileParameterMetadataParameterRelationMetadata"] = reflect.TypeOf((*ArrayOfProfileParameterMetadataParameterRelationMetadata)(nil)).Elem()
+}
+
 type ArrayOfProfilePolicy struct {
 	ProfilePolicy []ProfilePolicy `xml:"ProfilePolicy,omitempty"`
 }
@@ -4511,6 +4685,14 @@ func init() {
 	t["ArrayOfResourceConfigSpec"] = reflect.TypeOf((*ArrayOfResourceConfigSpec)(nil)).Elem()
 }
 
+type ArrayOfRetrieveVStorageObjSpec struct {
+	RetrieveVStorageObjSpec []RetrieveVStorageObjSpec `xml:"RetrieveVStorageObjSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfRetrieveVStorageObjSpec"] = reflect.TypeOf((*ArrayOfRetrieveVStorageObjSpec)(nil)).Elem()
+}
+
 type ArrayOfScheduledTaskDetail struct {
 	ScheduledTaskDetail []ScheduledTaskDetail `xml:"ScheduledTaskDetail,omitempty"`
 }
@@ -4903,6 +5085,30 @@ func init() {
 	t["ArrayOfVMwareVspanSession"] = reflect.TypeOf((*ArrayOfVMwareVspanSession)(nil)).Elem()
 }
 
+type ArrayOfVStorageObjectAssociations struct {
+	VStorageObjectAssociations []VStorageObjectAssociations `xml:"VStorageObjectAssociations,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVStorageObjectAssociations"] = reflect.TypeOf((*ArrayOfVStorageObjectAssociations)(nil)).Elem()
+}
+
+type ArrayOfVStorageObjectAssociationsVmDiskAssociations struct {
+	VStorageObjectAssociationsVmDiskAssociations []VStorageObjectAssociationsVmDiskAssociations `xml:"VStorageObjectAssociationsVmDiskAssociations,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVStorageObjectAssociationsVmDiskAssociations"] = reflect.TypeOf((*ArrayOfVStorageObjectAssociationsVmDiskAssociations)(nil)).Elem()
+}
+
+type ArrayOfVStorageObjectSnapshotInfoVStorageObjectSnapshot struct {
+	VStorageObjectSnapshotInfoVStorageObjectSnapshot []VStorageObjectSnapshotInfoVStorageObjectSnapshot `xml:"VStorageObjectSnapshotInfoVStorageObjectSnapshot,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVStorageObjectSnapshotInfoVStorageObjectSnapshot"] = reflect.TypeOf((*ArrayOfVStorageObjectSnapshotInfoVStorageObjectSnapshot)(nil)).Elem()
+}
+
 type ArrayOfVVolHostPE struct {
 	VVolHostPE []VVolHostPE `xml:"VVolHostPE,omitempty"`
 }
@@ -5007,6 +5213,14 @@ func init() {
 	t["ArrayOfVirtualDiskId"] = reflect.TypeOf((*ArrayOfVirtualDiskId)(nil)).Elem()
 }
 
+type ArrayOfVirtualDiskRuleSpec struct {
+	VirtualDiskRuleSpec []VirtualDiskRuleSpec `xml:"VirtualDiskRuleSpec,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualDiskRuleSpec"] = reflect.TypeOf((*ArrayOfVirtualDiskRuleSpec)(nil)).Elem()
+}
+
 type ArrayOfVirtualMachineBootOptionsBootableDevice struct {
 	VirtualMachineBootOptionsBootableDevice []BaseVirtualMachineBootOptionsBootableDevice `xml:"VirtualMachineBootOptionsBootableDevice,omitempty,typeattr"`
 }
@@ -5223,6 +5437,14 @@ func init() {
 	t["ArrayOfVirtualMachinePciSharedGpuPassthroughInfo"] = reflect.TypeOf((*ArrayOfVirtualMachinePciSharedGpuPassthroughInfo)(nil)).Elem()
 }
 
+type ArrayOfVirtualMachineProfileDetailsDiskProfileDetails struct {
+	VirtualMachineProfileDetailsDiskProfileDetails []VirtualMachineProfileDetailsDiskProfileDetails `xml:"VirtualMachineProfileDetailsDiskProfileDetails,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachineProfileDetailsDiskProfileDetails"] = reflect.TypeOf((*ArrayOfVirtualMachineProfileDetailsDiskProfileDetails)(nil)).Elem()
+}
+
 type ArrayOfVirtualMachineProfileSpec struct {
 	VirtualMachineProfileSpec []BaseVirtualMachineProfileSpec `xml:"VirtualMachineProfileSpec,omitempty,typeattr"`
 }
@@ -5231,6 +5453,14 @@ func init() {
 	t["ArrayOfVirtualMachineProfileSpec"] = reflect.TypeOf((*ArrayOfVirtualMachineProfileSpec)(nil)).Elem()
 }
 
+type ArrayOfVirtualMachinePropertyRelation struct {
+	VirtualMachinePropertyRelation []VirtualMachinePropertyRelation `xml:"VirtualMachinePropertyRelation,omitempty"`
+}
+
+func init() {
+	t["ArrayOfVirtualMachinePropertyRelation"] = reflect.TypeOf((*ArrayOfVirtualMachinePropertyRelation)(nil)).Elem()
+}
+
 type ArrayOfVirtualMachineRelocateSpecDiskLocator struct {
 	VirtualMachineRelocateSpecDiskLocator []VirtualMachineRelocateSpecDiskLocator `xml:"VirtualMachineRelocateSpecDiskLocator,omitempty"`
 }
@@ -5519,6 +5749,14 @@ func init() {
 	t["ArrayOfVslmTagEntry"] = reflect.TypeOf((*ArrayOfVslmTagEntry)(nil)).Elem()
 }
 
+type ArrayOfVslmInfrastructureObjectPolicy struct {
+	VslmInfrastructureObjectPolicy []VslmInfrastructureObjectPolicy `xml:"vslmInfrastructureObjectPolicy,omitempty"`
+}
+
+func init() {
+	t["ArrayOfvslmInfrastructureObjectPolicy"] = reflect.TypeOf((*ArrayOfVslmInfrastructureObjectPolicy)(nil)).Elem()
+}
+
 type ArrayUpdateSpec struct {
 	DynamicData
 
@@ -5866,10 +6104,15 @@ func init() {
 type BaseConfigInfo struct {
 	DynamicData
 
-	Id         ID                            `xml:"id"`
-	Name       string                        `xml:"name"`
-	CreateTime time.Time                     `xml:"createTime"`
-	Backing    BaseBaseConfigInfoBackingInfo `xml:"backing,typeattr"`
+	Id                          ID                            `xml:"id"`
+	Name                        string                        `xml:"name"`
+	CreateTime                  time.Time                     `xml:"createTime"`
+	KeepAfterDeleteVm           *bool                         `xml:"keepAfterDeleteVm"`
+	RelocationDisabled          *bool                         `xml:"relocationDisabled"`
+	NativeSnapshotSupported     *bool                         `xml:"nativeSnapshotSupported"`
+	ChangedBlockTrackingEnabled *bool                         `xml:"changedBlockTrackingEnabled"`
+	Backing                     BaseBaseConfigInfoBackingInfo `xml:"backing,typeattr"`
+	Iofilter                    []string                      `xml:"iofilter,omitempty"`
 }
 
 func init() {
@@ -6635,6 +6878,7 @@ type Capability struct {
 	UserShellAccessSupported         bool      `xml:"userShellAccessSupported"`
 	SupportedEVCMode                 []EVCMode `xml:"supportedEVCMode,omitempty"`
 	NetworkBackupAndRestoreSupported *bool     `xml:"networkBackupAndRestoreSupported"`
+	FtDrsWithoutEvcSupported         *bool     `xml:"ftDrsWithoutEvcSupported"`
 }
 
 func init() {
@@ -6739,6 +6983,25 @@ func init() {
 type ChangeFileAttributesInGuestResponse struct {
 }
 
+type ChangeKeyRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	NewKey CryptoKeyPlain         `xml:"newKey"`
+}
+
+func init() {
+	t["ChangeKeyRequestType"] = reflect.TypeOf((*ChangeKeyRequestType)(nil)).Elem()
+}
+
+type ChangeKey_Task ChangeKeyRequestType
+
+func init() {
+	t["ChangeKey_Task"] = reflect.TypeOf((*ChangeKey_Task)(nil)).Elem()
+}
+
+type ChangeKey_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type ChangeLockdownMode ChangeLockdownModeRequestType
 
 func init() {
@@ -6845,6 +7108,29 @@ type CheckAnswerFileStatus_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type CheckCloneRequestType struct {
+	This     ManagedObjectReference  `xml:"_this"`
+	Vm       ManagedObjectReference  `xml:"vm"`
+	Folder   ManagedObjectReference  `xml:"folder"`
+	Name     string                  `xml:"name"`
+	Spec     VirtualMachineCloneSpec `xml:"spec"`
+	TestType []string                `xml:"testType,omitempty"`
+}
+
+func init() {
+	t["CheckCloneRequestType"] = reflect.TypeOf((*CheckCloneRequestType)(nil)).Elem()
+}
+
+type CheckClone_Task CheckCloneRequestType
+
+func init() {
+	t["CheckClone_Task"] = reflect.TypeOf((*CheckClone_Task)(nil)).Elem()
+}
+
+type CheckClone_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CheckCompatibilityRequestType struct {
 	This     ManagedObjectReference  `xml:"_this"`
 	Vm       ManagedObjectReference  `xml:"vm"`
@@ -6982,6 +7268,27 @@ type CheckHostPatch_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type CheckInstantCloneRequestType struct {
+	This     ManagedObjectReference         `xml:"_this"`
+	Vm       ManagedObjectReference         `xml:"vm"`
+	Spec     VirtualMachineInstantCloneSpec `xml:"spec"`
+	TestType []string                       `xml:"testType,omitempty"`
+}
+
+func init() {
+	t["CheckInstantCloneRequestType"] = reflect.TypeOf((*CheckInstantCloneRequestType)(nil)).Elem()
+}
+
+type CheckInstantClone_Task CheckInstantCloneRequestType
+
+func init() {
+	t["CheckInstantClone_Task"] = reflect.TypeOf((*CheckInstantClone_Task)(nil)).Elem()
+}
+
+type CheckInstantClone_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CheckLicenseFeature CheckLicenseFeatureRequestType
 
 func init() {
@@ -7025,6 +7332,28 @@ type CheckMigrate_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type CheckPowerOnRequestType struct {
+	This     ManagedObjectReference  `xml:"_this"`
+	Vm       ManagedObjectReference  `xml:"vm"`
+	Host     *ManagedObjectReference `xml:"host,omitempty"`
+	Pool     *ManagedObjectReference `xml:"pool,omitempty"`
+	TestType []string                `xml:"testType,omitempty"`
+}
+
+func init() {
+	t["CheckPowerOnRequestType"] = reflect.TypeOf((*CheckPowerOnRequestType)(nil)).Elem()
+}
+
+type CheckPowerOn_Task CheckPowerOnRequestType
+
+func init() {
+	t["CheckPowerOn_Task"] = reflect.TypeOf((*CheckPowerOn_Task)(nil)).Elem()
+}
+
+type CheckPowerOn_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CheckProfileComplianceRequestType struct {
 	This   ManagedObjectReference   `xml:"_this"`
 	Entity []ManagedObjectReference `xml:"entity,omitempty"`
@@ -7078,6 +7407,29 @@ func init() {
 	t["CheckResult"] = reflect.TypeOf((*CheckResult)(nil)).Elem()
 }
 
+type CheckVmConfigRequestType struct {
+	This     ManagedObjectReference   `xml:"_this"`
+	Spec     VirtualMachineConfigSpec `xml:"spec"`
+	Vm       *ManagedObjectReference  `xml:"vm,omitempty"`
+	Host     *ManagedObjectReference  `xml:"host,omitempty"`
+	Pool     *ManagedObjectReference  `xml:"pool,omitempty"`
+	TestType []string                 `xml:"testType,omitempty"`
+}
+
+func init() {
+	t["CheckVmConfigRequestType"] = reflect.TypeOf((*CheckVmConfigRequestType)(nil)).Elem()
+}
+
+type CheckVmConfig_Task CheckVmConfigRequestType
+
+func init() {
+	t["CheckVmConfig_Task"] = reflect.TypeOf((*CheckVmConfig_Task)(nil)).Elem()
+}
+
+type CheckVmConfig_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type ChoiceOption struct {
 	OptionType
 
@@ -7142,6 +7494,44 @@ func init() {
 type ClearSystemEventLogResponse struct {
 }
 
+type ClearTriggeredAlarms ClearTriggeredAlarmsRequestType
+
+func init() {
+	t["ClearTriggeredAlarms"] = reflect.TypeOf((*ClearTriggeredAlarms)(nil)).Elem()
+}
+
+type ClearTriggeredAlarmsRequestType struct {
+	This   ManagedObjectReference `xml:"_this"`
+	Filter AlarmFilterSpec        `xml:"filter"`
+}
+
+func init() {
+	t["ClearTriggeredAlarmsRequestType"] = reflect.TypeOf((*ClearTriggeredAlarmsRequestType)(nil)).Elem()
+}
+
+type ClearTriggeredAlarmsResponse struct {
+}
+
+type ClearVStorageObjectControlFlags ClearVStorageObjectControlFlagsRequestType
+
+func init() {
+	t["ClearVStorageObjectControlFlags"] = reflect.TypeOf((*ClearVStorageObjectControlFlags)(nil)).Elem()
+}
+
+type ClearVStorageObjectControlFlagsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Id           ID                     `xml:"id"`
+	Datastore    ManagedObjectReference `xml:"datastore"`
+	ControlFlags []string               `xml:"controlFlags,omitempty"`
+}
+
+func init() {
+	t["ClearVStorageObjectControlFlagsRequestType"] = reflect.TypeOf((*ClearVStorageObjectControlFlagsRequestType)(nil)).Elem()
+}
+
+type ClearVStorageObjectControlFlagsResponse struct {
+}
+
 type ClockSkew struct {
 	HostConfigFault
 }
@@ -8226,6 +8616,8 @@ type ClusterResourceUsageSummary struct {
 	CpuCapacityMHz    int32 `xml:"cpuCapacityMHz"`
 	MemUsedMB         int32 `xml:"memUsedMB"`
 	MemCapacityMB     int32 `xml:"memCapacityMB"`
+	PMemAvailableMB   int64 `xml:"pMemAvailableMB,omitempty"`
+	PMemCapacityMB    int64 `xml:"pMemCapacityMB,omitempty"`
 	StorageUsedMB     int64 `xml:"storageUsedMB"`
 	StorageCapacityMB int64 `xml:"storageCapacityMB"`
 }
@@ -8462,6 +8854,30 @@ func init() {
 	t["ComplianceResult"] = reflect.TypeOf((*ComplianceResult)(nil)).Elem()
 }
 
+type CompositeHostProfileRequestType struct {
+	This                   ManagedObjectReference   `xml:"_this"`
+	Source                 ManagedObjectReference   `xml:"source"`
+	Targets                []ManagedObjectReference `xml:"targets,omitempty"`
+	ToBeMerged             *HostApplyProfile        `xml:"toBeMerged,omitempty"`
+	ToBeReplacedWith       *HostApplyProfile        `xml:"toBeReplacedWith,omitempty"`
+	ToBeDeleted            *HostApplyProfile        `xml:"toBeDeleted,omitempty"`
+	EnableStatusToBeCopied *HostApplyProfile        `xml:"enableStatusToBeCopied,omitempty"`
+}
+
+func init() {
+	t["CompositeHostProfileRequestType"] = reflect.TypeOf((*CompositeHostProfileRequestType)(nil)).Elem()
+}
+
+type CompositeHostProfile_Task CompositeHostProfileRequestType
+
+func init() {
+	t["CompositeHostProfile_Task"] = reflect.TypeOf((*CompositeHostProfile_Task)(nil)).Elem()
+}
+
+type CompositeHostProfile_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CompositePolicyOption struct {
 	PolicyOption
 
@@ -8594,32 +9010,33 @@ func init() {
 type ConfigTarget struct {
 	DynamicData
 
-	NumCpus                     int32                                       `xml:"numCpus"`
-	NumCpuCores                 int32                                       `xml:"numCpuCores"`
-	NumNumaNodes                int32                                       `xml:"numNumaNodes"`
-	SmcPresent                  *bool                                       `xml:"smcPresent"`
-	Datastore                   []VirtualMachineDatastoreInfo               `xml:"datastore,omitempty"`
-	Network                     []VirtualMachineNetworkInfo                 `xml:"network,omitempty"`
-	OpaqueNetwork               []OpaqueNetworkTargetInfo                   `xml:"opaqueNetwork,omitempty"`
-	DistributedVirtualPortgroup []DistributedVirtualPortgroupInfo           `xml:"distributedVirtualPortgroup,omitempty"`
-	DistributedVirtualSwitch    []DistributedVirtualSwitchInfo              `xml:"distributedVirtualSwitch,omitempty"`
-	CdRom                       []VirtualMachineCdromInfo                   `xml:"cdRom,omitempty"`
-	Serial                      []VirtualMachineSerialInfo                  `xml:"serial,omitempty"`
-	Parallel                    []VirtualMachineParallelInfo                `xml:"parallel,omitempty"`
-	Sound                       []VirtualMachineSoundInfo                   `xml:"sound,omitempty"`
-	Usb                         []VirtualMachineUsbInfo                     `xml:"usb,omitempty"`
-	Floppy                      []VirtualMachineFloppyInfo                  `xml:"floppy,omitempty"`
-	LegacyNetworkInfo           []VirtualMachineLegacyNetworkSwitchInfo     `xml:"legacyNetworkInfo,omitempty"`
-	ScsiPassthrough             []VirtualMachineScsiPassthroughInfo         `xml:"scsiPassthrough,omitempty"`
-	ScsiDisk                    []VirtualMachineScsiDiskDeviceInfo          `xml:"scsiDisk,omitempty"`
-	IdeDisk                     []VirtualMachineIdeDiskDeviceInfo           `xml:"ideDisk,omitempty"`
-	MaxMemMBOptimalPerf         int32                                       `xml:"maxMemMBOptimalPerf"`
-	ResourcePool                *ResourcePoolRuntimeInfo                    `xml:"resourcePool,omitempty"`
-	AutoVmotion                 *bool                                       `xml:"autoVmotion"`
-	PciPassthrough              []BaseVirtualMachinePciPassthroughInfo      `xml:"pciPassthrough,omitempty,typeattr"`
-	Sriov                       []VirtualMachineSriovInfo                   `xml:"sriov,omitempty"`
-	VFlashModule                []VirtualMachineVFlashModuleInfo            `xml:"vFlashModule,omitempty"`
-	SharedGpuPassthroughTypes   []VirtualMachinePciSharedGpuPassthroughInfo `xml:"sharedGpuPassthroughTypes,omitempty"`
+	NumCpus                                int32                                       `xml:"numCpus"`
+	NumCpuCores                            int32                                       `xml:"numCpuCores"`
+	NumNumaNodes                           int32                                       `xml:"numNumaNodes"`
+	SmcPresent                             *bool                                       `xml:"smcPresent"`
+	Datastore                              []VirtualMachineDatastoreInfo               `xml:"datastore,omitempty"`
+	Network                                []VirtualMachineNetworkInfo                 `xml:"network,omitempty"`
+	OpaqueNetwork                          []OpaqueNetworkTargetInfo                   `xml:"opaqueNetwork,omitempty"`
+	DistributedVirtualPortgroup            []DistributedVirtualPortgroupInfo           `xml:"distributedVirtualPortgroup,omitempty"`
+	DistributedVirtualSwitch               []DistributedVirtualSwitchInfo              `xml:"distributedVirtualSwitch,omitempty"`
+	CdRom                                  []VirtualMachineCdromInfo                   `xml:"cdRom,omitempty"`
+	Serial                                 []VirtualMachineSerialInfo                  `xml:"serial,omitempty"`
+	Parallel                               []VirtualMachineParallelInfo                `xml:"parallel,omitempty"`
+	Sound                                  []VirtualMachineSoundInfo                   `xml:"sound,omitempty"`
+	Usb                                    []VirtualMachineUsbInfo                     `xml:"usb,omitempty"`
+	Floppy                                 []VirtualMachineFloppyInfo                  `xml:"floppy,omitempty"`
+	LegacyNetworkInfo                      []VirtualMachineLegacyNetworkSwitchInfo     `xml:"legacyNetworkInfo,omitempty"`
+	ScsiPassthrough                        []VirtualMachineScsiPassthroughInfo         `xml:"scsiPassthrough,omitempty"`
+	ScsiDisk                               []VirtualMachineScsiDiskDeviceInfo          `xml:"scsiDisk,omitempty"`
+	IdeDisk                                []VirtualMachineIdeDiskDeviceInfo           `xml:"ideDisk,omitempty"`
+	MaxMemMBOptimalPerf                    int32                                       `xml:"maxMemMBOptimalPerf"`
+	ResourcePool                           *ResourcePoolRuntimeInfo                    `xml:"resourcePool,omitempty"`
+	AutoVmotion                            *bool                                       `xml:"autoVmotion"`
+	PciPassthrough                         []BaseVirtualMachinePciPassthroughInfo      `xml:"pciPassthrough,omitempty,typeattr"`
+	Sriov                                  []VirtualMachineSriovInfo                   `xml:"sriov,omitempty"`
+	VFlashModule                           []VirtualMachineVFlashModuleInfo            `xml:"vFlashModule,omitempty"`
+	SharedGpuPassthroughTypes              []VirtualMachinePciSharedGpuPassthroughInfo `xml:"sharedGpuPassthroughTypes,omitempty"`
+	AvailablePersistentMemoryReservationMB int64                                       `xml:"availablePersistentMemoryReservationMB,omitempty"`
 }
 
 func init() {
@@ -9349,6 +9766,31 @@ type CreateDirectoryResponse struct {
 	Returnval string `xml:"returnval"`
 }
 
+type CreateDiskFromSnapshotRequestType struct {
+	This       ManagedObjectReference          `xml:"_this"`
+	Id         ID                              `xml:"id"`
+	Datastore  ManagedObjectReference          `xml:"datastore"`
+	SnapshotId ID                              `xml:"snapshotId"`
+	Name       string                          `xml:"name"`
+	Profile    []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+	Crypto     BaseCryptoSpec                  `xml:"crypto,omitempty,typeattr"`
+	Path       string                          `xml:"path,omitempty"`
+}
+
+func init() {
+	t["CreateDiskFromSnapshotRequestType"] = reflect.TypeOf((*CreateDiskFromSnapshotRequestType)(nil)).Elem()
+}
+
+type CreateDiskFromSnapshot_Task CreateDiskFromSnapshotRequestType
+
+func init() {
+	t["CreateDiskFromSnapshot_Task"] = reflect.TypeOf((*CreateDiskFromSnapshot_Task)(nil)).Elem()
+}
+
+type CreateDiskFromSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CreateDiskRequestType struct {
 	This ManagedObjectReference `xml:"_this"`
 	Spec VslmCreateSpec         `xml:"spec"`
@@ -9562,6 +10004,25 @@ type CreateNasDatastoreResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type CreateNvdimmNamespaceRequestType struct {
+	This       ManagedObjectReference    `xml:"_this"`
+	CreateSpec NvdimmNamespaceCreateSpec `xml:"createSpec"`
+}
+
+func init() {
+	t["CreateNvdimmNamespaceRequestType"] = reflect.TypeOf((*CreateNvdimmNamespaceRequestType)(nil)).Elem()
+}
+
+type CreateNvdimmNamespace_Task CreateNvdimmNamespaceRequestType
+
+func init() {
+	t["CreateNvdimmNamespace_Task"] = reflect.TypeOf((*CreateNvdimmNamespace_Task)(nil)).Elem()
+}
+
+type CreateNvdimmNamespace_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CreateObjectScheduledTask CreateObjectScheduledTaskRequestType
 
 func init() {
@@ -10055,6 +10516,41 @@ func init() {
 	t["CryptoKeyResult"] = reflect.TypeOf((*CryptoKeyResult)(nil)).Elem()
 }
 
+type CryptoManagerHostEnable CryptoManagerHostEnableRequestType
+
+func init() {
+	t["CryptoManagerHostEnable"] = reflect.TypeOf((*CryptoManagerHostEnable)(nil)).Elem()
+}
+
+type CryptoManagerHostEnableRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	InitialKey CryptoKeyPlain         `xml:"initialKey"`
+}
+
+func init() {
+	t["CryptoManagerHostEnableRequestType"] = reflect.TypeOf((*CryptoManagerHostEnableRequestType)(nil)).Elem()
+}
+
+type CryptoManagerHostEnableResponse struct {
+}
+
+type CryptoManagerHostPrepare CryptoManagerHostPrepareRequestType
+
+func init() {
+	t["CryptoManagerHostPrepare"] = reflect.TypeOf((*CryptoManagerHostPrepare)(nil)).Elem()
+}
+
+type CryptoManagerHostPrepareRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CryptoManagerHostPrepareRequestType"] = reflect.TypeOf((*CryptoManagerHostPrepareRequestType)(nil)).Elem()
+}
+
+type CryptoManagerHostPrepareResponse struct {
+}
+
 type CryptoManagerKmipCertificateInfo struct {
 	DynamicData
 
@@ -10176,6 +10672,24 @@ func init() {
 	t["CryptoSpecShallowRecrypt"] = reflect.TypeOf((*CryptoSpecShallowRecrypt)(nil)).Elem()
 }
 
+type CryptoUnlockRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["CryptoUnlockRequestType"] = reflect.TypeOf((*CryptoUnlockRequestType)(nil)).Elem()
+}
+
+type CryptoUnlock_Task CryptoUnlockRequestType
+
+func init() {
+	t["CryptoUnlock_Task"] = reflect.TypeOf((*CryptoUnlock_Task)(nil)).Elem()
+}
+
+type CryptoUnlock_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type CurrentTime CurrentTimeRequestType
 
 func init() {
@@ -11073,32 +11587,33 @@ func init() {
 type DVSConfigInfo struct {
 	DynamicData
 
-	Uuid                                string                                    `xml:"uuid"`
-	Name                                string                                    `xml:"name"`
-	NumStandalonePorts                  int32                                     `xml:"numStandalonePorts"`
-	NumPorts                            int32                                     `xml:"numPorts"`
-	MaxPorts                            int32                                     `xml:"maxPorts"`
-	UplinkPortPolicy                    BaseDVSUplinkPortPolicy                   `xml:"uplinkPortPolicy,typeattr"`
-	UplinkPortgroup                     []ManagedObjectReference                  `xml:"uplinkPortgroup,omitempty"`
-	DefaultPortConfig                   BaseDVPortSetting                         `xml:"defaultPortConfig,typeattr"`
-	Host                                []DistributedVirtualSwitchHostMember      `xml:"host,omitempty"`
-	ProductInfo                         DistributedVirtualSwitchProductSpec       `xml:"productInfo"`
-	TargetInfo                          *DistributedVirtualSwitchProductSpec      `xml:"targetInfo,omitempty"`
-	ExtensionKey                        string                                    `xml:"extensionKey,omitempty"`
-	VendorSpecificConfig                []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"vendorSpecificConfig,omitempty"`
-	Policy                              *DVSPolicy                                `xml:"policy,omitempty"`
-	Description                         string                                    `xml:"description,omitempty"`
-	ConfigVersion                       string                                    `xml:"configVersion"`
-	Contact                             DVSContactInfo                            `xml:"contact"`
-	SwitchIpAddress                     string                                    `xml:"switchIpAddress,omitempty"`
-	CreateTime                          time.Time                                 `xml:"createTime"`
-	NetworkResourceManagementEnabled    *bool                                     `xml:"networkResourceManagementEnabled"`
-	DefaultProxySwitchMaxNumPorts       int32                                     `xml:"defaultProxySwitchMaxNumPorts,omitempty"`
-	HealthCheckConfig                   []BaseDVSHealthCheckConfig                `xml:"healthCheckConfig,omitempty,typeattr"`
-	InfrastructureTrafficResourceConfig []DvsHostInfrastructureTrafficResource    `xml:"infrastructureTrafficResourceConfig,omitempty"`
-	NetworkResourceControlVersion       string                                    `xml:"networkResourceControlVersion,omitempty"`
-	VmVnicNetworkResourcePool           []DVSVmVnicNetworkResourcePool            `xml:"vmVnicNetworkResourcePool,omitempty"`
-	PnicCapacityRatioForReservation     int32                                     `xml:"pnicCapacityRatioForReservation,omitempty"`
+	Uuid                                 string                                    `xml:"uuid"`
+	Name                                 string                                    `xml:"name"`
+	NumStandalonePorts                   int32                                     `xml:"numStandalonePorts"`
+	NumPorts                             int32                                     `xml:"numPorts"`
+	MaxPorts                             int32                                     `xml:"maxPorts"`
+	UplinkPortPolicy                     BaseDVSUplinkPortPolicy                   `xml:"uplinkPortPolicy,typeattr"`
+	UplinkPortgroup                      []ManagedObjectReference                  `xml:"uplinkPortgroup,omitempty"`
+	DefaultPortConfig                    BaseDVPortSetting                         `xml:"defaultPortConfig,typeattr"`
+	Host                                 []DistributedVirtualSwitchHostMember      `xml:"host,omitempty"`
+	ProductInfo                          DistributedVirtualSwitchProductSpec       `xml:"productInfo"`
+	TargetInfo                           *DistributedVirtualSwitchProductSpec      `xml:"targetInfo,omitempty"`
+	ExtensionKey                         string                                    `xml:"extensionKey,omitempty"`
+	VendorSpecificConfig                 []DistributedVirtualSwitchKeyedOpaqueBlob `xml:"vendorSpecificConfig,omitempty"`
+	Policy                               *DVSPolicy                                `xml:"policy,omitempty"`
+	Description                          string                                    `xml:"description,omitempty"`
+	ConfigVersion                        string                                    `xml:"configVersion"`
+	Contact                              DVSContactInfo                            `xml:"contact"`
+	SwitchIpAddress                      string                                    `xml:"switchIpAddress,omitempty"`
+	CreateTime                           time.Time                                 `xml:"createTime"`
+	NetworkResourceManagementEnabled     *bool                                     `xml:"networkResourceManagementEnabled"`
+	DefaultProxySwitchMaxNumPorts        int32                                     `xml:"defaultProxySwitchMaxNumPorts,omitempty"`
+	HealthCheckConfig                    []BaseDVSHealthCheckConfig                `xml:"healthCheckConfig,omitempty,typeattr"`
+	InfrastructureTrafficResourceConfig  []DvsHostInfrastructureTrafficResource    `xml:"infrastructureTrafficResourceConfig,omitempty"`
+	NetResourcePoolTrafficResourceConfig []DvsHostInfrastructureTrafficResource    `xml:"netResourcePoolTrafficResourceConfig,omitempty"`
+	NetworkResourceControlVersion        string                                    `xml:"networkResourceControlVersion,omitempty"`
+	VmVnicNetworkResourcePool            []DVSVmVnicNetworkResourcePool            `xml:"vmVnicNetworkResourcePool,omitempty"`
+	PnicCapacityRatioForReservation      int32                                     `xml:"pnicCapacityRatioForReservation,omitempty"`
 }
 
 func init() {
@@ -11108,23 +11623,24 @@ func init() {
 type DVSConfigSpec struct {
 	DynamicData
 
-	ConfigVersion                       string                                         `xml:"configVersion,omitempty"`
-	Name                                string                                         `xml:"name,omitempty"`
-	NumStandalonePorts                  int32                                          `xml:"numStandalonePorts,omitempty"`
-	MaxPorts                            int32                                          `xml:"maxPorts,omitempty"`
-	UplinkPortPolicy                    BaseDVSUplinkPortPolicy                        `xml:"uplinkPortPolicy,omitempty,typeattr"`
-	UplinkPortgroup                     []ManagedObjectReference                       `xml:"uplinkPortgroup,omitempty"`
-	DefaultPortConfig                   BaseDVPortSetting                              `xml:"defaultPortConfig,omitempty,typeattr"`
-	Host                                []DistributedVirtualSwitchHostMemberConfigSpec `xml:"host,omitempty"`
-	ExtensionKey                        string                                         `xml:"extensionKey,omitempty"`
-	Description                         string                                         `xml:"description,omitempty"`
-	Policy                              *DVSPolicy                                     `xml:"policy,omitempty"`
-	VendorSpecificConfig                []DistributedVirtualSwitchKeyedOpaqueBlob      `xml:"vendorSpecificConfig,omitempty"`
-	Contact                             *DVSContactInfo                                `xml:"contact,omitempty"`
-	SwitchIpAddress                     string                                         `xml:"switchIpAddress,omitempty"`
-	DefaultProxySwitchMaxNumPorts       int32                                          `xml:"defaultProxySwitchMaxNumPorts,omitempty"`
-	InfrastructureTrafficResourceConfig []DvsHostInfrastructureTrafficResource         `xml:"infrastructureTrafficResourceConfig,omitempty"`
-	NetworkResourceControlVersion       string                                         `xml:"networkResourceControlVersion,omitempty"`
+	ConfigVersion                        string                                         `xml:"configVersion,omitempty"`
+	Name                                 string                                         `xml:"name,omitempty"`
+	NumStandalonePorts                   int32                                          `xml:"numStandalonePorts,omitempty"`
+	MaxPorts                             int32                                          `xml:"maxPorts,omitempty"`
+	UplinkPortPolicy                     BaseDVSUplinkPortPolicy                        `xml:"uplinkPortPolicy,omitempty,typeattr"`
+	UplinkPortgroup                      []ManagedObjectReference                       `xml:"uplinkPortgroup,omitempty"`
+	DefaultPortConfig                    BaseDVPortSetting                              `xml:"defaultPortConfig,omitempty,typeattr"`
+	Host                                 []DistributedVirtualSwitchHostMemberConfigSpec `xml:"host,omitempty"`
+	ExtensionKey                         string                                         `xml:"extensionKey,omitempty"`
+	Description                          string                                         `xml:"description,omitempty"`
+	Policy                               *DVSPolicy                                     `xml:"policy,omitempty"`
+	VendorSpecificConfig                 []DistributedVirtualSwitchKeyedOpaqueBlob      `xml:"vendorSpecificConfig,omitempty"`
+	Contact                              *DVSContactInfo                                `xml:"contact,omitempty"`
+	SwitchIpAddress                      string                                         `xml:"switchIpAddress,omitempty"`
+	DefaultProxySwitchMaxNumPorts        int32                                          `xml:"defaultProxySwitchMaxNumPorts,omitempty"`
+	InfrastructureTrafficResourceConfig  []DvsHostInfrastructureTrafficResource         `xml:"infrastructureTrafficResourceConfig,omitempty"`
+	NetResourcePoolTrafficResourceConfig []DvsHostInfrastructureTrafficResource         `xml:"netResourcePoolTrafficResourceConfig,omitempty"`
+	NetworkResourceControlVersion        string                                         `xml:"networkResourceControlVersion,omitempty"`
 }
 
 func init() {
@@ -11182,6 +11698,7 @@ type DVSFeatureCapability struct {
 	RollbackCapability                  *DVSRollbackCapability                  `xml:"rollbackCapability,omitempty"`
 	BackupRestoreCapability             *DVSBackupRestoreCapability             `xml:"backupRestoreCapability,omitempty"`
 	NetworkFilterSupported              *bool                                   `xml:"networkFilterSupported"`
+	MacLearningSupported                *bool                                   `xml:"macLearningSupported"`
 }
 
 func init() {
@@ -11220,6 +11737,32 @@ func init() {
 	t["DVSHostLocalPortInfo"] = reflect.TypeOf((*DVSHostLocalPortInfo)(nil)).Elem()
 }
 
+type DVSMacLearningPolicy struct {
+	InheritablePolicy
+
+	Enabled              bool   `xml:"enabled"`
+	AllowUnicastFlooding *bool  `xml:"allowUnicastFlooding"`
+	Limit                *int32 `xml:"limit"`
+	LimitPolicy          string `xml:"limitPolicy,omitempty"`
+}
+
+func init() {
+	t["DVSMacLearningPolicy"] = reflect.TypeOf((*DVSMacLearningPolicy)(nil)).Elem()
+}
+
+type DVSMacManagementPolicy struct {
+	InheritablePolicy
+
+	AllowPromiscuous  *bool                 `xml:"allowPromiscuous"`
+	MacChanges        *bool                 `xml:"macChanges"`
+	ForgedTransmits   *bool                 `xml:"forgedTransmits"`
+	MacLearningPolicy *DVSMacLearningPolicy `xml:"macLearningPolicy,omitempty"`
+}
+
+func init() {
+	t["DVSMacManagementPolicy"] = reflect.TypeOf((*DVSMacManagementPolicy)(nil)).Elem()
+}
+
 type DVSManagerDvsConfigTarget struct {
 	DynamicData
 
@@ -11308,6 +11851,7 @@ type DVSNetworkResourceManagementCapability struct {
 	QosSupported                             bool  `xml:"qosSupported"`
 	UserDefinedNetworkResourcePoolsSupported bool  `xml:"userDefinedNetworkResourcePoolsSupported"`
 	NetworkResourceControlVersion3Supported  *bool `xml:"networkResourceControlVersion3Supported"`
+	UserDefinedInfraTrafficPoolSupported     *bool `xml:"userDefinedInfraTrafficPoolSupported"`
 }
 
 func init() {
@@ -11743,6 +12287,7 @@ type DatastoreCapability struct {
 	VmfsSparseSupported              *bool `xml:"vmfsSparseSupported"`
 	VsanSparseSupported              *bool `xml:"vsanSparseSupported"`
 	UpitSupported                    *bool `xml:"upitSupported"`
+	VmdkExpandSupported              *bool `xml:"vmdkExpandSupported"`
 }
 
 func init() {
@@ -12247,6 +12792,43 @@ func init() {
 type DeleteHostSubSpecificationResponse struct {
 }
 
+type DeleteNvdimmBlockNamespacesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["DeleteNvdimmBlockNamespacesRequestType"] = reflect.TypeOf((*DeleteNvdimmBlockNamespacesRequestType)(nil)).Elem()
+}
+
+type DeleteNvdimmBlockNamespaces_Task DeleteNvdimmBlockNamespacesRequestType
+
+func init() {
+	t["DeleteNvdimmBlockNamespaces_Task"] = reflect.TypeOf((*DeleteNvdimmBlockNamespaces_Task)(nil)).Elem()
+}
+
+type DeleteNvdimmBlockNamespaces_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DeleteNvdimmNamespaceRequestType struct {
+	This       ManagedObjectReference    `xml:"_this"`
+	DeleteSpec NvdimmNamespaceDeleteSpec `xml:"deleteSpec"`
+}
+
+func init() {
+	t["DeleteNvdimmNamespaceRequestType"] = reflect.TypeOf((*DeleteNvdimmNamespaceRequestType)(nil)).Elem()
+}
+
+type DeleteNvdimmNamespace_Task DeleteNvdimmNamespaceRequestType
+
+func init() {
+	t["DeleteNvdimmNamespace_Task"] = reflect.TypeOf((*DeleteNvdimmNamespace_Task)(nil)).Elem()
+}
+
+type DeleteNvdimmNamespace_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type DeleteRegistryKeyInGuest DeleteRegistryKeyInGuestRequestType
 
 func init() {
@@ -12306,6 +12888,27 @@ func init() {
 type DeleteScsiLunStateResponse struct {
 }
 
+type DeleteSnapshotRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Id         ID                     `xml:"id"`
+	Datastore  ManagedObjectReference `xml:"datastore"`
+	SnapshotId ID                     `xml:"snapshotId"`
+}
+
+func init() {
+	t["DeleteSnapshotRequestType"] = reflect.TypeOf((*DeleteSnapshotRequestType)(nil)).Elem()
+}
+
+type DeleteSnapshot_Task DeleteSnapshotRequestType
+
+func init() {
+	t["DeleteSnapshot_Task"] = reflect.TypeOf((*DeleteSnapshot_Task)(nil)).Elem()
+}
+
+type DeleteSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type DeleteVStorageObjectRequestType struct {
 	This      ManagedObjectReference `xml:"_this"`
 	Id        ID                     `xml:"id"`
@@ -15336,6 +15939,22 @@ func init() {
 type EnableSmartCardAuthenticationResponse struct {
 }
 
+type EncryptionKeyRequired struct {
+	InvalidState
+
+	RequiredKey []CryptoKeyId `xml:"requiredKey,omitempty"`
+}
+
+func init() {
+	t["EncryptionKeyRequired"] = reflect.TypeOf((*EncryptionKeyRequired)(nil)).Elem()
+}
+
+type EncryptionKeyRequiredFault EncryptionKeyRequired
+
+func init() {
+	t["EncryptionKeyRequiredFault"] = reflect.TypeOf((*EncryptionKeyRequiredFault)(nil)).Elem()
+}
+
 type EnterLockdownMode EnterLockdownModeRequestType
 
 func init() {
@@ -16679,6 +17298,28 @@ func init() {
 	t["FaultToleranceVmNotDasProtectedFault"] = reflect.TypeOf((*FaultToleranceVmNotDasProtectedFault)(nil)).Elem()
 }
 
+type FaultsByHost struct {
+	DynamicData
+
+	Host   ManagedObjectReference `xml:"host"`
+	Faults []LocalizedMethodFault `xml:"faults,omitempty"`
+}
+
+func init() {
+	t["FaultsByHost"] = reflect.TypeOf((*FaultsByHost)(nil)).Elem()
+}
+
+type FaultsByVM struct {
+	DynamicData
+
+	Vm     ManagedObjectReference `xml:"vm"`
+	Faults []LocalizedMethodFault `xml:"faults,omitempty"`
+}
+
+func init() {
+	t["FaultsByVM"] = reflect.TypeOf((*FaultsByVM)(nil)).Elem()
+}
+
 type FcoeConfig struct {
 	DynamicData
 
@@ -18273,51 +18914,66 @@ func init() {
 type GuestOsDescriptor struct {
 	DynamicData
 
-	Id                              string          `xml:"id"`
-	Family                          string          `xml:"family"`
-	FullName                        string          `xml:"fullName"`
-	SupportedMaxCPUs                int32           `xml:"supportedMaxCPUs"`
-	NumSupportedPhysicalSockets     int32           `xml:"numSupportedPhysicalSockets,omitempty"`
-	NumSupportedCoresPerSocket      int32           `xml:"numSupportedCoresPerSocket,omitempty"`
-	SupportedMinMemMB               int32           `xml:"supportedMinMemMB"`
-	SupportedMaxMemMB               int32           `xml:"supportedMaxMemMB"`
-	RecommendedMemMB                int32           `xml:"recommendedMemMB"`
-	RecommendedColorDepth           int32           `xml:"recommendedColorDepth"`
-	SupportedDiskControllerList     []string        `xml:"supportedDiskControllerList"`
-	RecommendedSCSIController       string          `xml:"recommendedSCSIController,omitempty"`
-	RecommendedDiskController       string          `xml:"recommendedDiskController"`
-	SupportedNumDisks               int32           `xml:"supportedNumDisks"`
-	RecommendedDiskSizeMB           int32           `xml:"recommendedDiskSizeMB"`
-	RecommendedCdromController      string          `xml:"recommendedCdromController,omitempty"`
-	SupportedEthernetCard           []string        `xml:"supportedEthernetCard"`
-	RecommendedEthernetCard         string          `xml:"recommendedEthernetCard,omitempty"`
-	SupportsSlaveDisk               *bool           `xml:"supportsSlaveDisk"`
-	CpuFeatureMask                  []HostCpuIdInfo `xml:"cpuFeatureMask,omitempty"`
-	SmcRequired                     *bool           `xml:"smcRequired"`
-	SupportsWakeOnLan               bool            `xml:"supportsWakeOnLan"`
-	SupportsVMI                     *bool           `xml:"supportsVMI"`
-	SupportsMemoryHotAdd            *bool           `xml:"supportsMemoryHotAdd"`
-	SupportsCpuHotAdd               *bool           `xml:"supportsCpuHotAdd"`
-	SupportsCpuHotRemove            *bool           `xml:"supportsCpuHotRemove"`
-	SupportedFirmware               []string        `xml:"supportedFirmware,omitempty"`
-	RecommendedFirmware             string          `xml:"recommendedFirmware,omitempty"`
-	SupportedUSBControllerList      []string        `xml:"supportedUSBControllerList,omitempty"`
-	RecommendedUSBController        string          `xml:"recommendedUSBController,omitempty"`
-	Supports3D                      *bool           `xml:"supports3D"`
-	Recommended3D                   *bool           `xml:"recommended3D"`
-	SmcRecommended                  *bool           `xml:"smcRecommended"`
-	Ich7mRecommended                *bool           `xml:"ich7mRecommended"`
-	UsbRecommended                  *bool           `xml:"usbRecommended"`
-	SupportLevel                    string          `xml:"supportLevel,omitempty"`
-	SupportedForCreate              *bool           `xml:"supportedForCreate"`
-	VRAMSizeInKB                    *IntOption      `xml:"vRAMSizeInKB,omitempty"`
-	NumSupportedFloppyDevices       int32           `xml:"numSupportedFloppyDevices,omitempty"`
-	WakeOnLanEthernetCard           []string        `xml:"wakeOnLanEthernetCard,omitempty"`
-	SupportsPvscsiControllerForBoot *bool           `xml:"supportsPvscsiControllerForBoot"`
-	DiskUuidEnabled                 *bool           `xml:"diskUuidEnabled"`
-	SupportsHotPlugPCI              *bool           `xml:"supportsHotPlugPCI"`
-	SupportsSecureBoot              *bool           `xml:"supportsSecureBoot"`
-	DefaultSecureBoot               *bool           `xml:"defaultSecureBoot"`
+	Id                                      string          `xml:"id"`
+	Family                                  string          `xml:"family"`
+	FullName                                string          `xml:"fullName"`
+	SupportedMaxCPUs                        int32           `xml:"supportedMaxCPUs"`
+	NumSupportedPhysicalSockets             int32           `xml:"numSupportedPhysicalSockets,omitempty"`
+	NumSupportedCoresPerSocket              int32           `xml:"numSupportedCoresPerSocket,omitempty"`
+	SupportedMinMemMB                       int32           `xml:"supportedMinMemMB"`
+	SupportedMaxMemMB                       int32           `xml:"supportedMaxMemMB"`
+	RecommendedMemMB                        int32           `xml:"recommendedMemMB"`
+	RecommendedColorDepth                   int32           `xml:"recommendedColorDepth"`
+	SupportedDiskControllerList             []string        `xml:"supportedDiskControllerList"`
+	RecommendedSCSIController               string          `xml:"recommendedSCSIController,omitempty"`
+	RecommendedDiskController               string          `xml:"recommendedDiskController"`
+	SupportedNumDisks                       int32           `xml:"supportedNumDisks"`
+	RecommendedDiskSizeMB                   int32           `xml:"recommendedDiskSizeMB"`
+	RecommendedCdromController              string          `xml:"recommendedCdromController,omitempty"`
+	SupportedEthernetCard                   []string        `xml:"supportedEthernetCard"`
+	RecommendedEthernetCard                 string          `xml:"recommendedEthernetCard,omitempty"`
+	SupportsSlaveDisk                       *bool           `xml:"supportsSlaveDisk"`
+	CpuFeatureMask                          []HostCpuIdInfo `xml:"cpuFeatureMask,omitempty"`
+	SmcRequired                             *bool           `xml:"smcRequired"`
+	SupportsWakeOnLan                       bool            `xml:"supportsWakeOnLan"`
+	SupportsVMI                             *bool           `xml:"supportsVMI"`
+	SupportsMemoryHotAdd                    *bool           `xml:"supportsMemoryHotAdd"`
+	SupportsCpuHotAdd                       *bool           `xml:"supportsCpuHotAdd"`
+	SupportsCpuHotRemove                    *bool           `xml:"supportsCpuHotRemove"`
+	SupportedFirmware                       []string        `xml:"supportedFirmware,omitempty"`
+	RecommendedFirmware                     string          `xml:"recommendedFirmware,omitempty"`
+	SupportedUSBControllerList              []string        `xml:"supportedUSBControllerList,omitempty"`
+	RecommendedUSBController                string          `xml:"recommendedUSBController,omitempty"`
+	Supports3D                              *bool           `xml:"supports3D"`
+	Recommended3D                           *bool           `xml:"recommended3D"`
+	SmcRecommended                          *bool           `xml:"smcRecommended"`
+	Ich7mRecommended                        *bool           `xml:"ich7mRecommended"`
+	UsbRecommended                          *bool           `xml:"usbRecommended"`
+	SupportLevel                            string          `xml:"supportLevel,omitempty"`
+	SupportedForCreate                      *bool           `xml:"supportedForCreate"`
+	VRAMSizeInKB                            *IntOption      `xml:"vRAMSizeInKB,omitempty"`
+	NumSupportedFloppyDevices               int32           `xml:"numSupportedFloppyDevices,omitempty"`
+	WakeOnLanEthernetCard                   []string        `xml:"wakeOnLanEthernetCard,omitempty"`
+	SupportsPvscsiControllerForBoot         *bool           `xml:"supportsPvscsiControllerForBoot"`
+	DiskUuidEnabled                         *bool           `xml:"diskUuidEnabled"`
+	SupportsHotPlugPCI                      *bool           `xml:"supportsHotPlugPCI"`
+	SupportsSecureBoot                      *bool           `xml:"supportsSecureBoot"`
+	DefaultSecureBoot                       *bool           `xml:"defaultSecureBoot"`
+	PersistentMemorySupported               *bool           `xml:"persistentMemorySupported"`
+	SupportedMinPersistentMemoryMB          int64           `xml:"supportedMinPersistentMemoryMB,omitempty"`
+	SupportedMaxPersistentMemoryMB          int64           `xml:"supportedMaxPersistentMemoryMB,omitempty"`
+	RecommendedPersistentMemoryMB           int64           `xml:"recommendedPersistentMemoryMB,omitempty"`
+	PersistentMemoryHotAddSupported         *bool           `xml:"persistentMemoryHotAddSupported"`
+	PersistentMemoryHotRemoveSupported      *bool           `xml:"persistentMemoryHotRemoveSupported"`
+	PersistentMemoryColdGrowthSupported     *bool           `xml:"persistentMemoryColdGrowthSupported"`
+	PersistentMemoryColdGrowthGranularityMB int64           `xml:"persistentMemoryColdGrowthGranularityMB,omitempty"`
+	PersistentMemoryHotGrowthSupported      *bool           `xml:"persistentMemoryHotGrowthSupported"`
+	PersistentMemoryHotGrowthGranularityMB  int64           `xml:"persistentMemoryHotGrowthGranularityMB,omitempty"`
+	NumRecommendedPhysicalSockets           int32           `xml:"numRecommendedPhysicalSockets,omitempty"`
+	NumRecommendedCoresPerSocket            int32           `xml:"numRecommendedCoresPerSocket,omitempty"`
+	VvtdSupported                           *BoolOption     `xml:"vvtdSupported,omitempty"`
+	VbsSupported                            *BoolOption     `xml:"vbsSupported,omitempty"`
+	SupportsTPM20                           *bool           `xml:"supportsTPM20"`
 }
 
 func init() {
@@ -19205,6 +19861,8 @@ type HostCapability struct {
 	DeltaDiskBackingsSupported                *bool           `xml:"deltaDiskBackingsSupported"`
 	PerVMNetworkTrafficShapingSupported       *bool           `xml:"perVMNetworkTrafficShapingSupported"`
 	TpmSupported                              *bool           `xml:"tpmSupported"`
+	TpmVersion                                string          `xml:"tpmVersion,omitempty"`
+	TxtEnabled                                *bool           `xml:"txtEnabled"`
 	SupportedCpuFeature                       []HostCpuIdInfo `xml:"supportedCpuFeature,omitempty"`
 	VirtualExecUsageSupported                 *bool           `xml:"virtualExecUsageSupported"`
 	StorageIORMSupported                      *bool           `xml:"storageIORMSupported"`
@@ -19242,6 +19900,8 @@ type HostCapability struct {
 	MarkAsSsdSupported                        *bool           `xml:"markAsSsdSupported"`
 	MarkAsLocalSupported                      *bool           `xml:"markAsLocalSupported"`
 	SmartCardAuthenticationSupported          *bool           `xml:"smartCardAuthenticationSupported"`
+	PMemSupported                             *bool           `xml:"pMemSupported"`
+	PMemSnapshotSupported                     *bool           `xml:"pMemSnapshotSupported"`
 	CryptoSupported                           *bool           `xml:"cryptoSupported"`
 	OneKVolumeAPIsSupported                   *bool           `xml:"oneKVolumeAPIsSupported"`
 	GatewayOnNicSupported                     *bool           `xml:"gatewayOnNicSupported"`
@@ -19257,6 +19917,14 @@ type HostCapability struct {
 	EncryptionVFlashSupported                 *bool           `xml:"encryptionVFlashSupported"`
 	EncryptionCBRCSupported                   *bool           `xml:"encryptionCBRCSupported"`
 	EncryptionHBRSupported                    *bool           `xml:"encryptionHBRSupported"`
+	FtEfiSupported                            *bool           `xml:"ftEfiSupported"`
+	UnmapMethodSupported                      string          `xml:"unmapMethodSupported,omitempty"`
+	MaxMemMBPerFtVm                           int32           `xml:"maxMemMBPerFtVm,omitempty"`
+	VirtualMmuUsageIgnored                    *bool           `xml:"virtualMmuUsageIgnored"`
+	VirtualExecUsageIgnored                   *bool           `xml:"virtualExecUsageIgnored"`
+	VmCreateDateSupported                     *bool           `xml:"vmCreateDateSupported"`
+	Vmfs3EOLSupported                         *bool           `xml:"vmfs3EOLSupported"`
+	FtVmcpSupported                           *bool           `xml:"ftVmcpSupported"`
 }
 
 func init() {
@@ -19277,6 +19945,26 @@ func init() {
 	t["HostCertificateManagerCertificateInfo"] = reflect.TypeOf((*HostCertificateManagerCertificateInfo)(nil)).Elem()
 }
 
+type HostClearVStorageObjectControlFlags HostClearVStorageObjectControlFlagsRequestType
+
+func init() {
+	t["HostClearVStorageObjectControlFlags"] = reflect.TypeOf((*HostClearVStorageObjectControlFlags)(nil)).Elem()
+}
+
+type HostClearVStorageObjectControlFlagsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Id           ID                     `xml:"id"`
+	Datastore    ManagedObjectReference `xml:"datastore"`
+	ControlFlags []string               `xml:"controlFlags,omitempty"`
+}
+
+func init() {
+	t["HostClearVStorageObjectControlFlagsRequestType"] = reflect.TypeOf((*HostClearVStorageObjectControlFlagsRequestType)(nil)).Elem()
+}
+
+type HostClearVStorageObjectControlFlagsResponse struct {
+}
+
 type HostCloneVStorageObjectRequestType struct {
 	This      ManagedObjectReference `xml:"_this"`
 	Id        ID                     `xml:"id"`
@@ -19536,6 +20224,7 @@ type HostConfigInfo struct {
 	GraphicsInfo              []HostGraphicsInfo                   `xml:"graphicsInfo,omitempty"`
 	SharedPassthruGpuTypes    []string                             `xml:"sharedPassthruGpuTypes,omitempty"`
 	GraphicsConfig            *HostGraphicsConfig                  `xml:"graphicsConfig,omitempty"`
+	SharedGpuCapabilities     []HostSharedGpuCapabilities          `xml:"sharedGpuCapabilities,omitempty"`
 	IoFilterInfo              []HostIoFilterInfo                   `xml:"ioFilterInfo,omitempty"`
 	SriovDevicePool           []BaseHostSriovDevicePoolInfo        `xml:"sriovDevicePool,omitempty,typeattr"`
 }
@@ -19584,6 +20273,7 @@ type HostConfigManager struct {
 	VsanInternalSystem        *ManagedObjectReference `xml:"vsanInternalSystem,omitempty"`
 	CertificateManager        *ManagedObjectReference `xml:"certificateManager,omitempty"`
 	CryptoManager             *ManagedObjectReference `xml:"cryptoManager,omitempty"`
+	NvdimmSystem              *ManagedObjectReference `xml:"nvdimmSystem,omitempty"`
 }
 
 func init() {
@@ -20331,12 +21021,13 @@ func init() {
 type HostDnsConfig struct {
 	DynamicData
 
-	Dhcp             bool     `xml:"dhcp"`
-	VirtualNicDevice string   `xml:"virtualNicDevice,omitempty"`
-	HostName         string   `xml:"hostName"`
-	DomainName       string   `xml:"domainName"`
-	Address          []string `xml:"address,omitempty"`
-	SearchDomain     []string `xml:"searchDomain,omitempty"`
+	Dhcp                 bool     `xml:"dhcp"`
+	VirtualNicDevice     string   `xml:"virtualNicDevice,omitempty"`
+	Ipv6VirtualNicDevice string   `xml:"ipv6VirtualNicDevice,omitempty"`
+	HostName             string   `xml:"hostName"`
+	DomainName           string   `xml:"domainName"`
+	Address              []string `xml:"address,omitempty"`
+	SearchDomain         []string `xml:"searchDomain,omitempty"`
 }
 
 func init() {
@@ -20346,7 +21037,8 @@ func init() {
 type HostDnsConfigSpec struct {
 	HostDnsConfig
 
-	VirtualNicConnection *HostVirtualNicConnection `xml:"virtualNicConnection,omitempty"`
+	VirtualNicConnection   *HostVirtualNicConnection `xml:"virtualNicConnection,omitempty"`
+	VirtualNicConnectionV6 *HostVirtualNicConnection `xml:"virtualNicConnectionV6,omitempty"`
 }
 
 func init() {
@@ -20363,6 +21055,17 @@ func init() {
 	t["HostEnableAdminFailedEvent"] = reflect.TypeOf((*HostEnableAdminFailedEvent)(nil)).Elem()
 }
 
+type HostEnterMaintenanceResult struct {
+	DynamicData
+
+	VmFaults   []FaultsByVM   `xml:"vmFaults,omitempty"`
+	HostFaults []FaultsByHost `xml:"hostFaults,omitempty"`
+}
+
+func init() {
+	t["HostEnterMaintenanceResult"] = reflect.TypeOf((*HostEnterMaintenanceResult)(nil)).Elem()
+}
+
 type HostEsxAgentHostManagerConfigInfo struct {
 	DynamicData
 
@@ -20808,6 +21511,7 @@ type HostHardwareInfo struct {
 	CpuFeature             []HostCpuIdInfo             `xml:"cpuFeature,omitempty"`
 	BiosInfo               *HostBIOSInfo               `xml:"biosInfo,omitempty"`
 	ReliableMemoryInfo     *HostReliableMemoryInfo     `xml:"reliableMemoryInfo,omitempty"`
+	PersistentMemoryInfo   *HostPersistentMemoryInfo   `xml:"persistentMemoryInfo,omitempty"`
 }
 
 func init() {
@@ -21547,6 +22251,7 @@ type HostListSummary struct {
 	MaxEVCModeKey      string                         `xml:"maxEVCModeKey,omitempty"`
 	CurrentEVCModeKey  string                         `xml:"currentEVCModeKey,omitempty"`
 	Gateway            *HostListSummaryGatewaySummary `xml:"gateway,omitempty"`
+	TpmAttestation     *HostTpmAttestationInfo        `xml:"tpmAttestation,omitempty"`
 }
 
 func init() {
@@ -21571,6 +22276,7 @@ type HostListSummaryQuickStats struct {
 	OverallMemoryUsage        int32 `xml:"overallMemoryUsage,omitempty"`
 	DistributedCpuFairness    int32 `xml:"distributedCpuFairness,omitempty"`
 	DistributedMemoryFairness int32 `xml:"distributedMemoryFairness,omitempty"`
+	AvailablePMemCapacity     int32 `xml:"availablePMemCapacity,omitempty"`
 	Uptime                    int32 `xml:"uptime,omitempty"`
 }
 
@@ -22366,10 +23072,11 @@ func init() {
 type HostNumaNode struct {
 	DynamicData
 
-	TypeId            byte    `xml:"typeId"`
-	CpuID             []int16 `xml:"cpuID"`
-	MemoryRangeBegin  int64   `xml:"memoryRangeBegin"`
-	MemoryRangeLength int64   `xml:"memoryRangeLength"`
+	TypeId            byte     `xml:"typeId"`
+	CpuID             []int16  `xml:"cpuID"`
+	MemoryRangeBegin  int64    `xml:"memoryRangeBegin"`
+	MemoryRangeLength int64    `xml:"memoryRangeLength"`
+	PciId             []string `xml:"pciId,omitempty"`
 }
 
 func init() {
@@ -22412,13 +23119,14 @@ func init() {
 type HostOpaqueSwitch struct {
 	DynamicData
 
-	Key         string                            `xml:"key"`
-	Name        string                            `xml:"name,omitempty"`
-	Pnic        []string                          `xml:"pnic,omitempty"`
-	PnicZone    []HostOpaqueSwitchPhysicalNicZone `xml:"pnicZone,omitempty"`
-	Status      string                            `xml:"status,omitempty"`
-	Vtep        []HostVirtualNic                  `xml:"vtep,omitempty"`
-	ExtraConfig []BaseOptionValue                 `xml:"extraConfig,omitempty,typeattr"`
+	Key               string                            `xml:"key"`
+	Name              string                            `xml:"name,omitempty"`
+	Pnic              []string                          `xml:"pnic,omitempty"`
+	PnicZone          []HostOpaqueSwitchPhysicalNicZone `xml:"pnicZone,omitempty"`
+	Status            string                            `xml:"status,omitempty"`
+	Vtep              []HostVirtualNic                  `xml:"vtep,omitempty"`
+	ExtraConfig       []BaseOptionValue                 `xml:"extraConfig,omitempty,typeattr"`
+	FeatureCapability []HostFeatureCapability           `xml:"featureCapability,omitempty"`
 }
 
 func init() {
@@ -22444,6 +23152,17 @@ func init() {
 	t["HostOvercommittedEvent"] = reflect.TypeOf((*HostOvercommittedEvent)(nil)).Elem()
 }
 
+type HostPMemVolume struct {
+	HostFileSystemVolume
+
+	Uuid    string `xml:"uuid"`
+	Version string `xml:"version"`
+}
+
+func init() {
+	t["HostPMemVolume"] = reflect.TypeOf((*HostPMemVolume)(nil)).Elem()
+}
+
 type HostParallelScsiHba struct {
 	HostHostBusAdapter
 }
@@ -22584,6 +23303,17 @@ func init() {
 	t["HostPciPassthruInfo"] = reflect.TypeOf((*HostPciPassthruInfo)(nil)).Elem()
 }
 
+type HostPersistentMemoryInfo struct {
+	DynamicData
+
+	CapacityInMB int64  `xml:"capacityInMB,omitempty"`
+	VolumeUUID   string `xml:"volumeUUID,omitempty"`
+}
+
+func init() {
+	t["HostPersistentMemoryInfo"] = reflect.TypeOf((*HostPersistentMemoryInfo)(nil)).Elem()
+}
+
 type HostPlacedVirtualNicIdentifier struct {
 	DynamicData
 
@@ -22856,6 +23586,40 @@ func init() {
 	t["HostProfileHostBasedConfigSpec"] = reflect.TypeOf((*HostProfileHostBasedConfigSpec)(nil)).Elem()
 }
 
+type HostProfileManagerCompositionResult struct {
+	DynamicData
+
+	Errors  []LocalizableMessage                               `xml:"errors,omitempty"`
+	Results []HostProfileManagerCompositionResultResultElement `xml:"results,omitempty"`
+}
+
+func init() {
+	t["HostProfileManagerCompositionResult"] = reflect.TypeOf((*HostProfileManagerCompositionResult)(nil)).Elem()
+}
+
+type HostProfileManagerCompositionResultResultElement struct {
+	DynamicData
+
+	Target ManagedObjectReference `xml:"target"`
+	Status string                 `xml:"status"`
+	Errors []LocalizableMessage   `xml:"errors,omitempty"`
+}
+
+func init() {
+	t["HostProfileManagerCompositionResultResultElement"] = reflect.TypeOf((*HostProfileManagerCompositionResultResultElement)(nil)).Elem()
+}
+
+type HostProfileManagerCompositionValidationResult struct {
+	DynamicData
+
+	Results []HostProfileManagerCompositionValidationResultResultElement `xml:"results,omitempty"`
+	Errors  []LocalizableMessage                                         `xml:"errors,omitempty"`
+}
+
+func init() {
+	t["HostProfileManagerCompositionValidationResult"] = reflect.TypeOf((*HostProfileManagerCompositionValidationResult)(nil)).Elem()
+}
+
 type HostProfileManagerCompositionValidationResultResultElement struct {
 	DynamicData
 
@@ -22898,6 +23662,23 @@ func init() {
 	t["HostProfileManagerHostToConfigSpecMap"] = reflect.TypeOf((*HostProfileManagerHostToConfigSpecMap)(nil)).Elem()
 }
 
+type HostProfileResetValidationState HostProfileResetValidationStateRequestType
+
+func init() {
+	t["HostProfileResetValidationState"] = reflect.TypeOf((*HostProfileResetValidationState)(nil)).Elem()
+}
+
+type HostProfileResetValidationStateRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["HostProfileResetValidationStateRequestType"] = reflect.TypeOf((*HostProfileResetValidationStateRequestType)(nil)).Elem()
+}
+
+type HostProfileResetValidationStateResponse struct {
+}
+
 type HostProfileSerializedHostProfileSpec struct {
 	ProfileSerializedCreateSpec
 
@@ -22909,6 +23690,22 @@ func init() {
 	t["HostProfileSerializedHostProfileSpec"] = reflect.TypeOf((*HostProfileSerializedHostProfileSpec)(nil)).Elem()
 }
 
+type HostProfileValidationFailureInfo struct {
+	DynamicData
+
+	Name         string                             `xml:"name"`
+	Annotation   string                             `xml:"annotation"`
+	UpdateType   string                             `xml:"updateType"`
+	Host         *ManagedObjectReference            `xml:"host,omitempty"`
+	ApplyProfile *HostApplyProfile                  `xml:"applyProfile,omitempty"`
+	Failures     []ProfileUpdateFailedUpdateFailure `xml:"failures,omitempty"`
+	Faults       []LocalizedMethodFault             `xml:"faults,omitempty"`
+}
+
+func init() {
+	t["HostProfileValidationFailureInfo"] = reflect.TypeOf((*HostProfileValidationFailureInfo)(nil)).Elem()
+}
+
 type HostProfilesEntityCustomizations struct {
 	DynamicData
 }
@@ -23127,6 +23924,25 @@ func init() {
 	t["HostResignatureRescanResult"] = reflect.TypeOf((*HostResignatureRescanResult)(nil)).Elem()
 }
 
+type HostRetrieveVStorageInfrastructureObjectPolicy HostRetrieveVStorageInfrastructureObjectPolicyRequestType
+
+func init() {
+	t["HostRetrieveVStorageInfrastructureObjectPolicy"] = reflect.TypeOf((*HostRetrieveVStorageInfrastructureObjectPolicy)(nil)).Elem()
+}
+
+type HostRetrieveVStorageInfrastructureObjectPolicyRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostRetrieveVStorageInfrastructureObjectPolicyRequestType"] = reflect.TypeOf((*HostRetrieveVStorageInfrastructureObjectPolicyRequestType)(nil)).Elem()
+}
+
+type HostRetrieveVStorageInfrastructureObjectPolicyResponse struct {
+	Returnval []VslmInfrastructureObjectPolicy `xml:"returnval,omitempty"`
+}
+
 type HostRetrieveVStorageObject HostRetrieveVStorageObjectRequestType
 
 func init() {
@@ -23403,6 +24219,40 @@ func init() {
 	t["HostServiceTicket"] = reflect.TypeOf((*HostServiceTicket)(nil)).Elem()
 }
 
+type HostSetVStorageObjectControlFlags HostSetVStorageObjectControlFlagsRequestType
+
+func init() {
+	t["HostSetVStorageObjectControlFlags"] = reflect.TypeOf((*HostSetVStorageObjectControlFlags)(nil)).Elem()
+}
+
+type HostSetVStorageObjectControlFlagsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Id           ID                     `xml:"id"`
+	Datastore    ManagedObjectReference `xml:"datastore"`
+	ControlFlags []string               `xml:"controlFlags,omitempty"`
+}
+
+func init() {
+	t["HostSetVStorageObjectControlFlagsRequestType"] = reflect.TypeOf((*HostSetVStorageObjectControlFlagsRequestType)(nil)).Elem()
+}
+
+type HostSetVStorageObjectControlFlagsResponse struct {
+}
+
+type HostSharedGpuCapabilities struct {
+	DynamicData
+
+	Vgpu                    string `xml:"vgpu"`
+	DiskSnapshotSupported   bool   `xml:"diskSnapshotSupported"`
+	MemorySnapshotSupported bool   `xml:"memorySnapshotSupported"`
+	SuspendSupported        bool   `xml:"suspendSupported"`
+	MigrateSupported        bool   `xml:"migrateSupported"`
+}
+
+func init() {
+	t["HostSharedGpuCapabilities"] = reflect.TypeOf((*HostSharedGpuCapabilities)(nil)).Elem()
+}
+
 type HostShortNameInconsistentEvent struct {
 	HostDasEvent
 
@@ -23677,6 +24527,7 @@ type HostSubSpecification struct {
 	Name        string    `xml:"name"`
 	CreatedTime time.Time `xml:"createdTime"`
 	Data        []byte    `xml:"data,omitempty"`
+	BinaryData  []byte    `xml:"binaryData,omitempty"`
 }
 
 func init() {
@@ -23693,6 +24544,17 @@ func init() {
 	t["HostSyncFailedEvent"] = reflect.TypeOf((*HostSyncFailedEvent)(nil)).Elem()
 }
 
+type HostSystemComplianceCheckState struct {
+	DynamicData
+
+	State     string    `xml:"state"`
+	CheckTime time.Time `xml:"checkTime"`
+}
+
+func init() {
+	t["HostSystemComplianceCheckState"] = reflect.TypeOf((*HostSystemComplianceCheckState)(nil)).Elem()
+}
+
 type HostSystemHealthInfo struct {
 	DynamicData
 
@@ -23721,6 +24583,7 @@ type HostSystemInfo struct {
 	Model                string                         `xml:"model"`
 	Uuid                 string                         `xml:"uuid"`
 	OtherIdentifyingInfo []HostSystemIdentificationInfo `xml:"otherIdentifyingInfo,omitempty"`
+	SerialNumber         string                         `xml:"serialNumber,omitempty"`
 }
 
 func init() {
@@ -23737,6 +24600,17 @@ func init() {
 	t["HostSystemReconnectSpec"] = reflect.TypeOf((*HostSystemReconnectSpec)(nil)).Elem()
 }
 
+type HostSystemRemediationState struct {
+	DynamicData
+
+	State         string    `xml:"state"`
+	OperationTime time.Time `xml:"operationTime"`
+}
+
+func init() {
+	t["HostSystemRemediationState"] = reflect.TypeOf((*HostSystemRemediationState)(nil)).Elem()
+}
+
 type HostSystemResourceInfo struct {
 	DynamicData
 
@@ -23811,6 +24685,18 @@ func init() {
 	t["HostTargetTransport"] = reflect.TypeOf((*HostTargetTransport)(nil)).Elem()
 }
 
+type HostTpmAttestationInfo struct {
+	DynamicData
+
+	Time    time.Time                              `xml:"time"`
+	Status  HostTpmAttestationInfoAcceptanceStatus `xml:"status"`
+	Message *LocalizableMessage                    `xml:"message,omitempty"`
+}
+
+func init() {
+	t["HostTpmAttestationInfo"] = reflect.TypeOf((*HostTpmAttestationInfo)(nil)).Elem()
+}
+
 type HostTpmAttestationReport struct {
 	DynamicData
 
@@ -23856,7 +24742,8 @@ func init() {
 type HostTpmEventDetails struct {
 	DynamicData
 
-	DataHash []byte `xml:"dataHash"`
+	DataHash       []byte `xml:"dataHash"`
+	DataHashMethod string `xml:"dataHashMethod,omitempty"`
 }
 
 func init() {
@@ -24132,6 +25019,114 @@ func init() {
 	t["HostVMotionNetConfig"] = reflect.TypeOf((*HostVMotionNetConfig)(nil)).Elem()
 }
 
+type HostVStorageObjectCreateDiskFromSnapshotRequestType struct {
+	This       ManagedObjectReference          `xml:"_this"`
+	Id         ID                              `xml:"id"`
+	Datastore  ManagedObjectReference          `xml:"datastore"`
+	SnapshotId ID                              `xml:"snapshotId"`
+	Name       string                          `xml:"name"`
+	Profile    []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+	Crypto     BaseCryptoSpec                  `xml:"crypto,omitempty,typeattr"`
+	Path       string                          `xml:"path,omitempty"`
+}
+
+func init() {
+	t["HostVStorageObjectCreateDiskFromSnapshotRequestType"] = reflect.TypeOf((*HostVStorageObjectCreateDiskFromSnapshotRequestType)(nil)).Elem()
+}
+
+type HostVStorageObjectCreateDiskFromSnapshot_Task HostVStorageObjectCreateDiskFromSnapshotRequestType
+
+func init() {
+	t["HostVStorageObjectCreateDiskFromSnapshot_Task"] = reflect.TypeOf((*HostVStorageObjectCreateDiskFromSnapshot_Task)(nil)).Elem()
+}
+
+type HostVStorageObjectCreateDiskFromSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostVStorageObjectCreateSnapshotRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Id          ID                     `xml:"id"`
+	Datastore   ManagedObjectReference `xml:"datastore"`
+	Description string                 `xml:"description"`
+}
+
+func init() {
+	t["HostVStorageObjectCreateSnapshotRequestType"] = reflect.TypeOf((*HostVStorageObjectCreateSnapshotRequestType)(nil)).Elem()
+}
+
+type HostVStorageObjectCreateSnapshot_Task HostVStorageObjectCreateSnapshotRequestType
+
+func init() {
+	t["HostVStorageObjectCreateSnapshot_Task"] = reflect.TypeOf((*HostVStorageObjectCreateSnapshot_Task)(nil)).Elem()
+}
+
+type HostVStorageObjectCreateSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostVStorageObjectDeleteSnapshotRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Id         ID                     `xml:"id"`
+	Datastore  ManagedObjectReference `xml:"datastore"`
+	SnapshotId ID                     `xml:"snapshotId"`
+}
+
+func init() {
+	t["HostVStorageObjectDeleteSnapshotRequestType"] = reflect.TypeOf((*HostVStorageObjectDeleteSnapshotRequestType)(nil)).Elem()
+}
+
+type HostVStorageObjectDeleteSnapshot_Task HostVStorageObjectDeleteSnapshotRequestType
+
+func init() {
+	t["HostVStorageObjectDeleteSnapshot_Task"] = reflect.TypeOf((*HostVStorageObjectDeleteSnapshot_Task)(nil)).Elem()
+}
+
+type HostVStorageObjectDeleteSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HostVStorageObjectRetrieveSnapshotInfo HostVStorageObjectRetrieveSnapshotInfoRequestType
+
+func init() {
+	t["HostVStorageObjectRetrieveSnapshotInfo"] = reflect.TypeOf((*HostVStorageObjectRetrieveSnapshotInfo)(nil)).Elem()
+}
+
+type HostVStorageObjectRetrieveSnapshotInfoRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["HostVStorageObjectRetrieveSnapshotInfoRequestType"] = reflect.TypeOf((*HostVStorageObjectRetrieveSnapshotInfoRequestType)(nil)).Elem()
+}
+
+type HostVStorageObjectRetrieveSnapshotInfoResponse struct {
+	Returnval VStorageObjectSnapshotInfo `xml:"returnval"`
+}
+
+type HostVStorageObjectRevertRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Id         ID                     `xml:"id"`
+	Datastore  ManagedObjectReference `xml:"datastore"`
+	SnapshotId ID                     `xml:"snapshotId"`
+}
+
+func init() {
+	t["HostVStorageObjectRevertRequestType"] = reflect.TypeOf((*HostVStorageObjectRevertRequestType)(nil)).Elem()
+}
+
+type HostVStorageObjectRevert_Task HostVStorageObjectRevertRequestType
+
+func init() {
+	t["HostVStorageObjectRevert_Task"] = reflect.TypeOf((*HostVStorageObjectRevert_Task)(nil)).Elem()
+}
+
+type HostVStorageObjectRevert_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type HostVfatVolume struct {
 	HostFileSystemVolume
 }
@@ -24198,6 +25193,7 @@ type HostVirtualNicConnection struct {
 
 	Portgroup string                                  `xml:"portgroup,omitempty"`
 	DvPort    *DistributedVirtualSwitchPortConnection `xml:"dvPort,omitempty"`
+	OpNetwork *HostVirtualNicOpaqueNetworkSpec        `xml:"opNetwork,omitempty"`
 }
 
 func init() {
@@ -24384,13 +25380,14 @@ func init() {
 type HostVmfsSpec struct {
 	DynamicData
 
-	Extent           HostScsiDiskPartition `xml:"extent"`
-	BlockSizeMb      int32                 `xml:"blockSizeMb,omitempty"`
-	MajorVersion     int32                 `xml:"majorVersion"`
-	VolumeName       string                `xml:"volumeName"`
-	BlockSize        int32                 `xml:"blockSize,omitempty"`
-	UnmapGranularity int32                 `xml:"unmapGranularity,omitempty"`
-	UnmapPriority    string                `xml:"unmapPriority,omitempty"`
+	Extent             HostScsiDiskPartition   `xml:"extent"`
+	BlockSizeMb        int32                   `xml:"blockSizeMb,omitempty"`
+	MajorVersion       int32                   `xml:"majorVersion"`
+	VolumeName         string                  `xml:"volumeName"`
+	BlockSize          int32                   `xml:"blockSize,omitempty"`
+	UnmapGranularity   int32                   `xml:"unmapGranularity,omitempty"`
+	UnmapPriority      string                  `xml:"unmapPriority,omitempty"`
+	UnmapBandwidthSpec *VmfsUnmapBandwidthSpec `xml:"unmapBandwidthSpec,omitempty"`
 }
 
 func init() {
@@ -24400,20 +25397,21 @@ func init() {
 type HostVmfsVolume struct {
 	HostFileSystemVolume
 
-	BlockSizeMb      int32                   `xml:"blockSizeMb"`
-	BlockSize        int32                   `xml:"blockSize,omitempty"`
-	UnmapGranularity int32                   `xml:"unmapGranularity,omitempty"`
-	UnmapPriority    string                  `xml:"unmapPriority,omitempty"`
-	MaxBlocks        int32                   `xml:"maxBlocks"`
-	MajorVersion     int32                   `xml:"majorVersion"`
-	Version          string                  `xml:"version"`
-	Uuid             string                  `xml:"uuid"`
-	Extent           []HostScsiDiskPartition `xml:"extent"`
-	VmfsUpgradable   bool                    `xml:"vmfsUpgradable"`
-	ForceMountedInfo *HostForceMountedInfo   `xml:"forceMountedInfo,omitempty"`
-	Ssd              *bool                   `xml:"ssd"`
-	Local            *bool                   `xml:"local"`
-	ScsiDiskType     string                  `xml:"scsiDiskType,omitempty"`
+	BlockSizeMb        int32                   `xml:"blockSizeMb"`
+	BlockSize          int32                   `xml:"blockSize,omitempty"`
+	UnmapGranularity   int32                   `xml:"unmapGranularity,omitempty"`
+	UnmapPriority      string                  `xml:"unmapPriority,omitempty"`
+	UnmapBandwidthSpec *VmfsUnmapBandwidthSpec `xml:"unmapBandwidthSpec,omitempty"`
+	MaxBlocks          int32                   `xml:"maxBlocks"`
+	MajorVersion       int32                   `xml:"majorVersion"`
+	Version            string                  `xml:"version"`
+	Uuid               string                  `xml:"uuid"`
+	Extent             []HostScsiDiskPartition `xml:"extent"`
+	VmfsUpgradable     bool                    `xml:"vmfsUpgradable"`
+	ForceMountedInfo   *HostForceMountedInfo   `xml:"forceMountedInfo,omitempty"`
+	Ssd                *bool                   `xml:"ssd"`
+	Local              *bool                   `xml:"local"`
+	ScsiDiskType       string                  `xml:"scsiDiskType,omitempty"`
 }
 
 func init() {
@@ -24554,6 +25552,23 @@ func init() {
 	t["HourlyTaskScheduler"] = reflect.TypeOf((*HourlyTaskScheduler)(nil)).Elem()
 }
 
+type HttpFault struct {
+	VimFault
+
+	StatusCode    int32  `xml:"statusCode"`
+	StatusMessage string `xml:"statusMessage"`
+}
+
+func init() {
+	t["HttpFault"] = reflect.TypeOf((*HttpFault)(nil)).Elem()
+}
+
+type HttpFaultFault HttpFault
+
+func init() {
+	t["HttpFaultFault"] = reflect.TypeOf((*HttpFaultFault)(nil)).Elem()
+}
+
 type HttpNfcLeaseAbort HttpNfcLeaseAbortRequestType
 
 func init() {
@@ -24572,6 +25587,17 @@ func init() {
 type HttpNfcLeaseAbortResponse struct {
 }
 
+type HttpNfcLeaseCapabilities struct {
+	DynamicData
+
+	PullModeSupported bool `xml:"pullModeSupported"`
+	CorsSupported     bool `xml:"corsSupported"`
+}
+
+func init() {
+	t["HttpNfcLeaseCapabilities"] = reflect.TypeOf((*HttpNfcLeaseCapabilities)(nil)).Elem()
+}
+
 type HttpNfcLeaseComplete HttpNfcLeaseCompleteRequestType
 
 func init() {
@@ -24666,6 +25692,8 @@ type HttpNfcLeaseManifestEntry struct {
 
 	Key           string `xml:"key"`
 	Sha1          string `xml:"sha1"`
+	Checksum      string `xml:"checksum,omitempty"`
+	ChecksumType  string `xml:"checksumType,omitempty"`
 	Size          int64  `xml:"size"`
 	Disk          bool   `xml:"disk"`
 	Capacity      int64  `xml:"capacity,omitempty"`
@@ -24694,6 +25722,59 @@ func init() {
 type HttpNfcLeaseProgressResponse struct {
 }
 
+type HttpNfcLeasePullFromUrlsRequestType struct {
+	This  ManagedObjectReference   `xml:"_this"`
+	Files []HttpNfcLeaseSourceFile `xml:"files,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeasePullFromUrlsRequestType"] = reflect.TypeOf((*HttpNfcLeasePullFromUrlsRequestType)(nil)).Elem()
+}
+
+type HttpNfcLeasePullFromUrls_Task HttpNfcLeasePullFromUrlsRequestType
+
+func init() {
+	t["HttpNfcLeasePullFromUrls_Task"] = reflect.TypeOf((*HttpNfcLeasePullFromUrls_Task)(nil)).Elem()
+}
+
+type HttpNfcLeasePullFromUrls_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type HttpNfcLeaseSetManifestChecksumType HttpNfcLeaseSetManifestChecksumTypeRequestType
+
+func init() {
+	t["HttpNfcLeaseSetManifestChecksumType"] = reflect.TypeOf((*HttpNfcLeaseSetManifestChecksumType)(nil)).Elem()
+}
+
+type HttpNfcLeaseSetManifestChecksumTypeRequestType struct {
+	This                      ManagedObjectReference `xml:"_this"`
+	DeviceUrlsToChecksumTypes []KeyValue             `xml:"deviceUrlsToChecksumTypes,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeaseSetManifestChecksumTypeRequestType"] = reflect.TypeOf((*HttpNfcLeaseSetManifestChecksumTypeRequestType)(nil)).Elem()
+}
+
+type HttpNfcLeaseSetManifestChecksumTypeResponse struct {
+}
+
+type HttpNfcLeaseSourceFile struct {
+	DynamicData
+
+	TargetDeviceId string     `xml:"targetDeviceId"`
+	Url            string     `xml:"url"`
+	MemberName     string     `xml:"memberName,omitempty"`
+	Create         bool       `xml:"create"`
+	SslThumbprint  string     `xml:"sslThumbprint,omitempty"`
+	HttpHeaders    []KeyValue `xml:"httpHeaders,omitempty"`
+	Size           int64      `xml:"size,omitempty"`
+}
+
+func init() {
+	t["HttpNfcLeaseSourceFile"] = reflect.TypeOf((*HttpNfcLeaseSourceFile)(nil)).Elem()
+}
+
 type ID struct {
 	DynamicData
 
@@ -25278,6 +26359,25 @@ func init() {
 type InstallSmartCardTrustAnchorResponse struct {
 }
 
+type InstantCloneRequestType struct {
+	This ManagedObjectReference         `xml:"_this"`
+	Spec VirtualMachineInstantCloneSpec `xml:"spec"`
+}
+
+func init() {
+	t["InstantCloneRequestType"] = reflect.TypeOf((*InstantCloneRequestType)(nil)).Elem()
+}
+
+type InstantClone_Task InstantCloneRequestType
+
+func init() {
+	t["InstantClone_Task"] = reflect.TypeOf((*InstantClone_Task)(nil)).Elem()
+}
+
+type InstantClone_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type InsufficientAgentVmsDeployed struct {
 	InsufficientResourcesFault
 
@@ -29904,6 +31004,7 @@ type NetworkProfile struct {
 	Dvswitch                []DvsProfile                     `xml:"dvswitch,omitempty"`
 	DvsServiceConsoleNic    []DvsServiceConsoleVNicProfile   `xml:"dvsServiceConsoleNic,omitempty"`
 	DvsHostNic              []DvsHostVNicProfile             `xml:"dvsHostNic,omitempty"`
+	NsxHostNic              []NsxHostVNicProfile             `xml:"nsxHostNic,omitempty"`
 	NetStackInstance        []NetStackInstanceProfile        `xml:"netStackInstance,omitempty"`
 }
 
@@ -30814,6 +31915,17 @@ func init() {
 	t["NotUserConfigurablePropertyFault"] = reflect.TypeOf((*NotUserConfigurablePropertyFault)(nil)).Elem()
 }
 
+type NsxHostVNicProfile struct {
+	ApplyProfile
+
+	Key      string           `xml:"key"`
+	IpConfig IpAddressProfile `xml:"ipConfig"`
+}
+
+func init() {
+	t["NsxHostVNicProfile"] = reflect.TypeOf((*NsxHostVNicProfile)(nil)).Elem()
+}
+
 type NumPortsProfile struct {
 	ApplyProfile
 }
@@ -30900,6 +32012,160 @@ func init() {
 	t["NumericRange"] = reflect.TypeOf((*NumericRange)(nil)).Elem()
 }
 
+type NvdimmDimmInfo struct {
+	DynamicData
+
+	DimmHandle                  int32              `xml:"dimmHandle"`
+	HealthInfo                  NvdimmHealthInfo   `xml:"healthInfo"`
+	TotalCapacity               int64              `xml:"totalCapacity"`
+	PersistentCapacity          int64              `xml:"persistentCapacity"`
+	AvailablePersistentCapacity int64              `xml:"availablePersistentCapacity"`
+	VolatileCapacity            int64              `xml:"volatileCapacity"`
+	AvailableVolatileCapacity   int64              `xml:"availableVolatileCapacity"`
+	BlockCapacity               int64              `xml:"blockCapacity"`
+	RegionInfo                  []NvdimmRegionInfo `xml:"regionInfo,omitempty"`
+	RepresentationString        string             `xml:"representationString"`
+}
+
+func init() {
+	t["NvdimmDimmInfo"] = reflect.TypeOf((*NvdimmDimmInfo)(nil)).Elem()
+}
+
+type NvdimmGuid struct {
+	DynamicData
+
+	Uuid string `xml:"uuid"`
+}
+
+func init() {
+	t["NvdimmGuid"] = reflect.TypeOf((*NvdimmGuid)(nil)).Elem()
+}
+
+type NvdimmHealthInfo struct {
+	DynamicData
+
+	HealthStatus             string   `xml:"healthStatus"`
+	HealthInformation        string   `xml:"healthInformation"`
+	StateFlagInfo            []string `xml:"stateFlagInfo,omitempty"`
+	DimmTemperature          int32    `xml:"dimmTemperature"`
+	DimmTemperatureThreshold int32    `xml:"dimmTemperatureThreshold"`
+	SpareBlocksPercentage    int32    `xml:"spareBlocksPercentage"`
+	SpareBlockThreshold      int32    `xml:"spareBlockThreshold"`
+	DimmLifespanPercentage   int32    `xml:"dimmLifespanPercentage"`
+	EsTemperature            int32    `xml:"esTemperature,omitempty"`
+	EsTemperatureThreshold   int32    `xml:"esTemperatureThreshold,omitempty"`
+	EsLifespanPercentage     int32    `xml:"esLifespanPercentage,omitempty"`
+}
+
+func init() {
+	t["NvdimmHealthInfo"] = reflect.TypeOf((*NvdimmHealthInfo)(nil)).Elem()
+}
+
+type NvdimmInterleaveSetInfo struct {
+	DynamicData
+
+	SetId         int32   `xml:"setId"`
+	RangeType     string  `xml:"rangeType"`
+	BaseAddress   int64   `xml:"baseAddress"`
+	Size          int64   `xml:"size"`
+	AvailableSize int64   `xml:"availableSize"`
+	DeviceList    []int32 `xml:"deviceList,omitempty"`
+	State         string  `xml:"state"`
+}
+
+func init() {
+	t["NvdimmInterleaveSetInfo"] = reflect.TypeOf((*NvdimmInterleaveSetInfo)(nil)).Elem()
+}
+
+type NvdimmNamespaceCreateSpec struct {
+	DynamicData
+
+	FriendlyName string `xml:"friendlyName,omitempty"`
+	BlockSize    int64  `xml:"blockSize"`
+	BlockCount   int64  `xml:"blockCount"`
+	Type         string `xml:"type"`
+	LocationID   int32  `xml:"locationID"`
+}
+
+func init() {
+	t["NvdimmNamespaceCreateSpec"] = reflect.TypeOf((*NvdimmNamespaceCreateSpec)(nil)).Elem()
+}
+
+type NvdimmNamespaceDeleteSpec struct {
+	DynamicData
+
+	Uuid string `xml:"uuid"`
+}
+
+func init() {
+	t["NvdimmNamespaceDeleteSpec"] = reflect.TypeOf((*NvdimmNamespaceDeleteSpec)(nil)).Elem()
+}
+
+type NvdimmNamespaceInfo struct {
+	DynamicData
+
+	Uuid                  string `xml:"uuid"`
+	FriendlyName          string `xml:"friendlyName"`
+	BlockSize             int64  `xml:"blockSize"`
+	BlockCount            int64  `xml:"blockCount"`
+	Type                  string `xml:"type"`
+	NamespaceHealthStatus string `xml:"namespaceHealthStatus"`
+	LocationID            int32  `xml:"locationID"`
+	State                 string `xml:"state"`
+}
+
+func init() {
+	t["NvdimmNamespaceInfo"] = reflect.TypeOf((*NvdimmNamespaceInfo)(nil)).Elem()
+}
+
+type NvdimmRegionInfo struct {
+	DynamicData
+
+	RegionId  int32  `xml:"regionId"`
+	SetId     int32  `xml:"setId"`
+	RangeType string `xml:"rangeType"`
+	StartAddr int64  `xml:"startAddr"`
+	Size      int64  `xml:"size"`
+	Offset    int64  `xml:"offset"`
+}
+
+func init() {
+	t["NvdimmRegionInfo"] = reflect.TypeOf((*NvdimmRegionInfo)(nil)).Elem()
+}
+
+type NvdimmSummary struct {
+	DynamicData
+
+	NumDimms           int32  `xml:"numDimms"`
+	HealthStatus       string `xml:"healthStatus"`
+	TotalCapacity      int64  `xml:"totalCapacity"`
+	PersistentCapacity int64  `xml:"persistentCapacity"`
+	BlockCapacity      int64  `xml:"blockCapacity"`
+	AvailableCapacity  int64  `xml:"availableCapacity"`
+	NumInterleavesets  int32  `xml:"numInterleavesets"`
+	NumNamespaces      int32  `xml:"numNamespaces"`
+}
+
+func init() {
+	t["NvdimmSummary"] = reflect.TypeOf((*NvdimmSummary)(nil)).Elem()
+}
+
+type NvdimmSystemInfo struct {
+	DynamicData
+
+	Summary       *NvdimmSummary            `xml:"summary,omitempty"`
+	Dimms         []int32                   `xml:"dimms,omitempty"`
+	DimmInfo      []NvdimmDimmInfo          `xml:"dimmInfo,omitempty"`
+	InterleaveSet []int32                   `xml:"interleaveSet,omitempty"`
+	ISetInfo      []NvdimmInterleaveSetInfo `xml:"iSetInfo,omitempty"`
+	Namespace     []NvdimmGuid              `xml:"namespace,omitempty"`
+	NsInfo        []NvdimmNamespaceInfo     `xml:"nsInfo,omitempty"`
+}
+
+func init() {
+	t["NvdimmSystemInfo"] = reflect.TypeOf((*NvdimmSystemInfo)(nil)).Elem()
+}
+
 type ObjectContent struct {
 	DynamicData
 
@@ -32640,6 +33906,16 @@ func init() {
 	t["OvfXmlFormatFault"] = reflect.TypeOf((*OvfXmlFormatFault)(nil)).Elem()
 }
 
+type PMemDatastoreInfo struct {
+	DatastoreInfo
+
+	Pmem HostPMemVolume `xml:"pmem"`
+}
+
+func init() {
+	t["PMemDatastoreInfo"] = reflect.TypeOf((*PMemDatastoreInfo)(nil)).Elem()
+}
+
 type ParaVirtualSCSIController struct {
 	VirtualSCSIController
 }
@@ -33214,6 +34490,7 @@ type PhysicalNic struct {
 	ResourcePoolSchedulerAllowed          *bool                 `xml:"resourcePoolSchedulerAllowed"`
 	ResourcePoolSchedulerDisallowedReason []string              `xml:"resourcePoolSchedulerDisallowedReason,omitempty"`
 	AutoNegotiateSupported                *bool                 `xml:"autoNegotiateSupported"`
+	EnhancedNetworkingStackSupported      *bool                 `xml:"enhancedNetworkingStackSupported"`
 }
 
 func init() {
@@ -33343,8 +34620,9 @@ func init() {
 type PhysicalNicSpec struct {
 	DynamicData
 
-	Ip        *HostIpConfig        `xml:"ip,omitempty"`
-	LinkSpeed *PhysicalNicLinkInfo `xml:"linkSpeed,omitempty"`
+	Ip                            *HostIpConfig        `xml:"ip,omitempty"`
+	LinkSpeed                     *PhysicalNicLinkInfo `xml:"linkSpeed,omitempty"`
+	EnableEnhancedNetworkingStack *bool                `xml:"enableEnhancedNetworkingStack"`
 }
 
 func init() {
@@ -34031,18 +35309,30 @@ func init() {
 type ProfileMetadata struct {
 	DynamicData
 
-	Key              string                           `xml:"key"`
-	ProfileTypeName  string                           `xml:"profileTypeName,omitempty"`
-	Description      *ExtendedDescription             `xml:"description,omitempty"`
-	SortSpec         []ProfileMetadataProfileSortSpec `xml:"sortSpec,omitempty"`
-	ProfileCategory  string                           `xml:"profileCategory,omitempty"`
-	ProfileComponent string                           `xml:"profileComponent,omitempty"`
+	Key               string                                   `xml:"key"`
+	ProfileTypeName   string                                   `xml:"profileTypeName,omitempty"`
+	Description       *ExtendedDescription                     `xml:"description,omitempty"`
+	SortSpec          []ProfileMetadataProfileSortSpec         `xml:"sortSpec,omitempty"`
+	ProfileCategory   string                                   `xml:"profileCategory,omitempty"`
+	ProfileComponent  string                                   `xml:"profileComponent,omitempty"`
+	OperationMessages []ProfileMetadataProfileOperationMessage `xml:"operationMessages,omitempty"`
 }
 
 func init() {
 	t["ProfileMetadata"] = reflect.TypeOf((*ProfileMetadata)(nil)).Elem()
 }
 
+type ProfileMetadataProfileOperationMessage struct {
+	DynamicData
+
+	OperationName string             `xml:"operationName"`
+	Message       LocalizableMessage `xml:"message"`
+}
+
+func init() {
+	t["ProfileMetadataProfileOperationMessage"] = reflect.TypeOf((*ProfileMetadataProfileOperationMessage)(nil)).Elem()
+}
+
 type ProfileMetadataProfileSortSpec struct {
 	DynamicData
 
@@ -34057,19 +35347,34 @@ func init() {
 type ProfileParameterMetadata struct {
 	DynamicData
 
-	Id                ExtendedElementDescription `xml:"id"`
-	Type              string                     `xml:"type"`
-	Optional          bool                       `xml:"optional"`
-	DefaultValue      AnyType                    `xml:"defaultValue,omitempty,typeattr"`
-	Hidden            *bool                      `xml:"hidden"`
-	SecuritySensitive *bool                      `xml:"securitySensitive"`
-	ReadOnly          *bool                      `xml:"readOnly"`
+	Id                 ExtendedElementDescription                          `xml:"id"`
+	Type               string                                              `xml:"type"`
+	Optional           bool                                                `xml:"optional"`
+	DefaultValue       AnyType                                             `xml:"defaultValue,omitempty,typeattr"`
+	Hidden             *bool                                               `xml:"hidden"`
+	SecuritySensitive  *bool                                               `xml:"securitySensitive"`
+	ReadOnly           *bool                                               `xml:"readOnly"`
+	ParameterRelations []ProfileParameterMetadataParameterRelationMetadata `xml:"parameterRelations,omitempty"`
 }
 
 func init() {
 	t["ProfileParameterMetadata"] = reflect.TypeOf((*ProfileParameterMetadata)(nil)).Elem()
 }
 
+type ProfileParameterMetadataParameterRelationMetadata struct {
+	DynamicData
+
+	RelationTypes []string             `xml:"relationTypes,omitempty"`
+	Values        []AnyType            `xml:"values,omitempty,typeattr"`
+	Path          *ProfilePropertyPath `xml:"path,omitempty"`
+	MinCount      int32                `xml:"minCount"`
+	MaxCount      int32                `xml:"maxCount"`
+}
+
+func init() {
+	t["ProfileParameterMetadataParameterRelationMetadata"] = reflect.TypeOf((*ProfileParameterMetadataParameterRelationMetadata)(nil)).Elem()
+}
+
 type ProfilePolicy struct {
 	DynamicData
 
@@ -34129,9 +35434,10 @@ func init() {
 type ProfilePropertyPath struct {
 	DynamicData
 
-	ProfilePath string `xml:"profilePath"`
-	PolicyId    string `xml:"policyId,omitempty"`
-	ParameterId string `xml:"parameterId,omitempty"`
+	ProfilePath    string `xml:"profilePath"`
+	PolicyId       string `xml:"policyId,omitempty"`
+	ParameterId    string `xml:"parameterId,omitempty"`
+	PolicyOptionId string `xml:"policyOptionId,omitempty"`
 }
 
 func init() {
@@ -34182,7 +35488,8 @@ func init() {
 type ProfileUpdateFailed struct {
 	VimFault
 
-	Failure []ProfileUpdateFailedUpdateFailure `xml:"failure"`
+	Failure  []ProfileUpdateFailedUpdateFailure `xml:"failure"`
+	Warnings []ProfileUpdateFailedUpdateFailure `xml:"warnings,omitempty"`
 }
 
 func init() {
@@ -34345,7 +35652,7 @@ func init() {
 }
 
 type QueryAssignedLicensesResponse struct {
-	Returnval []LicenseAssignmentManagerLicenseAssignment `xml:"returnval"`
+	Returnval []LicenseAssignmentManagerLicenseAssignment `xml:"returnval,omitempty"`
 }
 
 type QueryAvailableDisksForVmfs QueryAvailableDisksForVmfsRequestType
@@ -37403,6 +38710,25 @@ func init() {
 type RefreshStorageDrsRecommendationResponse struct {
 }
 
+type RefreshStorageDrsRecommendationsForPodRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Pod  ManagedObjectReference `xml:"pod"`
+}
+
+func init() {
+	t["RefreshStorageDrsRecommendationsForPodRequestType"] = reflect.TypeOf((*RefreshStorageDrsRecommendationsForPodRequestType)(nil)).Elem()
+}
+
+type RefreshStorageDrsRecommendationsForPod_Task RefreshStorageDrsRecommendationsForPodRequestType
+
+func init() {
+	t["RefreshStorageDrsRecommendationsForPod_Task"] = reflect.TypeOf((*RefreshStorageDrsRecommendationsForPod_Task)(nil)).Elem()
+}
+
+type RefreshStorageDrsRecommendationsForPod_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type RefreshStorageInfo RefreshStorageInfoRequestType
 
 func init() {
@@ -38530,16 +39856,20 @@ func init() {
 type ReplicationConfigSpec struct {
 	DynamicData
 
-	Generation            int64                         `xml:"generation"`
-	VmReplicationId       string                        `xml:"vmReplicationId"`
-	Destination           string                        `xml:"destination"`
-	Port                  int32                         `xml:"port"`
-	Rpo                   int64                         `xml:"rpo"`
-	QuiesceGuestEnabled   bool                          `xml:"quiesceGuestEnabled"`
-	Paused                bool                          `xml:"paused"`
-	OppUpdatesEnabled     bool                          `xml:"oppUpdatesEnabled"`
-	NetCompressionEnabled *bool                         `xml:"netCompressionEnabled"`
-	Disk                  []ReplicationInfoDiskSettings `xml:"disk,omitempty"`
+	Generation                  int64                         `xml:"generation"`
+	VmReplicationId             string                        `xml:"vmReplicationId"`
+	Destination                 string                        `xml:"destination"`
+	Port                        int32                         `xml:"port"`
+	Rpo                         int64                         `xml:"rpo"`
+	QuiesceGuestEnabled         bool                          `xml:"quiesceGuestEnabled"`
+	Paused                      bool                          `xml:"paused"`
+	OppUpdatesEnabled           bool                          `xml:"oppUpdatesEnabled"`
+	NetCompressionEnabled       *bool                         `xml:"netCompressionEnabled"`
+	NetEncryptionEnabled        *bool                         `xml:"netEncryptionEnabled"`
+	EncryptionDestination       string                        `xml:"encryptionDestination,omitempty"`
+	EncryptionPort              int32                         `xml:"encryptionPort,omitempty"`
+	RemoteCertificateThumbprint string                        `xml:"remoteCertificateThumbprint,omitempty"`
+	Disk                        []ReplicationInfoDiskSettings `xml:"disk,omitempty"`
 }
 
 func init() {
@@ -39857,6 +41187,26 @@ type RetrieveServiceContentResponse struct {
 	Returnval ServiceContent `xml:"returnval"`
 }
 
+type RetrieveSnapshotInfo RetrieveSnapshotInfoRequestType
+
+func init() {
+	t["RetrieveSnapshotInfo"] = reflect.TypeOf((*RetrieveSnapshotInfo)(nil)).Elem()
+}
+
+type RetrieveSnapshotInfoRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RetrieveSnapshotInfoRequestType"] = reflect.TypeOf((*RetrieveSnapshotInfoRequestType)(nil)).Elem()
+}
+
+type RetrieveSnapshotInfoResponse struct {
+	Returnval VStorageObjectSnapshotInfo `xml:"returnval"`
+}
+
 type RetrieveUserGroups RetrieveUserGroupsRequestType
 
 func init() {
@@ -39882,12 +41232,61 @@ type RetrieveUserGroupsResponse struct {
 	Returnval []BaseUserSearchResult `xml:"returnval,omitempty,typeattr"`
 }
 
+type RetrieveVStorageInfrastructureObjectPolicy RetrieveVStorageInfrastructureObjectPolicyRequestType
+
+func init() {
+	t["RetrieveVStorageInfrastructureObjectPolicy"] = reflect.TypeOf((*RetrieveVStorageInfrastructureObjectPolicy)(nil)).Elem()
+}
+
+type RetrieveVStorageInfrastructureObjectPolicyRequestType struct {
+	This      ManagedObjectReference `xml:"_this"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RetrieveVStorageInfrastructureObjectPolicyRequestType"] = reflect.TypeOf((*RetrieveVStorageInfrastructureObjectPolicyRequestType)(nil)).Elem()
+}
+
+type RetrieveVStorageInfrastructureObjectPolicyResponse struct {
+	Returnval []VslmInfrastructureObjectPolicy `xml:"returnval,omitempty"`
+}
+
+type RetrieveVStorageObjSpec struct {
+	DynamicData
+
+	Id        ID                     `xml:"id"`
+	Datastore ManagedObjectReference `xml:"datastore"`
+}
+
+func init() {
+	t["RetrieveVStorageObjSpec"] = reflect.TypeOf((*RetrieveVStorageObjSpec)(nil)).Elem()
+}
+
 type RetrieveVStorageObject RetrieveVStorageObjectRequestType
 
 func init() {
 	t["RetrieveVStorageObject"] = reflect.TypeOf((*RetrieveVStorageObject)(nil)).Elem()
 }
 
+type RetrieveVStorageObjectAssociations RetrieveVStorageObjectAssociationsRequestType
+
+func init() {
+	t["RetrieveVStorageObjectAssociations"] = reflect.TypeOf((*RetrieveVStorageObjectAssociations)(nil)).Elem()
+}
+
+type RetrieveVStorageObjectAssociationsRequestType struct {
+	This ManagedObjectReference    `xml:"_this"`
+	Ids  []RetrieveVStorageObjSpec `xml:"ids,omitempty"`
+}
+
+func init() {
+	t["RetrieveVStorageObjectAssociationsRequestType"] = reflect.TypeOf((*RetrieveVStorageObjectAssociationsRequestType)(nil)).Elem()
+}
+
+type RetrieveVStorageObjectAssociationsResponse struct {
+	Returnval []VStorageObjectAssociations `xml:"returnval,omitempty"`
+}
+
 type RetrieveVStorageObjectRequestType struct {
 	This      ManagedObjectReference `xml:"_this"`
 	Id        ID                     `xml:"id"`
@@ -39962,6 +41361,27 @@ type RevertToSnapshot_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
 
+type RevertVStorageObjectRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	Id         ID                     `xml:"id"`
+	Datastore  ManagedObjectReference `xml:"datastore"`
+	SnapshotId ID                     `xml:"snapshotId"`
+}
+
+func init() {
+	t["RevertVStorageObjectRequestType"] = reflect.TypeOf((*RevertVStorageObjectRequestType)(nil)).Elem()
+}
+
+type RevertVStorageObject_Task RevertVStorageObjectRequestType
+
+func init() {
+	t["RevertVStorageObject_Task"] = reflect.TypeOf((*RevertVStorageObject_Task)(nil)).Elem()
+}
+
+type RevertVStorageObject_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type RewindCollector RewindCollectorRequestType
 
 func init() {
@@ -40147,6 +41567,14 @@ func init() {
 	t["SAMLTokenAuthentication"] = reflect.TypeOf((*SAMLTokenAuthentication)(nil)).Elem()
 }
 
+type SDDCBase struct {
+	DynamicData
+}
+
+func init() {
+	t["SDDCBase"] = reflect.TypeOf((*SDDCBase)(nil)).Elem()
+}
+
 type SSLDisabledFault struct {
 	HostConnectFault
 }
@@ -41273,6 +42701,26 @@ func init() {
 type SetTaskStateResponse struct {
 }
 
+type SetVStorageObjectControlFlags SetVStorageObjectControlFlagsRequestType
+
+func init() {
+	t["SetVStorageObjectControlFlags"] = reflect.TypeOf((*SetVStorageObjectControlFlags)(nil)).Elem()
+}
+
+type SetVStorageObjectControlFlagsRequestType struct {
+	This         ManagedObjectReference `xml:"_this"`
+	Id           ID                     `xml:"id"`
+	Datastore    ManagedObjectReference `xml:"datastore"`
+	ControlFlags []string               `xml:"controlFlags,omitempty"`
+}
+
+func init() {
+	t["SetVStorageObjectControlFlagsRequestType"] = reflect.TypeOf((*SetVStorageObjectControlFlagsRequestType)(nil)).Elem()
+}
+
+type SetVStorageObjectControlFlagsResponse struct {
+}
+
 type SetVirtualDiskUuid SetVirtualDiskUuidRequestType
 
 func init() {
@@ -42303,6 +43751,7 @@ type StorageDrsVmConfigInfo struct {
 	Behavior            string                           `xml:"behavior,omitempty"`
 	IntraVmAffinity     *bool                            `xml:"intraVmAffinity"`
 	IntraVmAntiAffinity *VirtualDiskAntiAffinityRuleSpec `xml:"intraVmAntiAffinity,omitempty"`
+	VirtualDiskRules    []VirtualDiskRuleSpec            `xml:"virtualDiskRules,omitempty"`
 }
 
 func init() {
@@ -45247,6 +46696,46 @@ func init() {
 type UpdateVAppConfigResponse struct {
 }
 
+type UpdateVStorageInfrastructureObjectPolicyRequestType struct {
+	This ManagedObjectReference             `xml:"_this"`
+	Spec VslmInfrastructureObjectPolicySpec `xml:"spec"`
+}
+
+func init() {
+	t["UpdateVStorageInfrastructureObjectPolicyRequestType"] = reflect.TypeOf((*UpdateVStorageInfrastructureObjectPolicyRequestType)(nil)).Elem()
+}
+
+type UpdateVStorageInfrastructureObjectPolicy_Task UpdateVStorageInfrastructureObjectPolicyRequestType
+
+func init() {
+	t["UpdateVStorageInfrastructureObjectPolicy_Task"] = reflect.TypeOf((*UpdateVStorageInfrastructureObjectPolicy_Task)(nil)).Elem()
+}
+
+type UpdateVStorageInfrastructureObjectPolicy_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type UpdateVStorageObjectPolicyRequestType struct {
+	This      ManagedObjectReference          `xml:"_this"`
+	Id        ID                              `xml:"id"`
+	Datastore ManagedObjectReference          `xml:"datastore"`
+	Profile   []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["UpdateVStorageObjectPolicyRequestType"] = reflect.TypeOf((*UpdateVStorageObjectPolicyRequestType)(nil)).Elem()
+}
+
+type UpdateVStorageObjectPolicy_Task UpdateVStorageObjectPolicyRequestType
+
+func init() {
+	t["UpdateVStorageObjectPolicy_Task"] = reflect.TypeOf((*UpdateVStorageObjectPolicy_Task)(nil)).Elem()
+}
+
+type UpdateVStorageObjectPolicy_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type UpdateVVolVirtualMachineFilesRequestType struct {
 	This         ManagedObjectReference               `xml:"_this"`
 	FailoverPair []DatastoreVVolContainerFailoverPair `xml:"failoverPair,omitempty"`
@@ -45344,6 +46833,25 @@ func init() {
 type UpdateVirtualSwitchResponse struct {
 }
 
+type UpdateVmfsUnmapBandwidth UpdateVmfsUnmapBandwidthRequestType
+
+func init() {
+	t["UpdateVmfsUnmapBandwidth"] = reflect.TypeOf((*UpdateVmfsUnmapBandwidth)(nil)).Elem()
+}
+
+type UpdateVmfsUnmapBandwidthRequestType struct {
+	This               ManagedObjectReference `xml:"_this"`
+	VmfsUuid           string                 `xml:"vmfsUuid"`
+	UnmapBandwidthSpec VmfsUnmapBandwidthSpec `xml:"unmapBandwidthSpec"`
+}
+
+func init() {
+	t["UpdateVmfsUnmapBandwidthRequestType"] = reflect.TypeOf((*UpdateVmfsUnmapBandwidthRequestType)(nil)).Elem()
+}
+
+type UpdateVmfsUnmapBandwidthResponse struct {
+}
+
 type UpdateVmfsUnmapPriority UpdateVmfsUnmapPriorityRequestType
 
 func init() {
@@ -46394,6 +47902,7 @@ type VMwareDVSPortSetting struct {
 	IpfixEnabled        *BoolPolicy                                `xml:"ipfixEnabled,omitempty"`
 	TxUplink            *BoolPolicy                                `xml:"txUplink,omitempty"`
 	LacpPolicy          *VMwareUplinkLacpPolicy                    `xml:"lacpPolicy,omitempty"`
+	MacManagementPolicy *DVSMacManagementPolicy                    `xml:"macManagementPolicy,omitempty"`
 }
 
 func init() {
@@ -46482,6 +47991,7 @@ type VMwareDVSVspanCapability struct {
 	RemoteDestSupported        bool  `xml:"remoteDestSupported"`
 	EncapRemoteSourceSupported bool  `xml:"encapRemoteSourceSupported"`
 	ErspanProtocolSupported    *bool `xml:"erspanProtocolSupported"`
+	MirrorNetstackSupported    *bool `xml:"mirrorNetstackSupported"`
 }
 
 func init() {
@@ -46643,36 +48153,44 @@ type VMwareVspanSession struct {
 	ErspanId              int32            `xml:"erspanId,omitempty"`
 	ErspanCOS             int32            `xml:"erspanCOS,omitempty"`
 	ErspanGraNanosec      *bool            `xml:"erspanGraNanosec"`
+	Netstack              string           `xml:"netstack,omitempty"`
 }
 
 func init() {
 	t["VMwareVspanSession"] = reflect.TypeOf((*VMwareVspanSession)(nil)).Elem()
 }
 
-type VRPEditSpec struct {
+type VStorageObject struct {
 	DynamicData
 
-	VrpId            string                     `xml:"vrpId"`
-	Description      string                     `xml:"description,omitempty"`
-	CpuAllocation    *VrpResourceAllocationInfo `xml:"cpuAllocation,omitempty"`
-	MemoryAllocation *VrpResourceAllocationInfo `xml:"memoryAllocation,omitempty"`
-	AddedHubs        []ManagedObjectReference   `xml:"addedHubs,omitempty"`
-	RemovedHubs      []ManagedObjectReference   `xml:"removedHubs,omitempty"`
-	ChangeVersion    int64                      `xml:"changeVersion,omitempty"`
+	Config VStorageObjectConfigInfo `xml:"config"`
 }
 
 func init() {
-	t["VRPEditSpec"] = reflect.TypeOf((*VRPEditSpec)(nil)).Elem()
+	t["VStorageObject"] = reflect.TypeOf((*VStorageObject)(nil)).Elem()
 }
 
-type VStorageObject struct {
+type VStorageObjectAssociations struct {
 	DynamicData
 
-	Config VStorageObjectConfigInfo `xml:"config"`
+	Id                 ID                                             `xml:"id"`
+	VmDiskAssociations []VStorageObjectAssociationsVmDiskAssociations `xml:"vmDiskAssociations,omitempty"`
+	Fault              *LocalizedMethodFault                          `xml:"fault,omitempty"`
 }
 
 func init() {
-	t["VStorageObject"] = reflect.TypeOf((*VStorageObject)(nil)).Elem()
+	t["VStorageObjectAssociations"] = reflect.TypeOf((*VStorageObjectAssociations)(nil)).Elem()
+}
+
+type VStorageObjectAssociationsVmDiskAssociations struct {
+	DynamicData
+
+	VmId    string `xml:"vmId"`
+	DiskKey int32  `xml:"diskKey"`
+}
+
+func init() {
+	t["VStorageObjectAssociationsVmDiskAssociations"] = reflect.TypeOf((*VStorageObjectAssociationsVmDiskAssociations)(nil)).Elem()
 }
 
 type VStorageObjectConfigInfo struct {
@@ -46687,6 +48205,50 @@ func init() {
 	t["VStorageObjectConfigInfo"] = reflect.TypeOf((*VStorageObjectConfigInfo)(nil)).Elem()
 }
 
+type VStorageObjectCreateSnapshotRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	Id          ID                     `xml:"id"`
+	Datastore   ManagedObjectReference `xml:"datastore"`
+	Description string                 `xml:"description"`
+}
+
+func init() {
+	t["VStorageObjectCreateSnapshotRequestType"] = reflect.TypeOf((*VStorageObjectCreateSnapshotRequestType)(nil)).Elem()
+}
+
+type VStorageObjectCreateSnapshot_Task VStorageObjectCreateSnapshotRequestType
+
+func init() {
+	t["VStorageObjectCreateSnapshot_Task"] = reflect.TypeOf((*VStorageObjectCreateSnapshot_Task)(nil)).Elem()
+}
+
+type VStorageObjectCreateSnapshot_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type VStorageObjectSnapshotInfo struct {
+	DynamicData
+
+	Snapshots []VStorageObjectSnapshotInfoVStorageObjectSnapshot `xml:"snapshots,omitempty"`
+}
+
+func init() {
+	t["VStorageObjectSnapshotInfo"] = reflect.TypeOf((*VStorageObjectSnapshotInfo)(nil)).Elem()
+}
+
+type VStorageObjectSnapshotInfoVStorageObjectSnapshot struct {
+	DynamicData
+
+	Id              *ID       `xml:"id,omitempty"`
+	BackingObjectId string    `xml:"backingObjectId,omitempty"`
+	CreateTime      time.Time `xml:"createTime"`
+	Description     string    `xml:"description"`
+}
+
+func init() {
+	t["VStorageObjectSnapshotInfoVStorageObjectSnapshot"] = reflect.TypeOf((*VStorageObjectSnapshotInfoVStorageObjectSnapshot)(nil)).Elem()
+}
+
 type VStorageObjectStateInfo struct {
 	DynamicData
 
@@ -46755,6 +48317,31 @@ func init() {
 	t["ValidateHost"] = reflect.TypeOf((*ValidateHost)(nil)).Elem()
 }
 
+type ValidateHostProfileCompositionRequestType struct {
+	This                   ManagedObjectReference   `xml:"_this"`
+	Source                 ManagedObjectReference   `xml:"source"`
+	Targets                []ManagedObjectReference `xml:"targets,omitempty"`
+	ToBeMerged             *HostApplyProfile        `xml:"toBeMerged,omitempty"`
+	ToReplaceWith          *HostApplyProfile        `xml:"toReplaceWith,omitempty"`
+	ToBeDeleted            *HostApplyProfile        `xml:"toBeDeleted,omitempty"`
+	EnableStatusToBeCopied *HostApplyProfile        `xml:"enableStatusToBeCopied,omitempty"`
+	ErrorOnly              *bool                    `xml:"errorOnly"`
+}
+
+func init() {
+	t["ValidateHostProfileCompositionRequestType"] = reflect.TypeOf((*ValidateHostProfileCompositionRequestType)(nil)).Elem()
+}
+
+type ValidateHostProfileComposition_Task ValidateHostProfileCompositionRequestType
+
+func init() {
+	t["ValidateHostProfileComposition_Task"] = reflect.TypeOf((*ValidateHostProfileComposition_Task)(nil)).Elem()
+}
+
+type ValidateHostProfileComposition_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
 type ValidateHostRequestType struct {
 	This          ManagedObjectReference `xml:"_this"`
 	OvfDescriptor string                 `xml:"ovfDescriptor"`
@@ -46793,6 +48380,26 @@ type ValidateMigrationResponse struct {
 	Returnval []BaseEvent `xml:"returnval,omitempty,typeattr"`
 }
 
+type ValidateStoragePodConfig ValidateStoragePodConfigRequestType
+
+func init() {
+	t["ValidateStoragePodConfig"] = reflect.TypeOf((*ValidateStoragePodConfig)(nil)).Elem()
+}
+
+type ValidateStoragePodConfigRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Pod  ManagedObjectReference `xml:"pod"`
+	Spec StorageDrsConfigSpec   `xml:"spec"`
+}
+
+func init() {
+	t["ValidateStoragePodConfigRequestType"] = reflect.TypeOf((*ValidateStoragePodConfigRequestType)(nil)).Elem()
+}
+
+type ValidateStoragePodConfigResponse struct {
+	Returnval *LocalizedMethodFault `xml:"returnval,omitempty"`
+}
+
 type VasaProviderContainerSpec struct {
 	DynamicData
 
@@ -46950,6 +48557,7 @@ func init() {
 type VimVasaProvider struct {
 	DynamicData
 
+	Uid                   string `xml:"uid,omitempty"`
 	Url                   string `xml:"url"`
 	Name                  string `xml:"name,omitempty"`
 	SelfSignedCertificate string `xml:"selfSignedCertificate,omitempty"`
@@ -47258,6 +48866,7 @@ func init() {
 type VirtualDeviceConnectInfo struct {
 	DynamicData
 
+	MigrateConnect    string `xml:"migrateConnect,omitempty"`
 	StartConnected    bool   `xml:"startConnected"`
 	AllowGuestControl bool   `xml:"allowGuestControl"`
 	Connected         bool   `xml:"connected"`
@@ -47416,14 +49025,15 @@ func init() {
 type VirtualDisk struct {
 	VirtualDevice
 
-	CapacityInKB          int64                             `xml:"capacityInKB"`
-	CapacityInBytes       int64                             `xml:"capacityInBytes,omitempty"`
-	Shares                *SharesInfo                       `xml:"shares,omitempty"`
-	StorageIOAllocation   *StorageIOAllocationInfo          `xml:"storageIOAllocation,omitempty"`
-	DiskObjectId          string                            `xml:"diskObjectId,omitempty"`
-	VFlashCacheConfigInfo *VirtualDiskVFlashCacheConfigInfo `xml:"vFlashCacheConfigInfo,omitempty"`
-	Iofilter              []string                          `xml:"iofilter,omitempty"`
-	VDiskId               *ID                               `xml:"vDiskId,omitempty"`
+	CapacityInKB               int64                             `xml:"capacityInKB"`
+	CapacityInBytes            int64                             `xml:"capacityInBytes,omitempty"`
+	Shares                     *SharesInfo                       `xml:"shares,omitempty"`
+	StorageIOAllocation        *StorageIOAllocationInfo          `xml:"storageIOAllocation,omitempty"`
+	DiskObjectId               string                            `xml:"diskObjectId,omitempty"`
+	VFlashCacheConfigInfo      *VirtualDiskVFlashCacheConfigInfo `xml:"vFlashCacheConfigInfo,omitempty"`
+	Iofilter                   []string                          `xml:"iofilter,omitempty"`
+	VDiskId                    *ID                               `xml:"vDiskId,omitempty"`
+	NativeUnmanagedLinkedClone *bool                             `xml:"nativeUnmanagedLinkedClone"`
 }
 
 func init() {
@@ -47557,6 +49167,32 @@ func init() {
 	t["VirtualDiskId"] = reflect.TypeOf((*VirtualDiskId)(nil)).Elem()
 }
 
+type VirtualDiskLocalPMemBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	DiskMode   string `xml:"diskMode"`
+	Uuid       string `xml:"uuid,omitempty"`
+	VolumeUUID string `xml:"volumeUUID,omitempty"`
+	ContentId  string `xml:"contentId,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskLocalPMemBackingInfo"] = reflect.TypeOf((*VirtualDiskLocalPMemBackingInfo)(nil)).Elem()
+}
+
+type VirtualDiskLocalPMemBackingOption struct {
+	VirtualDeviceFileBackingOption
+
+	DiskMode    ChoiceOption `xml:"diskMode"`
+	Growable    bool         `xml:"growable"`
+	HotGrowable bool         `xml:"hotGrowable"`
+	Uuid        bool         `xml:"uuid"`
+}
+
+func init() {
+	t["VirtualDiskLocalPMemBackingOption"] = reflect.TypeOf((*VirtualDiskLocalPMemBackingOption)(nil)).Elem()
+}
+
 type VirtualDiskModeNotSupported struct {
 	DeviceNotSupported
 
@@ -47627,6 +49263,8 @@ type VirtualDiskRawDiskMappingVer1BackingInfo struct {
 	ContentId         string                                    `xml:"contentId,omitempty"`
 	ChangeId          string                                    `xml:"changeId,omitempty"`
 	Parent            *VirtualDiskRawDiskMappingVer1BackingInfo `xml:"parent,omitempty"`
+	DeltaDiskFormat   string                                    `xml:"deltaDiskFormat,omitempty"`
+	DeltaGrainSize    int32                                     `xml:"deltaGrainSize,omitempty"`
 	Sharing           string                                    `xml:"sharing,omitempty"`
 }
 
@@ -47671,6 +49309,17 @@ func init() {
 	t["VirtualDiskRawDiskVer2BackingOption"] = reflect.TypeOf((*VirtualDiskRawDiskVer2BackingOption)(nil)).Elem()
 }
 
+type VirtualDiskRuleSpec struct {
+	ClusterRuleInfo
+
+	DiskRuleType string  `xml:"diskRuleType"`
+	DiskId       []int32 `xml:"diskId,omitempty"`
+}
+
+func init() {
+	t["VirtualDiskRuleSpec"] = reflect.TypeOf((*VirtualDiskRuleSpec)(nil)).Elem()
+}
+
 type VirtualDiskSeSparseBackingInfo struct {
 	VirtualDeviceFileBackingInfo
 
@@ -48079,6 +49728,8 @@ type VirtualHardwareOption struct {
 	NumSupportedWwnPorts  *IntOption                `xml:"numSupportedWwnPorts,omitempty"`
 	NumSupportedWwnNodes  *IntOption                `xml:"numSupportedWwnNodes,omitempty"`
 	ResourceConfigOption  *ResourceConfigOption     `xml:"resourceConfigOption,omitempty"`
+	NumNVDIMMControllers  *IntOption                `xml:"numNVDIMMControllers,omitempty"`
+	NumTPMDevices         *IntOption                `xml:"numTPMDevices,omitempty"`
 }
 
 func init() {
@@ -48258,44 +49909,48 @@ func init() {
 type VirtualMachineCapability struct {
 	DynamicData
 
-	SnapshotOperationsSupported         bool  `xml:"snapshotOperationsSupported"`
-	MultipleSnapshotsSupported          bool  `xml:"multipleSnapshotsSupported"`
-	SnapshotConfigSupported             bool  `xml:"snapshotConfigSupported"`
-	PoweredOffSnapshotsSupported        bool  `xml:"poweredOffSnapshotsSupported"`
-	MemorySnapshotsSupported            bool  `xml:"memorySnapshotsSupported"`
-	RevertToSnapshotSupported           bool  `xml:"revertToSnapshotSupported"`
-	QuiescedSnapshotsSupported          bool  `xml:"quiescedSnapshotsSupported"`
-	DisableSnapshotsSupported           bool  `xml:"disableSnapshotsSupported"`
-	LockSnapshotsSupported              bool  `xml:"lockSnapshotsSupported"`
-	ConsolePreferencesSupported         bool  `xml:"consolePreferencesSupported"`
-	CpuFeatureMaskSupported             bool  `xml:"cpuFeatureMaskSupported"`
-	S1AcpiManagementSupported           bool  `xml:"s1AcpiManagementSupported"`
-	SettingScreenResolutionSupported    bool  `xml:"settingScreenResolutionSupported"`
-	ToolsAutoUpdateSupported            bool  `xml:"toolsAutoUpdateSupported"`
-	VmNpivWwnSupported                  bool  `xml:"vmNpivWwnSupported"`
-	NpivWwnOnNonRdmVmSupported          bool  `xml:"npivWwnOnNonRdmVmSupported"`
-	VmNpivWwnDisableSupported           *bool `xml:"vmNpivWwnDisableSupported"`
-	VmNpivWwnUpdateSupported            *bool `xml:"vmNpivWwnUpdateSupported"`
-	SwapPlacementSupported              bool  `xml:"swapPlacementSupported"`
-	ToolsSyncTimeSupported              bool  `xml:"toolsSyncTimeSupported"`
-	VirtualMmuUsageSupported            bool  `xml:"virtualMmuUsageSupported"`
-	DiskSharesSupported                 bool  `xml:"diskSharesSupported"`
-	BootOptionsSupported                bool  `xml:"bootOptionsSupported"`
-	BootRetryOptionsSupported           *bool `xml:"bootRetryOptionsSupported"`
-	SettingVideoRamSizeSupported        bool  `xml:"settingVideoRamSizeSupported"`
-	SettingDisplayTopologySupported     *bool `xml:"settingDisplayTopologySupported"`
-	RecordReplaySupported               *bool `xml:"recordReplaySupported"`
-	ChangeTrackingSupported             *bool `xml:"changeTrackingSupported"`
-	MultipleCoresPerSocketSupported     *bool `xml:"multipleCoresPerSocketSupported"`
-	HostBasedReplicationSupported       *bool `xml:"hostBasedReplicationSupported"`
-	GuestAutoLockSupported              *bool `xml:"guestAutoLockSupported"`
-	MemoryReservationLockSupported      *bool `xml:"memoryReservationLockSupported"`
-	FeatureRequirementSupported         *bool `xml:"featureRequirementSupported"`
-	PoweredOnMonitorTypeChangeSupported *bool `xml:"poweredOnMonitorTypeChangeSupported"`
-	SeSparseDiskSupported               *bool `xml:"seSparseDiskSupported"`
-	NestedHVSupported                   *bool `xml:"nestedHVSupported"`
-	VPMCSupported                       *bool `xml:"vPMCSupported"`
-	SecureBootSupported                 *bool `xml:"secureBootSupported"`
+	SnapshotOperationsSupported            bool  `xml:"snapshotOperationsSupported"`
+	MultipleSnapshotsSupported             bool  `xml:"multipleSnapshotsSupported"`
+	SnapshotConfigSupported                bool  `xml:"snapshotConfigSupported"`
+	PoweredOffSnapshotsSupported           bool  `xml:"poweredOffSnapshotsSupported"`
+	MemorySnapshotsSupported               bool  `xml:"memorySnapshotsSupported"`
+	RevertToSnapshotSupported              bool  `xml:"revertToSnapshotSupported"`
+	QuiescedSnapshotsSupported             bool  `xml:"quiescedSnapshotsSupported"`
+	DisableSnapshotsSupported              bool  `xml:"disableSnapshotsSupported"`
+	LockSnapshotsSupported                 bool  `xml:"lockSnapshotsSupported"`
+	ConsolePreferencesSupported            bool  `xml:"consolePreferencesSupported"`
+	CpuFeatureMaskSupported                bool  `xml:"cpuFeatureMaskSupported"`
+	S1AcpiManagementSupported              bool  `xml:"s1AcpiManagementSupported"`
+	SettingScreenResolutionSupported       bool  `xml:"settingScreenResolutionSupported"`
+	ToolsAutoUpdateSupported               bool  `xml:"toolsAutoUpdateSupported"`
+	VmNpivWwnSupported                     bool  `xml:"vmNpivWwnSupported"`
+	NpivWwnOnNonRdmVmSupported             bool  `xml:"npivWwnOnNonRdmVmSupported"`
+	VmNpivWwnDisableSupported              *bool `xml:"vmNpivWwnDisableSupported"`
+	VmNpivWwnUpdateSupported               *bool `xml:"vmNpivWwnUpdateSupported"`
+	SwapPlacementSupported                 bool  `xml:"swapPlacementSupported"`
+	ToolsSyncTimeSupported                 bool  `xml:"toolsSyncTimeSupported"`
+	VirtualMmuUsageSupported               bool  `xml:"virtualMmuUsageSupported"`
+	DiskSharesSupported                    bool  `xml:"diskSharesSupported"`
+	BootOptionsSupported                   bool  `xml:"bootOptionsSupported"`
+	BootRetryOptionsSupported              *bool `xml:"bootRetryOptionsSupported"`
+	SettingVideoRamSizeSupported           bool  `xml:"settingVideoRamSizeSupported"`
+	SettingDisplayTopologySupported        *bool `xml:"settingDisplayTopologySupported"`
+	RecordReplaySupported                  *bool `xml:"recordReplaySupported"`
+	ChangeTrackingSupported                *bool `xml:"changeTrackingSupported"`
+	MultipleCoresPerSocketSupported        *bool `xml:"multipleCoresPerSocketSupported"`
+	HostBasedReplicationSupported          *bool `xml:"hostBasedReplicationSupported"`
+	GuestAutoLockSupported                 *bool `xml:"guestAutoLockSupported"`
+	MemoryReservationLockSupported         *bool `xml:"memoryReservationLockSupported"`
+	FeatureRequirementSupported            *bool `xml:"featureRequirementSupported"`
+	PoweredOnMonitorTypeChangeSupported    *bool `xml:"poweredOnMonitorTypeChangeSupported"`
+	SeSparseDiskSupported                  *bool `xml:"seSparseDiskSupported"`
+	NestedHVSupported                      *bool `xml:"nestedHVSupported"`
+	VPMCSupported                          *bool `xml:"vPMCSupported"`
+	SecureBootSupported                    *bool `xml:"secureBootSupported"`
+	PerVmEvcSupported                      *bool `xml:"perVmEvcSupported"`
+	VirtualMmuUsageIgnored                 *bool `xml:"virtualMmuUsageIgnored"`
+	VirtualExecUsageIgnored                *bool `xml:"virtualExecUsageIgnored"`
+	DiskOnlySnapshotOnSuspendedVMSupported *bool `xml:"diskOnlySnapshotOnSuspendedVMSupported"`
 }
 
 func init() {
@@ -48337,6 +49992,7 @@ type VirtualMachineConfigInfo struct {
 	GuestFullName                string                                     `xml:"guestFullName"`
 	Version                      string                                     `xml:"version"`
 	Uuid                         string                                     `xml:"uuid"`
+	CreateDate                   *time.Time                                 `xml:"createDate"`
 	InstanceUuid                 string                                     `xml:"instanceUuid,omitempty"`
 	NpivNodeWorldWideName        []int64                                    `xml:"npivNodeWorldWideName,omitempty"`
 	NpivPortWorldWideName        []int64                                    `xml:"npivPortWorldWideName,omitempty"`
@@ -48426,17 +50082,18 @@ func init() {
 type VirtualMachineConfigOption struct {
 	DynamicData
 
-	Version                          string                   `xml:"version"`
-	Description                      string                   `xml:"description"`
-	GuestOSDescriptor                []GuestOsDescriptor      `xml:"guestOSDescriptor"`
-	GuestOSDefaultIndex              int32                    `xml:"guestOSDefaultIndex"`
-	HardwareOptions                  VirtualHardwareOption    `xml:"hardwareOptions"`
-	Capabilities                     VirtualMachineCapability `xml:"capabilities"`
-	Datastore                        DatastoreOption          `xml:"datastore"`
-	DefaultDevice                    []BaseVirtualDevice      `xml:"defaultDevice,omitempty,typeattr"`
-	SupportedMonitorType             []string                 `xml:"supportedMonitorType"`
-	SupportedOvfEnvironmentTransport []string                 `xml:"supportedOvfEnvironmentTransport,omitempty"`
-	SupportedOvfInstallTransport     []string                 `xml:"supportedOvfInstallTransport,omitempty"`
+	Version                          string                           `xml:"version"`
+	Description                      string                           `xml:"description"`
+	GuestOSDescriptor                []GuestOsDescriptor              `xml:"guestOSDescriptor"`
+	GuestOSDefaultIndex              int32                            `xml:"guestOSDefaultIndex"`
+	HardwareOptions                  VirtualHardwareOption            `xml:"hardwareOptions"`
+	Capabilities                     VirtualMachineCapability         `xml:"capabilities"`
+	Datastore                        DatastoreOption                  `xml:"datastore"`
+	DefaultDevice                    []BaseVirtualDevice              `xml:"defaultDevice,omitempty,typeattr"`
+	SupportedMonitorType             []string                         `xml:"supportedMonitorType"`
+	SupportedOvfEnvironmentTransport []string                         `xml:"supportedOvfEnvironmentTransport,omitempty"`
+	SupportedOvfInstallTransport     []string                         `xml:"supportedOvfInstallTransport,omitempty"`
+	PropertyRelations                []VirtualMachinePropertyRelation `xml:"propertyRelations,omitempty"`
 }
 
 func init() {
@@ -48465,6 +50122,7 @@ type VirtualMachineConfigSpec struct {
 	ChangeVersion                string                            `xml:"changeVersion,omitempty"`
 	Name                         string                            `xml:"name,omitempty"`
 	Version                      string                            `xml:"version,omitempty"`
+	CreateDate                   *time.Time                        `xml:"createDate"`
 	Uuid                         string                            `xml:"uuid,omitempty"`
 	InstanceUuid                 string                            `xml:"instanceUuid,omitempty"`
 	NpivNodeWorldWideName        []int64                           `xml:"npivNodeWorldWideName,omitempty"`
@@ -48548,6 +50206,8 @@ type VirtualMachineConfigSummary struct {
 	InstallBootRequired *bool                        `xml:"installBootRequired"`
 	FtInfo              BaseFaultToleranceConfigInfo `xml:"ftInfo,omitempty,typeattr"`
 	ManagedBy           *ManagedByInfo               `xml:"managedBy,omitempty"`
+	TpmPresent          *bool                        `xml:"tpmPresent"`
+	NumVmiopBackings    int32                        `xml:"numVmiopBackings,omitempty"`
 }
 
 func init() {
@@ -48634,6 +50294,7 @@ type VirtualMachineDefinedProfileSpec struct {
 	ProfileId       string                        `xml:"profileId"`
 	ReplicationSpec *ReplicationSpec              `xml:"replicationSpec,omitempty"`
 	ProfileData     *VirtualMachineProfileRawData `xml:"profileData,omitempty"`
+	ProfileParams   []KeyValue                    `xml:"profileParams,omitempty"`
 }
 
 func init() {
@@ -48662,11 +50323,13 @@ func init() {
 type VirtualMachineDeviceRuntimeInfoVirtualEthernetCardRuntimeState struct {
 	VirtualMachineDeviceRuntimeInfoDeviceRuntimeState
 
-	VmDirectPathGen2Active                 bool     `xml:"vmDirectPathGen2Active"`
-	VmDirectPathGen2InactiveReasonVm       []string `xml:"vmDirectPathGen2InactiveReasonVm,omitempty"`
-	VmDirectPathGen2InactiveReasonOther    []string `xml:"vmDirectPathGen2InactiveReasonOther,omitempty"`
-	VmDirectPathGen2InactiveReasonExtended string   `xml:"vmDirectPathGen2InactiveReasonExtended,omitempty"`
-	ReservationStatus                      string   `xml:"reservationStatus,omitempty"`
+	VmDirectPathGen2Active                 bool                               `xml:"vmDirectPathGen2Active"`
+	VmDirectPathGen2InactiveReasonVm       []string                           `xml:"vmDirectPathGen2InactiveReasonVm,omitempty"`
+	VmDirectPathGen2InactiveReasonOther    []string                           `xml:"vmDirectPathGen2InactiveReasonOther,omitempty"`
+	VmDirectPathGen2InactiveReasonExtended string                             `xml:"vmDirectPathGen2InactiveReasonExtended,omitempty"`
+	ReservationStatus                      string                             `xml:"reservationStatus,omitempty"`
+	AttachmentStatus                       string                             `xml:"attachmentStatus,omitempty"`
+	FeatureRequirement                     []VirtualMachineFeatureRequirement `xml:"featureRequirement,omitempty"`
 }
 
 func init() {
@@ -48848,6 +50511,8 @@ type VirtualMachineFlagInfo struct {
 	RecordReplayEnabled      *bool  `xml:"recordReplayEnabled"`
 	FaultToleranceType       string `xml:"faultToleranceType,omitempty"`
 	CbrcCacheEnabled         *bool  `xml:"cbrcCacheEnabled"`
+	VvtdEnabled              *bool  `xml:"vvtdEnabled"`
+	VbsEnabled               *bool  `xml:"vbsEnabled"`
 }
 
 func init() {
@@ -48944,6 +50609,19 @@ func init() {
 	t["VirtualMachineImportSpec"] = reflect.TypeOf((*VirtualMachineImportSpec)(nil)).Elem()
 }
 
+type VirtualMachineInstantCloneSpec struct {
+	DynamicData
+
+	Name     string                     `xml:"name"`
+	Location VirtualMachineRelocateSpec `xml:"location"`
+	Config   []BaseOptionValue          `xml:"config,omitempty,typeattr"`
+	BiosUuid string                     `xml:"biosUuid,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineInstantCloneSpec"] = reflect.TypeOf((*VirtualMachineInstantCloneSpec)(nil)).Elem()
+}
+
 type VirtualMachineLegacyNetworkSwitchInfo struct {
 	DynamicData
 
@@ -49100,6 +50778,28 @@ func init() {
 	t["VirtualMachinePciSharedGpuPassthroughInfo"] = reflect.TypeOf((*VirtualMachinePciSharedGpuPassthroughInfo)(nil)).Elem()
 }
 
+type VirtualMachineProfileDetails struct {
+	DynamicData
+
+	Profile            []BaseVirtualMachineProfileSpec                  `xml:"profile,omitempty,typeattr"`
+	DiskProfileDetails []VirtualMachineProfileDetailsDiskProfileDetails `xml:"diskProfileDetails,omitempty"`
+}
+
+func init() {
+	t["VirtualMachineProfileDetails"] = reflect.TypeOf((*VirtualMachineProfileDetails)(nil)).Elem()
+}
+
+type VirtualMachineProfileDetailsDiskProfileDetails struct {
+	DynamicData
+
+	DiskId  int32                           `xml:"diskId"`
+	Profile []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["VirtualMachineProfileDetailsDiskProfileDetails"] = reflect.TypeOf((*VirtualMachineProfileDetailsDiskProfileDetails)(nil)).Elem()
+}
+
 type VirtualMachineProfileRawData struct {
 	DynamicData
 
@@ -49119,6 +50819,17 @@ func init() {
 	t["VirtualMachineProfileSpec"] = reflect.TypeOf((*VirtualMachineProfileSpec)(nil)).Elem()
 }
 
+type VirtualMachinePropertyRelation struct {
+	DynamicData
+
+	Key       DynamicProperty   `xml:"key"`
+	Relations []DynamicProperty `xml:"relations,omitempty"`
+}
+
+func init() {
+	t["VirtualMachinePropertyRelation"] = reflect.TypeOf((*VirtualMachinePropertyRelation)(nil)).Elem()
+}
+
 type VirtualMachineQuestionInfo struct {
 	DynamicData
 
@@ -49225,6 +50936,8 @@ type VirtualMachineRuntimeInfo struct {
 	Paused                    *bool                                        `xml:"paused"`
 	SnapshotInBackground      *bool                                        `xml:"snapshotInBackground"`
 	QuiescedForkParent        *bool                                        `xml:"quiescedForkParent"`
+	InstantCloneFrozen        *bool                                        `xml:"instantCloneFrozen"`
+	CryptoState               string                                       `xml:"cryptoState,omitempty"`
 }
 
 func init() {
@@ -49561,6 +51274,58 @@ func init() {
 	t["VirtualMachineWipeResult"] = reflect.TypeOf((*VirtualMachineWipeResult)(nil)).Elem()
 }
 
+type VirtualNVDIMM struct {
+	VirtualDevice
+
+	CapacityInMB int64 `xml:"capacityInMB"`
+}
+
+func init() {
+	t["VirtualNVDIMM"] = reflect.TypeOf((*VirtualNVDIMM)(nil)).Elem()
+}
+
+type VirtualNVDIMMBackingInfo struct {
+	VirtualDeviceFileBackingInfo
+
+	Parent   *VirtualNVDIMMBackingInfo `xml:"parent,omitempty"`
+	ChangeId string                    `xml:"changeId,omitempty"`
+}
+
+func init() {
+	t["VirtualNVDIMMBackingInfo"] = reflect.TypeOf((*VirtualNVDIMMBackingInfo)(nil)).Elem()
+}
+
+type VirtualNVDIMMController struct {
+	VirtualController
+}
+
+func init() {
+	t["VirtualNVDIMMController"] = reflect.TypeOf((*VirtualNVDIMMController)(nil)).Elem()
+}
+
+type VirtualNVDIMMControllerOption struct {
+	VirtualControllerOption
+
+	NumNVDIMMControllers IntOption `xml:"numNVDIMMControllers"`
+}
+
+func init() {
+	t["VirtualNVDIMMControllerOption"] = reflect.TypeOf((*VirtualNVDIMMControllerOption)(nil)).Elem()
+}
+
+type VirtualNVDIMMOption struct {
+	VirtualDeviceOption
+
+	CapacityInMB    LongOption `xml:"capacityInMB"`
+	Growable        bool       `xml:"growable"`
+	HotGrowable     bool       `xml:"hotGrowable"`
+	GranularityInMB int64      `xml:"granularityInMB"`
+}
+
+func init() {
+	t["VirtualNVDIMMOption"] = reflect.TypeOf((*VirtualNVDIMMOption)(nil)).Elem()
+}
+
 type VirtualNVMEController struct {
 	VirtualController
 }
@@ -49615,6 +51380,7 @@ type VirtualPCIControllerOption struct {
 	NumParaVirtualSCSIControllers *IntOption `xml:"numParaVirtualSCSIControllers,omitempty"`
 	NumSATAControllers            *IntOption `xml:"numSATAControllers,omitempty"`
 	NumNVMEControllers            *IntOption `xml:"numNVMEControllers,omitempty"`
+	NumVmxnet3VrdmaEthernetCards  *IntOption `xml:"numVmxnet3VrdmaEthernetCards,omitempty"`
 }
 
 func init() {
@@ -49816,39 +51582,6 @@ func init() {
 	t["VirtualPointingDeviceOption"] = reflect.TypeOf((*VirtualPointingDeviceOption)(nil)).Elem()
 }
 
-type VirtualResourcePoolSpec struct {
-	DynamicData
-
-	VrpId            string                    `xml:"vrpId,omitempty"`
-	VrpName          string                    `xml:"vrpName,omitempty"`
-	Description      string                    `xml:"description,omitempty"`
-	CpuAllocation    VrpResourceAllocationInfo `xml:"cpuAllocation"`
-	MemoryAllocation VrpResourceAllocationInfo `xml:"memoryAllocation"`
-	RpList           []ManagedObjectReference  `xml:"rpList,omitempty"`
-	HubList          []ManagedObjectReference  `xml:"hubList,omitempty"`
-	RootVRP          *bool                     `xml:"rootVRP"`
-	StaticVRP        *bool                     `xml:"staticVRP"`
-	ChangeVersion    int64                     `xml:"changeVersion,omitempty"`
-}
-
-func init() {
-	t["VirtualResourcePoolSpec"] = reflect.TypeOf((*VirtualResourcePoolSpec)(nil)).Elem()
-}
-
-type VirtualResourcePoolUsage struct {
-	DynamicData
-
-	VrpId                 string `xml:"vrpId"`
-	CpuReservationMhz     int64  `xml:"cpuReservationMhz"`
-	MemReservationMB      int64  `xml:"memReservationMB"`
-	CpuReservationUsedMhz int64  `xml:"cpuReservationUsedMhz"`
-	MemReservationUsedMB  int64  `xml:"memReservationUsedMB"`
-}
-
-func init() {
-	t["VirtualResourcePoolUsage"] = reflect.TypeOf((*VirtualResourcePoolUsage)(nil)).Elem()
-}
-
 type VirtualSATAController struct {
 	VirtualController
 }
@@ -50163,6 +51896,27 @@ func init() {
 	t["VirtualSwitchSelectionProfile"] = reflect.TypeOf((*VirtualSwitchSelectionProfile)(nil)).Elem()
 }
 
+type VirtualTPM struct {
+	VirtualDevice
+
+	EndorsementKeyCertificateSigningRequest [][]byte `xml:"endorsementKeyCertificateSigningRequest,omitempty"`
+	EndorsementKeyCertificate               [][]byte `xml:"endorsementKeyCertificate,omitempty"`
+}
+
+func init() {
+	t["VirtualTPM"] = reflect.TypeOf((*VirtualTPM)(nil)).Elem()
+}
+
+type VirtualTPMOption struct {
+	VirtualDeviceOption
+
+	SupportedFirmware []string `xml:"supportedFirmware,omitempty"`
+}
+
+func init() {
+	t["VirtualTPMOption"] = reflect.TypeOf((*VirtualTPMOption)(nil)).Elem()
+}
+
 type VirtualUSB struct {
 	VirtualDevice
 
@@ -50357,6 +52111,8 @@ func init() {
 
 type VirtualVmxnet3Vrdma struct {
 	VirtualVmxnet3
+
+	DeviceProtocol string `xml:"deviceProtocol,omitempty"`
 }
 
 func init() {
@@ -50365,6 +52121,8 @@ func init() {
 
 type VirtualVmxnet3VrdmaOption struct {
 	VirtualVmxnet3Option
+
+	DeviceProtocol *ChoiceOption `xml:"deviceProtocol,omitempty"`
 }
 
 func init() {
@@ -52110,8 +53868,12 @@ func init() {
 type VmfsConfigOption struct {
 	DynamicData
 
-	BlockSizeOption        int32   `xml:"blockSizeOption"`
-	UnmapGranularityOption []int32 `xml:"unmapGranularityOption,omitempty"`
+	BlockSizeOption          int32       `xml:"blockSizeOption"`
+	UnmapGranularityOption   []int32     `xml:"unmapGranularityOption,omitempty"`
+	UnmapBandwidthFixedValue *LongOption `xml:"unmapBandwidthFixedValue,omitempty"`
+	UnmapBandwidthDynamicMin *LongOption `xml:"unmapBandwidthDynamicMin,omitempty"`
+	UnmapBandwidthDynamicMax *LongOption `xml:"unmapBandwidthDynamicMax,omitempty"`
+	UnmapBandwidthIncrement  int64       `xml:"unmapBandwidthIncrement,omitempty"`
 }
 
 func init() {
@@ -52240,6 +54002,19 @@ func init() {
 	t["VmfsMountFaultFault"] = reflect.TypeOf((*VmfsMountFaultFault)(nil)).Elem()
 }
 
+type VmfsUnmapBandwidthSpec struct {
+	DynamicData
+
+	Policy     string `xml:"policy"`
+	FixedValue int64  `xml:"fixedValue"`
+	DynamicMin int64  `xml:"dynamicMin"`
+	DynamicMax int64  `xml:"dynamicMax"`
+}
+
+func init() {
+	t["VmfsUnmapBandwidthSpec"] = reflect.TypeOf((*VmfsUnmapBandwidthSpec)(nil)).Elem()
+}
+
 type VmotionInterfaceNotEnabled struct {
 	HostPowerOpFailed
 }
@@ -52267,7 +54042,7 @@ func init() {
 type VmwareDistributedVirtualSwitchTrunkVlanSpec struct {
 	VmwareDistributedVirtualSwitchVlanSpec
 
-	VlanId []NumericRange `xml:"vlanId"`
+	VlanId []NumericRange `xml:"vlanId,omitempty"`
 }
 
 func init() {
@@ -52348,16 +54123,6 @@ func init() {
 	t["VramLimitLicenseFault"] = reflect.TypeOf((*VramLimitLicenseFault)(nil)).Elem()
 }
 
-type VrpResourceAllocationInfo struct {
-	ResourceAllocationInfo
-
-	ReservationLimit int64 `xml:"reservationLimit,omitempty"`
-}
-
-func init() {
-	t["VrpResourceAllocationInfo"] = reflect.TypeOf((*VrpResourceAllocationInfo)(nil)).Elem()
-}
-
 type VsanClusterConfigInfo struct {
 	DynamicData
 
@@ -52886,7 +54651,8 @@ func init() {
 type VslmCloneSpec struct {
 	VslmMigrateSpec
 
-	Name string `xml:"name"`
+	Name              string `xml:"name"`
+	KeepAfterDeleteVm *bool  `xml:"keepAfterDeleteVm"`
 }
 
 func init() {
@@ -52896,9 +54662,11 @@ func init() {
 type VslmCreateSpec struct {
 	DynamicData
 
-	Name         string                        `xml:"name"`
-	BackingSpec  BaseVslmCreateSpecBackingSpec `xml:"backingSpec,typeattr"`
-	CapacityInMB int64                         `xml:"capacityInMB"`
+	Name              string                          `xml:"name"`
+	KeepAfterDeleteVm *bool                           `xml:"keepAfterDeleteVm"`
+	BackingSpec       BaseVslmCreateSpecBackingSpec   `xml:"backingSpec,typeattr"`
+	CapacityInMB      int64                           `xml:"capacityInMB"`
+	Profile           []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
 }
 
 func init() {
@@ -52909,6 +54677,7 @@ type VslmCreateSpecBackingSpec struct {
 	DynamicData
 
 	Datastore ManagedObjectReference `xml:"datastore"`
+	Path      string                 `xml:"path,omitempty"`
 }
 
 func init() {
@@ -52939,8 +54708,9 @@ func init() {
 type VslmMigrateSpec struct {
 	DynamicData
 
-	BackingSpec BaseVslmCreateSpecBackingSpec `xml:"backingSpec,typeattr"`
-	Consolidate *bool                         `xml:"consolidate"`
+	BackingSpec BaseVslmCreateSpecBackingSpec   `xml:"backingSpec,typeattr"`
+	Profile     []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+	Consolidate *bool                           `xml:"consolidate"`
 }
 
 func init() {
@@ -53332,3 +55102,332 @@ func init() {
 type ZeroFillVirtualDisk_TaskResponse struct {
 	Returnval ManagedObjectReference `xml:"returnval"`
 }
+
+type ConfigureVchaRequestType struct {
+	This       ManagedObjectReference `xml:"_this"`
+	ConfigSpec VchaClusterConfigSpec  `xml:"configSpec"`
+}
+
+func init() {
+	t["configureVchaRequestType"] = reflect.TypeOf((*ConfigureVchaRequestType)(nil)).Elem()
+}
+
+type ConfigureVcha_Task ConfigureVchaRequestType
+
+func init() {
+	t["configureVcha_Task"] = reflect.TypeOf((*ConfigureVcha_Task)(nil)).Elem()
+}
+
+type ConfigureVcha_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreatePassiveNodeRequestType struct {
+	This                  ManagedObjectReference    `xml:"_this"`
+	PassiveDeploymentSpec PassiveNodeDeploymentSpec `xml:"passiveDeploymentSpec"`
+	SourceVcSpec          SourceNodeSpec            `xml:"sourceVcSpec"`
+}
+
+func init() {
+	t["createPassiveNodeRequestType"] = reflect.TypeOf((*CreatePassiveNodeRequestType)(nil)).Elem()
+}
+
+type CreatePassiveNode_Task CreatePassiveNodeRequestType
+
+func init() {
+	t["createPassiveNode_Task"] = reflect.TypeOf((*CreatePassiveNode_Task)(nil)).Elem()
+}
+
+type CreatePassiveNode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type CreateWitnessNodeRequestType struct {
+	This                  ManagedObjectReference `xml:"_this"`
+	WitnessDeploymentSpec BaseNodeDeploymentSpec `xml:"witnessDeploymentSpec,typeattr"`
+	SourceVcSpec          SourceNodeSpec         `xml:"sourceVcSpec"`
+}
+
+func init() {
+	t["createWitnessNodeRequestType"] = reflect.TypeOf((*CreateWitnessNodeRequestType)(nil)).Elem()
+}
+
+type CreateWitnessNode_Task CreateWitnessNodeRequestType
+
+func init() {
+	t["createWitnessNode_Task"] = reflect.TypeOf((*CreateWitnessNode_Task)(nil)).Elem()
+}
+
+type CreateWitnessNode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DeployVchaRequestType struct {
+	This           ManagedObjectReference    `xml:"_this"`
+	DeploymentSpec VchaClusterDeploymentSpec `xml:"deploymentSpec"`
+}
+
+func init() {
+	t["deployVchaRequestType"] = reflect.TypeOf((*DeployVchaRequestType)(nil)).Elem()
+}
+
+type DeployVcha_Task DeployVchaRequestType
+
+func init() {
+	t["deployVcha_Task"] = reflect.TypeOf((*DeployVcha_Task)(nil)).Elem()
+}
+
+type DeployVcha_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type DestroyVchaRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["destroyVchaRequestType"] = reflect.TypeOf((*DestroyVchaRequestType)(nil)).Elem()
+}
+
+type DestroyVcha_Task DestroyVchaRequestType
+
+func init() {
+	t["destroyVcha_Task"] = reflect.TypeOf((*DestroyVcha_Task)(nil)).Elem()
+}
+
+type DestroyVcha_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type FetchSoftwarePackages FetchSoftwarePackagesRequestType
+
+func init() {
+	t["fetchSoftwarePackages"] = reflect.TypeOf((*FetchSoftwarePackages)(nil)).Elem()
+}
+
+type FetchSoftwarePackagesRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["fetchSoftwarePackagesRequestType"] = reflect.TypeOf((*FetchSoftwarePackagesRequestType)(nil)).Elem()
+}
+
+type FetchSoftwarePackagesResponse struct {
+	Returnval []SoftwarePackage `xml:"returnval,omitempty"`
+}
+
+type GetClusterMode GetClusterModeRequestType
+
+func init() {
+	t["getClusterMode"] = reflect.TypeOf((*GetClusterMode)(nil)).Elem()
+}
+
+type GetClusterModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["getClusterModeRequestType"] = reflect.TypeOf((*GetClusterModeRequestType)(nil)).Elem()
+}
+
+type GetClusterModeResponse struct {
+	Returnval string `xml:"returnval"`
+}
+
+type GetVchaConfig GetVchaConfigRequestType
+
+func init() {
+	t["getVchaConfig"] = reflect.TypeOf((*GetVchaConfig)(nil)).Elem()
+}
+
+type GetVchaConfigRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["getVchaConfigRequestType"] = reflect.TypeOf((*GetVchaConfigRequestType)(nil)).Elem()
+}
+
+type GetVchaConfigResponse struct {
+	Returnval VchaClusterConfigInfo `xml:"returnval"`
+}
+
+type InitiateFailoverRequestType struct {
+	This    ManagedObjectReference `xml:"_this"`
+	Planned bool                   `xml:"planned"`
+}
+
+func init() {
+	t["initiateFailoverRequestType"] = reflect.TypeOf((*InitiateFailoverRequestType)(nil)).Elem()
+}
+
+type InitiateFailover_Task InitiateFailoverRequestType
+
+func init() {
+	t["initiateFailover_Task"] = reflect.TypeOf((*InitiateFailover_Task)(nil)).Elem()
+}
+
+type InitiateFailover_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type InstallDate InstallDateRequestType
+
+func init() {
+	t["installDate"] = reflect.TypeOf((*InstallDate)(nil)).Elem()
+}
+
+type InstallDateRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["installDateRequestType"] = reflect.TypeOf((*InstallDateRequestType)(nil)).Elem()
+}
+
+type InstallDateResponse struct {
+	Returnval time.Time `xml:"returnval"`
+}
+
+type PrepareVchaRequestType struct {
+	This        ManagedObjectReference `xml:"_this"`
+	NetworkSpec VchaClusterNetworkSpec `xml:"networkSpec"`
+}
+
+func init() {
+	t["prepareVchaRequestType"] = reflect.TypeOf((*PrepareVchaRequestType)(nil)).Elem()
+}
+
+type PrepareVcha_Task PrepareVchaRequestType
+
+func init() {
+	t["prepareVcha_Task"] = reflect.TypeOf((*PrepareVcha_Task)(nil)).Elem()
+}
+
+type PrepareVcha_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type QueryDatacenterConfigOptionDescriptor QueryDatacenterConfigOptionDescriptorRequestType
+
+func init() {
+	t["queryDatacenterConfigOptionDescriptor"] = reflect.TypeOf((*QueryDatacenterConfigOptionDescriptor)(nil)).Elem()
+}
+
+type QueryDatacenterConfigOptionDescriptorRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["queryDatacenterConfigOptionDescriptorRequestType"] = reflect.TypeOf((*QueryDatacenterConfigOptionDescriptorRequestType)(nil)).Elem()
+}
+
+type QueryDatacenterConfigOptionDescriptorResponse struct {
+	Returnval []VirtualMachineConfigOptionDescriptor `xml:"returnval,omitempty"`
+}
+
+type ReloadVirtualMachineFromPathRequestType struct {
+	This              ManagedObjectReference `xml:"_this"`
+	ConfigurationPath string                 `xml:"configurationPath"`
+}
+
+func init() {
+	t["reloadVirtualMachineFromPathRequestType"] = reflect.TypeOf((*ReloadVirtualMachineFromPathRequestType)(nil)).Elem()
+}
+
+type ReloadVirtualMachineFromPath_Task ReloadVirtualMachineFromPathRequestType
+
+func init() {
+	t["reloadVirtualMachineFromPath_Task"] = reflect.TypeOf((*ReloadVirtualMachineFromPath_Task)(nil)).Elem()
+}
+
+type ReloadVirtualMachineFromPath_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SetClusterModeRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+	Mode string                 `xml:"mode"`
+}
+
+func init() {
+	t["setClusterModeRequestType"] = reflect.TypeOf((*SetClusterModeRequestType)(nil)).Elem()
+}
+
+type SetClusterMode_Task SetClusterModeRequestType
+
+func init() {
+	t["setClusterMode_Task"] = reflect.TypeOf((*SetClusterMode_Task)(nil)).Elem()
+}
+
+type SetClusterMode_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type SetCustomValue SetCustomValueRequestType
+
+func init() {
+	t["setCustomValue"] = reflect.TypeOf((*SetCustomValue)(nil)).Elem()
+}
+
+type SetCustomValueRequestType struct {
+	This  ManagedObjectReference `xml:"_this"`
+	Key   string                 `xml:"key"`
+	Value string                 `xml:"value"`
+}
+
+func init() {
+	t["setCustomValueRequestType"] = reflect.TypeOf((*SetCustomValueRequestType)(nil)).Elem()
+}
+
+type SetCustomValueResponse struct {
+}
+
+type UnregisterVAppRequestType struct {
+	This ManagedObjectReference `xml:"_this"`
+}
+
+func init() {
+	t["unregisterVAppRequestType"] = reflect.TypeOf((*UnregisterVAppRequestType)(nil)).Elem()
+}
+
+type UnregisterVApp_Task UnregisterVAppRequestType
+
+func init() {
+	t["unregisterVApp_Task"] = reflect.TypeOf((*UnregisterVApp_Task)(nil)).Elem()
+}
+
+type UnregisterVApp_TaskResponse struct {
+	Returnval ManagedObjectReference `xml:"returnval"`
+}
+
+type VersionURI string
+
+func init() {
+	t["versionURI"] = reflect.TypeOf((*VersionURI)(nil)).Elem()
+}
+
+type VslmInfrastructureObjectPolicy struct {
+	DynamicData
+
+	Name            string                `xml:"name"`
+	BackingObjectId string                `xml:"backingObjectId"`
+	ProfileId       string                `xml:"profileId"`
+	Error           *LocalizedMethodFault `xml:"error,omitempty"`
+}
+
+func init() {
+	t["vslmInfrastructureObjectPolicy"] = reflect.TypeOf((*VslmInfrastructureObjectPolicy)(nil)).Elem()
+}
+
+type VslmInfrastructureObjectPolicySpec struct {
+	DynamicData
+
+	Datastore ManagedObjectReference          `xml:"datastore"`
+	Profile   []BaseVirtualMachineProfileSpec `xml:"profile,omitempty,typeattr"`
+}
+
+func init() {
+	t["vslmInfrastructureObjectPolicySpec"] = reflect.TypeOf((*VslmInfrastructureObjectPolicySpec)(nil)).Elem()
+}
diff --git a/vendor/manifest b/vendor/manifest
index c79eb9ac57..debe893e74 100644
--- a/vendor/manifest
+++ b/vendor/manifest
@@ -1167,7 +1167,7 @@
 			"importpath": "github.com/vmware/govmomi",
 			"repository": "https://github.com/vmware/govmomi",
 			"vcs": "git",
-			"revision": "123ed177021588bac57b5c87c1a84270ddf2eca8",
+			"revision": "3617f28d167d448f93f282a867870f109516d2a5",
 			"branch": "HEAD",
 			"notests": true
 		},